update to httpclient 4.5.12, commons-lang3 3.10 and commons-codec 1.14

diff --git a/.gitignore b/.gitignore
index 55b96930b4a365bc9db404690948b3758815f92a..54d3217397911a7d875738023d7cc84279dbc94e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/http*
 eu.etaxonomy.taxeditor.cdmlib/lib/JavaAPIforKml*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/iiif-apis*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec*.jar
 
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.servletbridge.extensionbundle-1.2.0.v20100503.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.transforms.hook-1.0.300.v20100719.jar

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index b3dd54ba5be30a8b15f86afab066a9ebeaa3f60f..44979b81e569ebdeedb5f79748dc3877539b411d 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -619,13 +619,13 @@ Bundle-ClassPath: .,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
  lib/commons-beanutils-1.9.4.jar,
- lib/commons-codec-1.10.jar,
+ lib/commons-codec-1.14.jar,
  lib/commons-collections-3.2.2.jar,
  lib/commons-csv-1.0.jar,
  lib/commons-dbcp-1.4.jar,
  lib/commons-io-2.4.jar,
  lib/commons-lang-2.6.jar,
- lib/commons-lang3-3.3.2.jar,
+ lib/commons-lang3-3.10.jar,
  lib/commons-logging-1.2.jar,
  lib/commons-pool-1.5.4.jar,
  lib/dbunit-2.4.9.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 5b8ee1cfea8b29d88686bac029bb5378a7dbdc3b..96acb374960c752677ea60dc83944df76be43eed 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -16,13 +16,13 @@ bin.includes = META-INF/,\
                lib/com.springsource.org.aopalliance-1.0.0.jar,\
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\
                lib/commons-beanutils-1.9.4.jar,\
-               lib/commons-codec-1.10.jar,\
+               lib/commons-codec-1.14.jar,\
                lib/commons-collections-3.2.2.jar,\
                lib/commons-csv-1.0.jar,\
                lib/commons-dbcp-1.4.jar,\
                lib/commons-io-2.4.jar,\
                lib/commons-lang-2.6.jar,\
-               lib/commons-lang3-3.3.2.jar,\
+               lib/commons-lang3-3.10.jar,\
                lib/commons-logging-1.2.jar,\
                lib/commons-pool-1.5.4.jar,\
                lib/dbunit-2.4.9.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar
deleted file mode 100644 (file)
index 1d7417c..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar
deleted file mode 100644 (file)
index 2ce08ae..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 66058cd60924747cfa16c77c89580408da34dd14..35af247dd7723a6a0421b75d56bc7f5ab1864ca2 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -54,7 +54,7 @@
             </goals>\r
             <configuration>\r
               <includeArtifactIds>\r
-                httpclient,JavaAPIforKml,iiif-apis,commons-beanutils\r
+                httpclient,JavaAPIforKml,iiif-apis,commons-beanutils,commons-lang3,commons-codec\r
               </includeArtifactIds>\r
               <outputDirectory>\r
                 ${basedir}/lib\r
@@ -352,6 +352,18 @@
       <artifactId>httpclient</artifactId>\r
     </dependency>\r
 \r
+    <dependency>\r
+        <groupId>org.apache.commons</groupId>\r
+        <artifactId>commons-lang3</artifactId>\r
+        <version>3.10</version>\r
+    </dependency>\r
+    <dependency>\r
+       <!-- used in AuthenticatingHttpInvokerRequestExecutor -->\r
+        <groupId>commons-codec</groupId>\r
+        <artifactId>commons-codec</artifactId>\r
+        <version>1.14</version>\r
+    </dependency>\r
+\r
     <!-- For Unit Tests Start -->\r
        <!-- still needed? -->\r
 \r

diff --git a/pom.xml b/pom.xml
index 6055c15fe90bd556ec6cc3983675032873fd49aa..e56cbe17e024ae421e66e8cf5588777ad8672c31 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.version>
     <javadoc.opts>-Xdoclint:none</javadoc.opts>
-    <httpcomponents.version>4.5.11</httpcomponents.version>
+    <httpcomponents.version>4.5.12</httpcomponents.version>
     <jetty-version>9.4.26.v20200117</jetty-version>
   </properties>
   <modules>