diff --git a/html/lib.html b/html/lib.html
index 3afbf1c0dc4efbfdc7ceb72a14145a541f16bb99..195f7988b5c62d2775d5999b757e25b2a73e2a68 100644
--- a/html/lib.html
+++ b/html/lib.html
@@ -34,7 +34,7 @@ This is a simplified view: <a href="img/dependencies.png">click here for the ful
<dl>
<dt><a href="http://commons.apache.org/proper/commons-cli/">Commons CLI</a> 1.3.1: commons-cli.jar [<a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache</a>]</dt>
<dd>Library for parsing command line arguments. Required for the command line use (cli package; included by OWL-API).</dd>
-<dt><a href="http://www.slf4j.org/">SLF4J</a> 1.7.12: slf4j-api.jar log4j-over-slf4j.jar jcl-over-slf4j.jar [<a href="http://www.slf4j.org/license.html">MIT license</a>]
+<dt><a href="http://www.slf4j.org/">SLF4J</a> 1.7.25: slf4j-api.jar log4j-over-slf4j.jar jcl-over-slf4j.jar [<a href="http://www.slf4j.org/license.html">MIT license</a>]
</dt>
<dd>Java unified logging library!</dd>
</dl>
diff --git a/html/relnotes.html b/html/relnotes.html
index 126b4ed2ffa2a4ec6a72bc2c4262e1dc21144214..536285b8abafd9b4e19b14b4e619c0a4e724bc5e 100644
--- a/html/relnotes.html
+++ b/html/relnotes.html
@@ -83,6 +83,12 @@ with a warning:
<li>Suppressed unnecessary casts and set proper type parameters (test)</li>
<li>Fixed all Javadoc generation warnings (distrib)</li>
<li>Upgraded to <span style="color: green">SLF4J 1.7.25</span> (lib)</li>
+<li>Upgraded to <span style="color: green">Commons CLI 1.4</span> (lib)</li>
+<li>Upgraded to <span style="color: green">Commons IO 2.5</span> (lib)</li>
+<li>Upgraded to <span style="color: green">Commons fileupload 1.3.3</span> (lib)</li>
+<li>Upgraded to <span style="color: green">gson 2.8.1</span> (lib)</li>
+<li>Upgraded to <span style="color: green">mysql 5.1.42</span> (lib)</li>
+<li>Upgraded to <span style="color: green">postgres jdbc 42.1.1</span> (lib)</li>
<li>Upgraded to <span style="color: green">TestNG 6.11</span> (dev)</li>
</ul></p>
diff --git a/lib/cli/commons-cli.jar b/lib/cli/commons-cli.jar
index c3e7a1f47f87c077f26a890594a1b978e13cec11..22deb3089e2f79a983406bd13a75a3e6238afdcf 100644
Binary files a/lib/cli/commons-cli.jar and b/lib/cli/commons-cli.jar differ
diff --git a/lib/cli/commons-cli.pom b/lib/cli/commons-cli.pom
index cca74f44c02c277ba4c165797f08bfc5dc12bd26..1a65965ab8989d38ac54b0a48e6c3af436fb82d4 100644
--- a/lib/cli/commons-cli.pom
+++ b/lib/cli/commons-cli.pom
@@ -1,21 +1,333 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
- <groupId>org.apache.commons</groupId>
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>42</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.3.1</version>
+ <version>1.4</version>
<name>Apache Commons CLI</name>
+
<inceptionYear>2002</inceptionYear>
<description>
- Commons CLI provides a simple API for presenting, processing and validating a command line interface.
+ Apache Commons CLI provides a simple API for presenting, processing and validating a command line interface.
</description>
- <packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License Version 2.0, January 2004</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- <url>http://commons.apache.org/cli/</url>
+
+ <url>http://commons.apache.org/proper/commons-cli/</url>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/CLI</url>
+ </issueManagement>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/cli/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/cli/trunk/</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/cli/trunk/</url>
+ </scm>
+
+ <developers>
+ <developer>
+ <name>James Strachan</name>
+ <id>jstrachan</id>
+ <email>jstrachan@apache.org</email>
+ <organization>SpiritSoft, Inc.</organization>
+ </developer>
+ <developer>
+ <name>Bob McWhirter</name>
+ <id>bob</id>
+ <email>bob@werken.com</email>
+ <organization>Werken</organization>
+ <roles>
+ <role>contributed ideas and code from werken.opt</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>John Keyes</name>
+ <id>jkeyes</id>
+ <email>jbjk@mac.com</email>
+ <organization>integral Source</organization>
+ <roles>
+ <role>contributed ideas and code from Optz</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rob Oxspring</name>
+ <id>roxspring</id>
+ <email>roxspring@imapmail.org</email>
+ <organization>Indigo Stone</organization>
+ <roles>
+ <role>designed CLI2</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Emmanuel Bourg</name>
+ <id>ebourg</id>
+ <email>ebourg@apache.org</email>
+ <organization>Ariane Software</organization>
+ </developer>
+ <developer>
+ <name>Thomas Neidhart</name>
+ <id>tn</id>
+ <email>tn@apache.org</email>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Beluga Behr</name>
+ </contributor>
+ <contributor>
+ <name>Peter Donald</name>
+ <roles>
+ <role>contributed ideas and code from Avalon Excalibur's cli package</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Brian Egge</name>
+ <roles>
+ <role>made the 1.1 release happen</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Duncan Jones</name>
+ <roles>
+ <role>supplied patches</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Berin Loritsch</name>
+ <email>bloritsch@apache.org</email>
+ <roles>
+ <role>helped in the Avalon CLI merge</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Peter Maddocks</name>
+ <email>peter_maddocks@hp.com</email>
+ <organization>Hewlett-Packard</organization>
+ <roles>
+ <role>supplied patch</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Alexandru Mocanu</name>
+ <roles>
+ <role>supplied patch</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Andrew Shirley</name>
+ <roles>
+ <role>lots of fixes for 1.1</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Greg Thomas</name>
+ </contributor>
+ <contributor>
+ <name>Slawek Zachcial</name>
+ <roles>
+ <role>unit tests</role>
+ </roles>
+ </contributor>
+
+ </contributors>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <maven.compiler.source>1.5</maven.compiler.source>
+ <maven.compiler.target>1.5</maven.compiler.target>
+ <commons.componentid>cli</commons.componentid>
+ <commons.release.version>1.4</commons.release.version>
+ <commons.release.name>commons-cli-${commons.release.version}</commons.release.name>
+ <commons.osgi.symbolicName>org.apache.commons.cli</commons.osgi.symbolicName>
+ <commons.jira.id>CLI</commons.jira.id>
+ <commons.jira.pid>12310463</commons.jira.pid>
+ <!-- The RC version used in the staging repository URL. -->
+ <commons.rc.version>RC1</commons.rc.version>
+
+ <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
+ <commons.encoding>utf-8</commons.encoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/site/resources/.htaccess</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <ignorePathsToDelete>
+ <ignorePathToDelete>javadocs**</ignorePathToDelete>
+ </ignorePathsToDelete>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <linksource>true</linksource>
+ <links>
+ <link>http://download.oracle.com/javase/6/docs/api</link>
+ </links>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.15</version>
+ <configuration>
+ <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ <suppressionsLocation>${basedir}/src/conf/checkstyle-suppressions.xml</suppressionsLocation>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>checkstyle</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ <excludeFilterFile>${basedir}/src/conf/findbugs-exclude-filter.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.5</version>
+ <configuration>
+ <targetJdk>${maven.compiler.target}</targetJdk>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <name>Apache Commons Site</name>
+ <url>scm:svn:${commons.scmPubUrl}</url>
+ </site>
+ </distributionManagement>
+
+ <profiles>
+ <profile>
+ <id>rc</id>
+ <distributionManagement>
+ <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
+ <site>
+ <id>apache.website</id>
+ <name>Apache Commons Release Candidate Staging Site</name>
+ <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/site</url>
+ </site>
+ </distributionManagement>
+ </profile>
+ <profile>
+ <id>setup-checkout</id>
+ <activation>
+ <file>
+ <missing>site-content</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>prepare-checkout</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <exec executable="svn">
+ <arg line="checkout --depth immediates ${commons.scmPubUrl} ${commons.scmPubCheckoutDirectory}" />
+ </exec>
+
+ <exec executable="svn">
+ <arg line="update --set-depth exclude ${commons.scmPubCheckoutDirectory}/javadocs" />
+ </exec>
+
+ <pathconvert pathsep=" " property="dirs">
+ <dirset dir="${commons.scmPubCheckoutDirectory}" includes="*" />
+ </pathconvert>
+ <exec executable="svn">
+ <arg line="update --set-depth infinity ${dirs}" />
+ </exec>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/lib/fileupload/commons-fileupload.jar b/lib/fileupload/commons-fileupload.jar
index af0cda226fcab02b7ffdcd8fd9bf9c72dea63bf2..915d87e744a865e82ea1183cb935f1d2a74d3257 100644
Binary files a/lib/fileupload/commons-fileupload.jar and b/lib/fileupload/commons-fileupload.jar differ
diff --git a/lib/fileupload/commons-fileupload.pom b/lib/fileupload/commons-fileupload.pom
index 49c1455e305dbf64133fd4d8fb64dcf74728a72f..154f19c92221f03aa8134c75745f9c6dcc32745d 100644
--- a/lib/fileupload/commons-fileupload.pom
+++ b/lib/fileupload/commons-fileupload.pom
@@ -1,305 +1,338 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-parent</artifactId>
- <version>32</version>
- </parent>
-
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.3.1</version>
-
- <name>Apache Commons FileUpload</name>
- <description>
- The Apache Commons FileUpload component provides a simple yet flexible means of adding support for multipart
- file upload functionality to servlets and web applications.
- </description>
- <url>http://commons.apache.org/proper/commons-fileupload/</url>
- <inceptionYear>2002</inceptionYear>
- <packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License Version 2.0, January 2004</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <developers>
- <developer>
- <name>Martin Cooper</name>
- <id>martinc</id>
- <email>martinc@apache.org</email>
- <organization>Yahoo!</organization>
- </developer>
- <developer>
- <name>dIon Gillard</name>
- <id>dion</id>
- <email>dion@apache.org</email>
- <organization>Multitask Consulting</organization>
- </developer>
- <developer>
- <name>John McNally</name>
- <id>jmcnally</id>
- <email>jmcnally@collab.net</email>
- <organization>CollabNet</organization>
- </developer>
- <developer>
- <name>Daniel Rall</name>
- <id>dlr</id>
- <email>dlr@finemaltcoding.com</email>
- <organization>CollabNet</organization>
- </developer>
- <developer>
- <name>Jason van Zyl</name>
- <id>jvanzyl</id>
- <email>jason@zenplex.com</email>
- <organization>Zenplex</organization>
- </developer>
- <developer>
- <name>Robert Burrell Donkin</name>
- <id>rdonkin</id>
- <email>rdonkin@apache.org</email>
- <organization />
- </developer>
- <developer>
- <name>Sean C. Sullivan</name>
- <id>sullis</id>
- <email>sean |at| seansullivan |dot| com</email>
- <organization />
- </developer>
- <developer>
- <name>Jochen Wiedmann</name>
- <id>jochen</id>
- <email>jochen.wiedmann@gmail.com</email>
- <organization />
- </developer>
- <developer>
- <name>Simone Tripodi</name>
- <id>simonetripodi</id>
- <email>simonetripodi@apache.org</email>
- <organization>Adobe</organization>
- </developer>
- <developer>
- <name>Gary Gregory</name>
- <id>ggregory</id>
- <email>ggregory@apache.org</email>
- <organization />
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Aaron Freeman</name>
- <email>aaron@sendthisfile.com</email>
- </contributor>
- <contributor>
- <name>Daniel Fabian</name>
- <email>dfabian@google.com</email>
- </contributor>
- <contributor>
- <name>Jörg Heinicke</name>
- <email>joerg.heinicke@gmx.de</email>
- </contributor>
- <contributor>
- <name>Stepan Koltsov</name>
- <email>yozh@mx1.ru</email>
- </contributor>
- <contributor>
- <name>Michael Macaluso</name>
- <email>michael.public@wavecorp.com</email>
- </contributor>
- <contributor>
- <name>Amichai Rothman</name>
- <email>amichai2@amichais.net</email>
- </contributor>
- <contributor>
- <name>Alexander Sova</name>
- <email>bird@noir.crocodile.org</email>
- </contributor>
- <contributor>
- <name>Paul Spurr</name>
- <email>pspurr@gmail.com</email>
- </contributor>
- <contributor>
- <name>Thomas Vandahl</name>
- <email>tv@apache.org</email>
- </contributor>
- <contributor>
- <name>Henry Yandell</name>
- <email>bayard@apache.org</email>
- </contributor>
- <contributor>
- <name>Jan Novotný</name>
- <email>novotnaci@gmail.com</email>
- </contributor>
- <contributor>
- <name>frank</name>
- <email>mailsurfie@gmail.com</email>
- </contributor>
- <contributor>
- <name>Rafal Krzewski</name>
- <email>Rafal.Krzewski@e-point.pl</email>
- </contributor>
- <contributor>
- <name>Sean Legassick</name>
- <email>sean@informage.net</email>
- </contributor>
- <contributor>
- <name>Oleg Kalnichevski</name>
- <email>oleg@ural.ru</email>
- </contributor>
- <contributor>
- <name>David Sean Taylor</name>
- <email>taylor@apache.org</email>
- </contributor>
- </contributors>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/fileupload/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/fileupload/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/fileupload/trunk</url>
- </scm>
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/FILEUPLOAD</url>
- </issueManagement>
-
- <properties>
- <maven.compiler.source>1.5</maven.compiler.source>
- <maven.compiler.target>1.5</maven.compiler.target>
- <maven.compile.encoding>ISO-8859-1</maven.compile.encoding>
- <commons.componentid>fileupload</commons.componentid>
- <commons.release.version>1.3.1</commons.release.version>
- <commons.rc.version>RC1</commons.rc.version>
- <commons.jira.id>FILEUPLOAD</commons.jira.id>
- <commons.jira.pid>12310476</commons.jira.pid>
- <commons.osgi.export>!org.apache.commons.fileupload.util.mime,org.apache.commons.*;version=${project.version};-noimport:=true</commons.osgi.export>
- <commons.osgi.import>!javax.portlet,*</commons.osgi.import>
- <commons.osgi.dynamicImport>javax.portlet</commons.osgi.dynamicImport>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.2</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
- <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <preparationGoals>clean site verify</preparationGoals>
- <goals>deploy</goals>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>${commons.changes.version}</version>
- <configuration>
- <issueLinkTemplate>%URL%/../%ISSUE%</issueLinkTemplate>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- <!-- NPE, retry from time to time <report>jira-report</report> -->
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.10</version>
- <configuration>
- <configLocation>${basedir}/src/checkstyle/fileupload_checks.xml</configLocation>
- <suppressionsLocation>${basedir}/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
- <enableRulesSummary>false</enableRulesSummary>
- <headerLocation>${basedir}/src/checkstyle/license-header.txt</headerLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
- <configuration>
- <targetJdk>${maven.compiler.target}</targetJdk>
- <rulesets>
- <ruleset>${basedir}/src/checkstyle/fileupload_basic.xml</ruleset>
- </rulesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>${commons.clirr.version}</version>
- <configuration>
- <comparisonArtifacts>
- <comparisonArtifact>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.3</version>
- </comparisonArtifact>
- </comparisonArtifacts>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>41</version>
+ </parent>
+
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.3.3</version>
+
+ <name>Apache Commons FileUpload</name>
+ <description>
+ The Apache Commons FileUpload component provides a simple yet flexible means of adding support for multipart
+ file upload functionality to servlets and web applications.
+ </description>
+ <url>http://commons.apache.org/proper/commons-fileupload/</url>
+ <inceptionYear>2002</inceptionYear>
+
+ <developers>
+ <developer>
+ <name>Martin Cooper</name>
+ <id>martinc</id>
+ <email>martinc@apache.org</email>
+ <organization>Yahoo!</organization>
+ </developer>
+ <developer>
+ <name>dIon Gillard</name>
+ <id>dion</id>
+ <email>dion@apache.org</email>
+ <organization>Multitask Consulting</organization>
+ </developer>
+ <developer>
+ <name>John McNally</name>
+ <id>jmcnally</id>
+ <email>jmcnally@collab.net</email>
+ <organization>CollabNet</organization>
+ </developer>
+ <developer>
+ <name>Daniel Rall</name>
+ <id>dlr</id>
+ <email>dlr@finemaltcoding.com</email>
+ <organization>CollabNet</organization>
+ </developer>
+ <developer>
+ <name>Jason van Zyl</name>
+ <id>jvanzyl</id>
+ <email>jason@zenplex.com</email>
+ <organization>Zenplex</organization>
+ </developer>
+ <developer>
+ <name>Robert Burrell Donkin</name>
+ <id>rdonkin</id>
+ <email>rdonkin@apache.org</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>Sean C. Sullivan</name>
+ <id>sullis</id>
+ <email>sean |at| seansullivan |dot| com</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>Jochen Wiedmann</name>
+ <id>jochen</id>
+ <email>jochen.wiedmann@gmail.com</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>Simone Tripodi</name>
+ <id>simonetripodi</id>
+ <email>simonetripodi@apache.org</email>
+ <organization>Adobe</organization>
+ </developer>
+ <developer>
+ <name>Gary Gregory</name>
+ <id>ggregory</id>
+ <email>ggregory@apache.org</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>Rob Tompkins</name>
+ <id>chtompki</id>
+ <email>chtompki@apache.org</email>
+ <organization />
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Aaron Freeman</name>
+ <email>aaron@sendthisfile.com</email>
+ </contributor>
+ <contributor>
+ <name>Daniel Fabian</name>
+ <email>dfabian@google.com</email>
+ </contributor>
+ <contributor>
+ <name>Jörg Heinicke</name>
+ <email>joerg.heinicke@gmx.de</email>
+ </contributor>
+ <contributor>
+ <name>Stepan Koltsov</name>
+ <email>yozh@mx1.ru</email>
+ </contributor>
+ <contributor>
+ <name>Michael Macaluso</name>
+ <email>michael.public@wavecorp.com</email>
+ </contributor>
+ <contributor>
+ <name>Amichai Rothman</name>
+ <email>amichai2@amichais.net</email>
+ </contributor>
+ <contributor>
+ <name>Alexander Sova</name>
+ <email>bird@noir.crocodile.org</email>
+ </contributor>
+ <contributor>
+ <name>Paul Spurr</name>
+ <email>pspurr@gmail.com</email>
+ </contributor>
+ <contributor>
+ <name>Thomas Vandahl</name>
+ <email>tv@apache.org</email>
+ </contributor>
+ <contributor>
+ <name>Henry Yandell</name>
+ <email>bayard@apache.org</email>
+ </contributor>
+ <contributor>
+ <name>Jan Novotný</name>
+ <email>novotnaci@gmail.com</email>
+ </contributor>
+ <contributor>
+ <name>frank</name>
+ <email>mailsurfie@gmail.com</email>
+ </contributor>
+ <contributor>
+ <name>Rafal Krzewski</name>
+ <email>Rafal.Krzewski@e-point.pl</email>
+ </contributor>
+ <contributor>
+ <name>Sean Legassick</name>
+ <email>sean@informage.net</email>
+ </contributor>
+ <contributor>
+ <name>Oleg Kalnichevski</name>
+ <email>oleg@ural.ru</email>
+ </contributor>
+ <contributor>
+ <name>David Sean Taylor</name>
+ <email>taylor@apache.org</email>
+ </contributor>
+ </contributors>
+
+ <scm>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/commons-fileupload.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/commons-fileupload.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=commons-fileupload.git</url>
+ <tag>commons-fileupload-1.3.3-RC6</tag>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/FILEUPLOAD</url>
+ </issueManagement>
+
+ <properties>
+ <maven.compiler.source>1.5</maven.compiler.source>
+ <maven.compiler.target>1.5</maven.compiler.target>
+ <maven.compile.encoding>ISO-8859-1</maven.compile.encoding>
+ <commons.componentid>fileupload</commons.componentid>
+ <commons.release.version>1.3.3</commons.release.version>
+ <commons.rc.version>RC1</commons.rc.version>
+ <commons.jira.id>FILEUPLOAD</commons.jira.id>
+ <commons.jira.pid>12310476</commons.jira.pid>
+ <commons.osgi.export>!org.apache.commons.fileupload.util.mime,org.apache.commons.*;version=${project.version};-noimport:=true</commons.osgi.export>
+ <commons.osgi.import>!javax.portlet,*</commons.osgi.import>
+ <commons.osgi.dynamicImport>javax.portlet</commons.osgi.dynamicImport>
+ <project.scm.id>git-wip-us.apache.org</project.scm.id>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
+ <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <preparationGoals>clean site verify</preparationGoals>
+ <goals>clean site deploy</goals>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/commons/proper/fileupload/tags</tagBase>
+ </configuration>
+ </plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>[1.7,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>${commons.changes.version}</version>
+ <configuration>
+ <issueLinkTemplate>%URL%/../%ISSUE%</issueLinkTemplate>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ <!-- NPE, retry from time to time <report>jira-report</report> -->
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <configLocation>${basedir}/src/checkstyle/fileupload_checks.xml</configLocation>
+ <suppressionsLocation>${basedir}/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.7.1</version>
+ <configuration>
+ <targetJdk>${maven.compiler.target}</targetJdk>
+ <rulesets>
+ <ruleset>${basedir}/src/checkstyle/fileupload_basic.xml</ruleset>
+ </rulesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>${commons.clirr.version}</version>
+ <configuration>
+ <comparisonVersion>1.3</comparisonVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
diff --git a/lib/fileupload/commons-io.jar b/lib/fileupload/commons-io.jar
index 90035a4fe068e65d42edf621a0ffc78b4b020cdc..12349182711347e3d0b66ecfa35ec7b69a023b7e 100644
Binary files a/lib/fileupload/commons-io.jar and b/lib/fileupload/commons-io.jar differ
diff --git a/lib/fileupload/commons-io.pom b/lib/fileupload/commons-io.pom
index 10d0d11b9ecd8c1bb3be2ac3f49a3a7882a8b8e7..8ab814911e07e7a6449935b29174e068ce03abe8 100644
--- a/lib/fileupload/commons-io.pom
+++ b/lib/fileupload/commons-io.pom
@@ -1,330 +1,422 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-parent</artifactId>
- <version>25</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- <name>Commons IO</name>
-
- <inceptionYear>2002</inceptionYear>
- <description>
-The Commons IO library contains utility classes, stream implementations, file filters,
-file comparators, endian transformation classes, and much more.
- </description>
-
- <url>http://commons.apache.org/io/</url>
- <packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License Version 2.0, January 2004</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/IO</url>
- </issueManagement>
-
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <name>Apache Commons IO Site</name>
- <url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/${commons.componentid}</url>
- </site>
- </distributionManagement>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/io/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/io/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/io/trunk</url>
- </scm>
-
- <developers>
- <developer>
- <name>Scott Sanders</name>
- <id>sanders</id>
- <email>sanders@apache.org</email>
- <organization></organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>dIon Gillard</name>
- <id>dion</id>
- <email>dion@apache.org</email>
- <organization></organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Nicola Ken Barozzi</name>
- <id>nicolaken</id>
- <email>nicolaken@apache.org</email>
- <organization></organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Henri Yandell</name>
- <id>bayard</id>
- <email>bayard@apache.org</email>
- <organization></organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Stephen Colebourne</name>
- <id>scolebourne</id>
- <organization></organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>0</timezone>
- </developer>
- <developer>
- <name>Jeremias Maerki</name>
- <id>jeremias</id>
- <email>jeremias@apache.org</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <name>Matthew Hawthorne</name>
- <id>matth</id>
- <email>matth@apache.org</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Martin Cooper</name>
- <id>martinc</id>
- <email>martinc@apache.org</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Rob Oxspring</name>
- <id>roxspring</id>
- <email>roxspring@apache.org</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Jochen Wiedmann</name>
- <id>jochen</id>
- <email>jochen.wiedmann@gmail.com</email>
- </developer>
- <developer>
- <name>Niall Pemberton</name>
- <id>niallp</id>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Jukka Zitting</name>
- <id>jukka</id>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Gary Gregory</name>
- <id>ggregory</id>
- <email>ggregory@apache.org</email>
- <url>http://www.garygregory.com</url>
- <timezone>-5</timezone>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Rahul Akolkar</name>
- </contributor>
- <contributor>
- <name>Jason Anderson</name>
- </contributor>
- <contributor>
- <name>Nathan Beyer</name>
- </contributor>
- <contributor>
- <name>Emmanuel Bourg</name>
- </contributor>
- <contributor>
- <name>Chris Eldredge</name>
- </contributor>
- <contributor>
- <name>Magnus Grimsell</name>
- </contributor>
- <contributor>
- <name>Jim Harrington</name>
- </contributor>
- <contributor>
- <name>Thomas Ledoux</name>
- </contributor>
- <contributor>
- <name>Andy Lehane</name>
- </contributor>
- <contributor>
- <name>Marcelo Liberato</name>
- </contributor>
- <contributor>
- <name>Alban Peignier</name>
- <email>alban.peignier at free.fr</email>
- </contributor>
- <contributor>
- <name>Ian Springer</name>
- </contributor>
- <contributor>
- <name>Masato Tezuka</name>
- </contributor>
- <contributor>
- <name>James Urie</name>
- </contributor>
- <contributor>
- <name>Frank W. Zammetti</name>
- </contributor>
- </contributors>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <maven.compile.source>1.6</maven.compile.source>
- <maven.compile.target>1.6</maven.compile.target>
- <commons.componentid>io</commons.componentid>
- <commons.rc.version>RC1</commons.rc.version>
- <commons.release.version>2.4</commons.release.version>
- <commons.release.desc>(requires JDK 1.6+)</commons.release.desc>
- <commons.release.2.version>2.2</commons.release.2.version>
- <commons.release.2.desc>(requires JDK 1.5+)</commons.release.2.desc>
- <commons.jira.id>IO</commons.jira.id>
- <commons.jira.pid>12310477</commons.jira.pid>
- <commons.osgi.export>
- <!-- Explicit list of packages from IO 1.4 -->
- org.apache.commons.io;
- org.apache.commons.io.comparator;
- org.apache.commons.io.filefilter;
- org.apache.commons.io.input;
- org.apache.commons.io.output;version=1.4.9999;-noimport:=true,
- <!-- Same list plus * for new packages -->
- org.apache.commons.io;
- org.apache.commons.io.comparator;
- org.apache.commons.io.filefilter;
- org.apache.commons.io.input;
- org.apache.commons.io.output;
- org.apache.commons.io.*;version=${project.version};-noimport:=true
- </commons.osgi.export>
- </properties>
-
- <build>
- <pluginManagement>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <!-- limit memory size see IO-161 -->
- <argLine>-Xmx25M</argLine>
- <includes>
- <!-- Only include test classes, not test data -->
- <include>**/*Test*.class</include>
- </includes>
- <excludes>
- <exclude>**/*AbstractTestCase*</exclude>
- <exclude>**/testtools/**</exclude>
- <!-- http://jira.codehaus.org/browse/SUREFIRE-44 -->
- <exclude>**/*$*</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9.1</version>
- <configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
- <enableRulesSummary>false</enableRulesSummary>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.4.0</version>
- <configuration>
- <threshold>Normal</threshold>
- <effort>Default</effort>
- <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/test/resources/**/*.bin</exclude>
- <exclude>.pmd</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>39</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.5</version>
+ <name>Apache Commons IO</name>
+
+ <inceptionYear>2002</inceptionYear>
+ <description>
+The Apache Commons IO library contains utility classes, stream implementations, file filters,
+file comparators, endian transformation classes, and much more.
+ </description>
+
+ <url>http://commons.apache.org/proper/commons-io/</url>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/IO</url>
+ </issueManagement>
+
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <name>Apache Commons Site</name>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-i/</url>
+ </site>
+ </distributionManagement>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/io/tags/commons-io-2.5</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/io/tags/commons-io-2.5</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/io/tags/commons-io-2.5</url>
+ </scm>
+
+ <developers>
+ <developer>
+ <name>Scott Sanders</name>
+ <id>sanders</id>
+ <email>sanders@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>dIon Gillard</name>
+ <!-- Note: first name is correctly capitalised above -->
+ <id>dion</id>
+ <email>dion@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Nicola Ken Barozzi</name>
+ <id>nicolaken</id>
+ <email>nicolaken@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Henri Yandell</name>
+ <id>bayard</id>
+ <email>bayard@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Stephen Colebourne</name>
+ <id>scolebourne</id>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>0</timezone>
+ </developer>
+ <developer>
+ <name>Jeremias Maerki</name>
+ <id>jeremias</id>
+ <email>jeremias@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>Matthew Hawthorne</name>
+ <id>matth</id>
+ <email>matth@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Martin Cooper</name>
+ <id>martinc</id>
+ <email>martinc@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rob Oxspring</name>
+ <id>roxspring</id>
+ <email>roxspring@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Jochen Wiedmann</name>
+ <id>jochen</id>
+ <email>jochen.wiedmann@gmail.com</email>
+ </developer>
+ <developer>
+ <name>Niall Pemberton</name>
+ <id>niallp</id>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Jukka Zitting</name>
+ <id>jukka</id>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Gary Gregory</name>
+ <id>ggregory</id>
+ <email>ggregory@apache.org</email>
+ <url>http://www.garygregory.com</url>
+ <timezone>-5</timezone>
+ </developer>
+ <developer>
+ <name>Kristian Rosenvold</name>
+ <id>krosenvold</id>
+ <email>krosenvold@apache.org</email>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Rahul Akolkar</name>
+ </contributor>
+ <contributor>
+ <name>Jason Anderson</name>
+ </contributor>
+ <contributor>
+ <name>Nathan Beyer</name>
+ </contributor>
+ <contributor>
+ <name>Emmanuel Bourg</name>
+ </contributor>
+ <contributor>
+ <name>Chris Eldredge</name>
+ </contributor>
+ <contributor>
+ <name>Magnus Grimsell</name>
+ </contributor>
+ <contributor>
+ <name>Jim Harrington</name>
+ </contributor>
+ <contributor>
+ <name>Thomas Ledoux</name>
+ </contributor>
+ <contributor>
+ <name>Andy Lehane</name>
+ </contributor>
+ <contributor>
+ <name>Marcelo Liberato</name>
+ </contributor>
+ <contributor>
+ <name>Alban Peignier</name>
+ <email>alban.peignier at free.fr</email>
+ </contributor>
+ <contributor>
+ <name>Ian Springer</name>
+ </contributor>
+ <contributor>
+ <name>Dominik Stadler</name>
+ </contributor>
+ <contributor>
+ <name>Masato Tezuka</name>
+ </contributor>
+ <contributor>
+ <name>James Urie</name>
+ </contributor>
+ <contributor>
+ <name>Frank W. Zammetti</name>
+ </contributor>
+ </contributors>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <commons.componentid>io</commons.componentid>
+ <commons.rc.version>RC4</commons.rc.version>
+ <commons.release.version>2.5</commons.release.version>
+ <commons.release.desc>(requires JDK 1.6+)</commons.release.desc>
+ <commons.jira.id>IO</commons.jira.id>
+ <commons.jira.pid>12310477</commons.jira.pid>
+ <commons.osgi.export>
+ <!-- Explicit list of packages from IO 1.4 -->
+ org.apache.commons.io;
+ org.apache.commons.io.comparator;
+ org.apache.commons.io.filefilter;
+ org.apache.commons.io.input;
+ org.apache.commons.io.output;version=1.4.9999;-noimport:=true,
+ <!-- Same list plus * for new packages -->
+ org.apache.commons.io;
+ org.apache.commons.io.comparator;
+ org.apache.commons.io.filefilter;
+ org.apache.commons.io.input;
+ org.apache.commons.io.output;
+ org.apache.commons.io.*;version=${project.version};-noimport:=true
+ </commons.osgi.export>
+
+ <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.14.1</version>
+ <configuration>
+ <classpathDependencyExcludes>
+ <classpathDependencyExclude>xerces:xercesImpl</classpathDependencyExclude>
+ </classpathDependencyExcludes>
+ <forkMode>pertest</forkMode>
+ <!-- limit memory size see IO-161 -->
+ <argLine>-Xmx25M</argLine>
+ <includes>
+ <!-- Only include test classes, not test data -->
+ <include>**/*Test*.class</include>
+ </includes>
+ <excludes>
+ <exclude>**/*AbstractTestCase*</exclude>
+ <exclude>**/testtools/**</exclude>
+ <!-- http://jira.codehaus.org/browse/SUREFIRE-44 -->
+ <exclude>**/*$*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <ignorePathsToDelete>
+ <ignorePathToDelete>javadocs</ignorePathToDelete>
+ </ignorePathsToDelete>
+ </configuration>
+ </plugin>
+ <!-- Configure RAT for CLI invocation: mvn apache-rat:rat -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <!-- Must agree with report section RAT config -->
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/**/*.bin</exclude>
+ <exclude>test/**</exclude>
+
+ <!-- The next 3 excludes can be dropped when using CP30 -->
+ <exclude>site-content/**</exclude>
+ <exclude>.pmd</exclude>
+ <exclude>src/site/resources/download_*.cgi</exclude>
+
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.12.1</version>
+ <configuration>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${commons.findbugs.version}</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <!-- Must agree with build section RAT config -->
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/**/*.bin</exclude>
+ <exclude>test/**</exclude>
+
+ <!-- The next 3 excludes can be dropped when using CP30 -->
+ <exclude>site-content/**</exclude>
+ <exclude>.pmd</exclude>
+ <exclude>src/site/resources/download_*.cgi</exclude>
+
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ <profiles>
+ <profile>
+ <id>setup-checkout</id>
+ <activation>
+ <file>
+ <missing>site-content</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>prepare-checkout</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <exec executable="svn">
+ <arg line="checkout --depth immediates ${commons.scmPubUrl} ${commons.scmPubCheckoutDirectory}" />
+ </exec>
+
+ <exec executable="svn">
+ <arg line="update --set-depth exclude ${commons.scmPubCheckoutDirectory}/javadocs" />
+ </exec>
+
+ <pathconvert pathsep=" " property="dirs">
+ <dirset dir="${commons.scmPubCheckoutDirectory}" includes="*" />
+ </pathconvert>
+ <exec executable="svn">
+ <arg line="update --set-depth infinity ${dirs}" />
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
diff --git a/lib/gson/gson.jar b/lib/gson/gson.jar
index 8b95cc972653ec082dd26ce388d96cd857284013..5222355ad07b3d6565185fcb00fd1e9b57a1fdbc 100644
Binary files a/lib/gson/gson.jar and b/lib/gson/gson.jar differ
diff --git a/lib/gson/gson.pom b/lib/gson/gson.pom
index 6ef49d6dd6b903adad70dde3bee7f3b0abeef0c1..9819b6ab5ee6939548708acc29a8db437566fe6a 100644
--- a/lib/gson/gson.pom
+++ b/lib/gson/gson.pom
@@ -1,246 +1,61 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <packaging>jar</packaging>
- <version>2.4</version>
- <inceptionYear>2008</inceptionYear>
- <name>Gson</name>
+
<parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>9</version>
- <relativePath />
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson-parent</artifactId>
+ <version>2.8.1</version>
</parent>
- <url>https://github.com/google/gson</url>
- <description>Google Gson library</description>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <connection>scm:git:https://github.com/google/gson.git</connection>
- <developerConnection>scm:git:https://github.com/google/gson.git</developerConnection>
- <url>https://github.com/google/gson</url>
- <tag>gson-${project.version}</tag>
- </scm>
- <issueManagement>
- <system>Github Issue Tracking</system>
- <url>https://github.com/google/gson/issues</url>
- </issueManagement>
- <distributionManagement>
- <snapshotRepository>
- <id>sonatype-nexus-snapshots</id>
- <name>Sonatype Nexus Snapshots</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
- </snapshotRepository>
- <repository>
- <id>sonatype-nexus-staging</id>
- <name>Nexus Release Repository</name>
- <url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
- </repository>
- </distributionManagement>
- <organization>
- <name>Google, Inc.</name>
- <url>http://www.google.com</url>
- </organization>
+
+ <artifactId>gson</artifactId>
+ <name>Gson</name>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
- <profiles>
- <!-- Activate PGP signing only when performing a release -->
- <profile>
- <id>release-sign-artifacts</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
<build>
- <defaultGoal>package</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <includePackageNames>com.google.gson</includePackageNames>
+ <excludePackageNames>com.google.gson.internal:com.google.gson.internal.bind</excludePackageNames>
+ <links>
+ <link>http://docs.oracle.com/javase/6/docs/api/</link>
+ </links>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.6</version>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>3.1.0</version>
<executions>
<execution>
- <phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>bnd-process</goal>
</goals>
</execution>
</executions>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- <manifestEntries>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5, JavaSE-1.6, JavaSE-1.7, JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
- <Export-Package><![CDATA[com.google.gson;version=${project.version}, com.google.gson.annotations;version=${project.version}, com.google.gson.reflect;version=${project.version}, com.google.gson.stream;version=${project.version}, com.google.gson.internal;version=${project.version}, com.google.gson.internal.bind;version=${project.version}]]></Export-Package>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Bundle-ContactAddress>https://github.com/google/gson</Bundle-ContactAddress>
- <Bundle-Vendor>Google Gson Project</Bundle-Vendor>
- <Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-Description>${project.description}</Bundle-Description>
- <Bundle-ClassPath>.</Bundle-ClassPath>
- <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
- <Bundle-SymbolicName>com.google.gson</Bundle-SymbolicName>
- </manifestEntries>
- </archive>
- </configuration>
</plugin>
- <plugin>
- <!-- TODO(inder): add manifest entry for maven group, artifact, and classifier ids -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestEntries>
- <Eclipse-SourceBundle>com.google.gson;version="${project.version}"</Eclipse-SourceBundle>
- <Bundle-SymbolicName>com.google.gson.source</Bundle-SymbolicName>
- <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
- <Bundle-Version>${project.version}</Bundle-Version>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <!-- TODO(inder): add manifest entry for maven group, artifact, and classifier ids -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.3</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includePackageNames>com.google.gson</includePackageNames>
- <excludePackageNames>com.google.gson.internal:com.google.gson.internal.bind</excludePackageNames>
- <links>
- <link>http://docs.oracle.com/javase/1.5.0/docs/api/</link>
- </links>
- <version>true</version>
- <show>protected</show>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.10</version>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- <workspace>
- ../eclipse-ws/
- </workspace>
- <workspaceCodeStylesURL>
- file:///${basedir}/../lib/gson-formatting-styles.xml
- </workspaceCodeStylesURL>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <!-- version>2.5</version -->
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <arguments>-DenableCiProfile=true</arguments>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.5</version>
- <configuration>
- <descriptor>assembly-descriptor.xml</descriptor>
- <finalName>google-gson-${project.version}</finalName>
- <outputDirectory>target/dist</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
- <developers>
- <developer>
- <name>Inderjeet Singh</name>
- </developer>
- <developer>
- <name>Joel Leitch</name>
- <organization>Google Inc.</organization>
- </developer>
- <developer>
- <name>Jesse Wilson</name>
- <organization>Square Inc.</organization>
- </developer>
- </developers>
</project>
diff --git a/lib/jdbc/mysql-connector-java.jar b/lib/jdbc/mysql-connector-java.jar
index 21b99db0971c6070b0b7bfaa45f0187b64576458..4c6df38c142a66e1a8ed0a39358484eb71425a6b 100644
Binary files a/lib/jdbc/mysql-connector-java.jar and b/lib/jdbc/mysql-connector-java.jar differ
diff --git a/lib/jdbc/mysql-connector-java.pom b/lib/jdbc/mysql-connector-java.pom
index 193ed75fb198769affe5d779c8899e6a87bc797f..379f09bed0a06fb6e082dbc719660a35306cfb8c 100644
--- a/lib/jdbc/mysql-connector-java.pom
+++ b/lib/jdbc/mysql-connector-java.pom
@@ -3,7 +3,7 @@
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.36</version>
+ <version>5.1.42</version>
<name>Java Database connector (JDBC) for MySQL</name>
<licenses>
<license>
diff --git a/lib/jdbc/postgresql-jdbc4.jar b/lib/jdbc/postgresql-jdbc4.jar
index 61b202169bd8910e0f362aee65abd37c09ed17d5..1f90b17bdee7e923fad5fd1af873e35ffdeefd81 100644
Binary files a/lib/jdbc/postgresql-jdbc4.jar and b/lib/jdbc/postgresql-jdbc4.jar differ
diff --git a/lib/jdbc/postgresql-jdbc4.pom b/lib/jdbc/postgresql-jdbc4.pom
index 6821ea0a522ee258f707a06e669b30f78c6f3d27..d112d4520cd2ad87c7763f432336282d1ea3d84a 100644
--- a/lib/jdbc/postgresql-jdbc4.pom
+++ b/lib/jdbc/postgresql-jdbc4.pom
@@ -1,28 +1,284 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.postgresql</groupId>
+ <artifactId>pgjdbc-core-parent</artifactId>
+ <version>1.1.2</version>
+ <relativePath />
+ </parent>
+
+ <artifactId>postgresql</artifactId>
+ <packaging>bundle</packaging>
+ <name>PostgreSQL JDBC Driver - JDBC 4.2</name>
+ <version>42.1.1</version>
+ <description>Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database</description>
+ <url>https://github.com/pgjdbc/pgjdbc</url>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql-jdbc4</artifactId>
- <version>9.4-1204</version>
- <name>Java Database connector (JDBC) for Postgres</name>
<licenses>
<license>
- <name>BSD</name>
- <url>http://www.opensource.org/licenses/bsd-license.php</url>
- <distribution>repo</distribution>
- </license>
+ <name>BSD-2-Clause</name>
+ <url>https://jdbc.postgresql.org/about/license.html</url>
+ </license>
</licenses>
- <url></url>
- <!--distributionManagement>
- <downloadUrl></downloadUrl>
- </distributionManagement-->
-
- <!--dependencies>
- <dependency>
- <groupId>org.apache.xml</groupId>
- <artifactId>xml-apis</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies-->
+ <organization>
+ <name>PostgreSQL Global Development Group</name>
+ <url>https://jdbc.postgresql.org/</url>
+ </organization>
+
+ <properties>
+ <!-- Require JDK 1.8 or later -->
+ <javac.target>1.8</javac.target>
+ <postgresql.enforce.jdk.version>1.8</postgresql.enforce.jdk.version>
+ <jdbc.specification.version>4.2</jdbc.specification.version>
+ <jdbc.specification.version.nodot>42</jdbc.specification.version.nodot>
+ <skip.assembly>false</skip.assembly>
+ <checkstyle.version>7.4</checkstyle.version>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>translate</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.gettext-commons</groupId>
+ <artifactId>gettext-maven-plugin</artifactId>
+ <version>1.2.4</version>
+ <executions>
+ <execution>
+ <id>generate_pot_and_po_files</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>merge</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>src/main/resources</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate_resource_bundles</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>dist</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <outputDirectory>src/main/resources</outputDirectory>
+ <keysFile>messages.pot</keysFile>
+ <poDirectory>src/main/java/org/postgresql/translation</poDirectory>
+ <targetBundle>org.postgresql.translation.messages</targetBundle>
+ <keywords>-kGT.tr</keywords>
+ <msgmergeCmd>msgmerge</msgmergeCmd>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean_msmerge_backups</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <!-- Do not delete target folder -->
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>src/main/resources/org/postgresql/translation</directory>
+ <includes>
+ <include>**$*.class</include>
+ <include>messages.properties</include>
+ <include>messages_en.properties</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>src/main/java/org/postgresql/translation</directory>
+ <includes>
+ <include>*.po.~*~</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>excludeWaffleFiles</id>
+ <activation>
+ <property>
+ <name>waffleEnabled</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>org/postgresql/sspi/NTDSAPI.java</exclude>
+ <exclude>org/postgresql/sspi/NTDSAPIWrapper.java</exclude>
+ <exclude>org/postgresql/sspi/SSPIClient.java</exclude>
+ </excludes>
+ <testExcludes>
+ <exclude>org/postgresql/test/sspi/*.java</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>excludeOsgiFiles</id>
+ <activation>
+ <property>
+ <name>osgiEnabled</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>org/postgresql/osgi/PGBundleActivator.java</exclude>
+ <exclude>org/postgresql/osgi/PGDataSourceFactory.java</exclude>
+ </excludes>
+ <testExcludes combine.children="append">
+ <exclude>**/PGDataSourceFactoryTest.java</exclude>
+ <exclude>**/OsgiTestSuite.java</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/OsgiTestSuite.java</exclude>
+ <exclude>**/PGDataSourceFactoryTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>jdk9-workarounds</id>
+ <!-- see https://github.com/pgjdbc/pgjdbc/pull/565 -->
+ <activation>
+ <property>
+ <name>javac.target</name>
+ <value>1.9</value>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>2.4.4</version>
+ <!-- newer versions fail as described in http://stackoverflow.com/a/36605759/1261287
+ Caused by: java.lang.ArrayIndexOutOfBoundsException: 1
+ at org.codehaus.plexus.archiver.zip.AbstractZipArchiver.<clinit>(AbstractZipArchiver.java:116)
+ -->
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>2.4.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4.1</version> <!-- override version to older one -->
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>2.4.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <chmod>true</chmod>
+ <inputEncoding>UTF-8</inputEncoding>
+ <outputEncoding>UTF-8</outputEncoding>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${checkstyle.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <configLocation>src/main/checkstyle/checks.xml</configLocation>
+ <suppressionsLocation>src/main/checkstyle/suppressions.xml</suppressionsLocation>
+ <violationSeverity>error</violationSeverity>
+ <failOnViolation>true</failOnViolation>
+ <failsOnError>true</failsOnError>
+ <consoleOutput>true</consoleOutput>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <scm>
+ <tag>REL42.1.1</tag>
+ </scm>
</project>