ref #8812 managing dependencies via maven, removing duplicate dependencies, updating...

diff --git a/.gitignore b/.gitignore
index 8ba1a0ec2b79280e4939cf0f86f4ef4a4a4287c9..c267e0f5f0a93552d224828ac689e29884bbd23b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.zip
 eu.etaxonomy.taxeditor.cdmlib/dist
 eu.etaxonomy.taxeditor.cdmlib/lib/cdm-server*
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib*
+eu.etaxonomy.taxeditor.cdmlib/lib/http*
 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
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.weaving.hook-1.0.100.v20110502.jar

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.gitignore b/eu.etaxonomy.taxeditor.cdmlib/.gitignore
index 41b529a2179c63c4a7fdeb5afd85cd68ed2e5720..8000a78c4ef391d06ce0f4381b512e49a8f79272 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.gitignore
+++ b/eu.etaxonomy.taxeditor.cdmlib/.gitignore
@@ -1,5 +1,2 @@
 bin
 /target/
-/target/
-/target/
-/target/

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index b798bc7cca1bbc8d256b4535d79d51e4c71faab2..723ab3d758240783b42d80629681cbfe044ac6c9 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -652,7 +652,6 @@ Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.equinox.common,
- org.apache.commons.httpclient;bundle-version="3.1.0",
  org.eclipse.core.runtime,
  org.eclipse.e4.core.di.annotations;bundle-version="1.5.0",
  org.eclipse.e4.ui.services;bundle-version="1.2.100",
@@ -710,10 +709,6 @@ Bundle-ClassPath: .,
  lib/hibernate-validator-5.2.2.Final.jar,
  lib/hibernate-validator-cdi-5.2.2.Final.jar,
  lib/hsqldb-2.3.3.jar,
- lib/httpclient-4.5.1.jar,
- lib/httpclient-cache-4.2.6.jar,
- lib/httpcore-4.4.4.jar,
- lib/httpmime-4.5.1.jar,
  lib/icu4j-2.6.1.jar,
  lib/identificationKeyAPI-1.0.jar,
  lib/itextpdf-5.5.8.jar,
@@ -882,5 +877,9 @@ Bundle-ClassPath: .,
  lib/org.swtchart_0.10.0.v20160212.jar,
  lib/commons-math3-3.6.1.jar,
  lib/docx4j-6.0.1.jar,
- lib/mysql-connector-java-8.0.15.jar
+ lib/mysql-connector-java-8.0.15.jar,
+ lib/httpclient-4.5.11.jar,
+ lib/httpclient-cache-4.2.6.jar,
+ lib/httpcore-4.4.13.jar,
+ lib/httpmime-4.5.1.jar
 Import-Package: eu.etaxonomy.cdm.api.application

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index bbd3a811be42f03d15f7bbc47f1a3e575d28055e..2fadc933e8257b873e8eb7086dcfcabcd2d6d0d0 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -51,9 +51,9 @@ bin.includes = META-INF/,\
                lib/hibernate-validator-5.2.2.Final.jar,\
                lib/hibernate-validator-cdi-5.2.2.Final.jar,\
                lib/hsqldb-2.3.3.jar,\
-               lib/httpclient-4.5.1.jar,\
+               lib/httpclient-4.5.11.jar,\
                lib/httpclient-cache-4.2.6.jar,\
-               lib/httpcore-4.4.4.jar,\
+               lib/httpcore-4.4.13.jar,\
                lib/httpmime-4.5.1.jar,\
                lib/icu4j-2.6.1.jar,\
                lib/identificationKeyAPI-1.0.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar
deleted file mode 100644 (file)
index b9c0c1c..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar
deleted file mode 100644 (file)
index f6a7cd4..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar
deleted file mode 100644 (file)
index ac4a877..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar
deleted file mode 100644 (file)
index 53a6420..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 11cb0e6a55128c1f6785f4245dfeb5a91f732900..e0c60311fc4bb608069f63f59d522f2e9371a38e 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -47,6 +47,43 @@
               <excludeTransitive>true</excludeTransitive>\r
             </configuration>\r
           </execution>\r
+          <execution>\r
+            <id>copy-dependency-jars</id>\r
+            <phase>validate</phase>\r
+            <goals>\r
+              <goal>copy-dependencies</goal>\r
+            </goals>\r
+            <configuration>\r
+              <includeArtifactIds>\r
+                httpclient\r
+              </includeArtifactIds>\r
+              <outputDirectory>\r
+                ${basedir}/lib\r
+              </outputDirectory>\r
+              <overWriteReleases>true</overWriteReleases>\r
+              <overWriteSnapshots>true</overWriteSnapshots>\r
+              <excludeTransitive>true</excludeTransitive>\r
+            </configuration>\r
+          </execution>\r
+          <execution>\r
+            <id>copy-dependency-jars-transitive</id>\r
+            <phase>validate</phase>\r
+            <goals>\r
+              <goal>copy-dependencies</goal>\r
+            </goals>\r
+            <configuration>\r
+              <includeArtifactIds>\r
+                httpclient-cache,httpcore,httpmime\r
+<!--                 c3p0,mchange-commons-java,h2,postgresql,mysql-connector-java,jdbc4 -->\r
+              </includeArtifactIds>\r
+              <outputDirectory>\r
+                ${basedir}/lib\r
+              </outputDirectory>\r
+              <overWriteReleases>true</overWriteReleases>\r
+              <overWriteSnapshots>true</overWriteSnapshots>\r
+              <excludeTransitive>false</excludeTransitive>\r
+            </configuration>\r
+          </execution>\r
           <execution>\r
             <id>copy-dependency-war</id>\r
             <phase>validate</phase>\r
@@ -454,6 +491,11 @@
       <version>2.4</version>\r
     </dependency>\r
 \r
+    <dependency>\r
+      <groupId>org.apache.httpcomponents</groupId>\r
+      <artifactId>httpclient</artifactId>\r
+    </dependency>\r
+\r
     <!-- For Unit Tests Start -->\r
        <!-- still needed? -->\r
 \r

diff --git a/pom.xml b/pom.xml
index 3b1d2504393b49e7e050674a69de1767657b7134..00baab7e34dfb8218047ff5641d1208db6c963d5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -532,7 +532,7 @@
         <artifactId>itextpdf</artifactId>
         <version>5.5.8</version>
       </dependency>
-            <dependency>
+      <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
         <version>${httpcomponents.version}</version>