X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/765bd4c4404fe188d1ad4784db6e23c8feef4169..a3d55d2f6e16df7b1717a42293c249159a62345d:/eu.etaxonomy.taxeditor.cdmlib/pom.xml

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 2fb312f2a..b528d42d7 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -10,7 +10,9 @@
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
   <packaging>eclipse-plugin</packaging>
   <properties>
-      <jackson.version>2.11.2</jackson.version>           <!-- checked 2020-08 -->
+      <jackson.version>2.11.2</jackson.version>
+      <poi.version>4.1.2</poi.version>
+      <hibernate.version>5.1.17.Final</hibernate.version>
   </properties>
   <name>CDM Library Dependencies Plugin</name>
   <description>CDM Library and dependencies as a plugin</description>
@@ -20,7 +22,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.7</version>
+          <version>2.22.2</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -41,7 +43,7 @@
                 cdmlib-remote-webapp
               </excludeArtifactIds>
               <includeArtifactIds>
-                cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-services,cdmlib-cache,cdmlib-ext,cdmlib-io,cdmlib-remote,cdmlib-print
+                cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-services,cdmlib-cache,cdmlib-ext,cdmlib-io
               </includeArtifactIds>
               <outputDirectory>${basedir}/lib</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
@@ -57,8 +59,25 @@
             </goals>
             <configuration>
               <includeArtifactIds>
-                httpclient,JavaAPIforKml,iiif-apis,commons-beanutils,commons-lang3,commons-codec,
-                commons-imaging,h2,jackson-databind,jackson-annotations,jackson-core
+                httpclient,JavaAPIforKml,iiif-apis,commons-beanutils,commons-lang3,commons-lang,commons-codec,
+                commons-imaging,jackson-databind,jackson-annotations,jackson-core,jboss-logging,
+                validation-api,classmate,javax.el-api,slf4j-api,slf4j-log4j12,
+                ehcache,
+                hibernate-validator,
+                spring-context,spring-context-support,spring-aspects,spring-test,spring-beans,
+                spring-tx,spring-web,spring-core,spring-aop,spring-expression,spring-orm,
+                spring-oxm,spring-jdbc,spring-security-config,spring-security-core,
+                aopalliance,aspectjweaver,aspectjrt,
+                hibernate-jpa-2.1-api,javassist,hibernate-commons-annotations,
+                hibernate-core,hibernate-entitymanager,hibernate-envers,antlr,cglib-nodep,
+                xml-apis,lsid-client,jdom,jdom2,
+                poi,poi-ooxml,poi-ooxml-schemas,xmlbeans,commons-collections4,commons-math3,
+                jaxb-api,javax.activation-api,
+                c3p0,opencsv,joda-time,usertype.jodatime,usertype.spi,
+                apache-log4j-extras,
+                h2,mysql-connector-java,postgresql,
+                junit,hamcrest-core,commons-dbcp,commons-pool,
+                jboss-transaction-api_1.2_spec
               </includeArtifactIds>
               <outputDirectory>
                 ${basedir}/lib
@@ -76,8 +95,7 @@
             </goals>
             <configuration>
               <includeArtifactIds>
-                httpclient-cache,httpcore,httpmime
-<!--                 c3p0,mchange-commons-java,h2,postgresql,mysql-connector-java,jdbc4 -->
+                httpclient-cache,httpcore,httpmime,xercesImpl
               </includeArtifactIds>
               <outputDirectory>
                 ${basedir}/lib
@@ -215,16 +233,6 @@
       <artifactId>cdmlib-persistence</artifactId>
       <version>${cdmlib.version}</version>
     </dependency>
-    <dependency>
-      <groupId>eu.etaxonomy</groupId>
-      <artifactId>cdmlib-remote</artifactId>
-      <version>${cdmlib.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>eu.etaxonomy</groupId>
-      <artifactId>cdmlib-print</artifactId>
-      <version>${cdmlib.version}</version>
-    </dependency>
     <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-services</artifactId>
@@ -245,6 +253,28 @@
       <artifactId>cdmlib-cache</artifactId>
       <version>${cdmlib.version}</version>
     </dependency>
+    
+    <!-- required -->
+    <dependency>
+	    <groupId>net.sf.ehcache</groupId>
+	    <artifactId>ehcache</artifactId>
+	    <version>2.10.6</version>
+	</dependency>
+    
+    <!-- needed, but should try to remove -->
+    <dependency>
+    	<!-- see #9205 for how to remove -->
+    	<groupId>log4j</groupId>
+    	<artifactId>apache-log4j-extras</artifactId>
+    	<version>1.2.17</version>
+	</dependency>
+    <dependency>
+	    <!-- somehow this is required for logging, covered by tests, but maybe can be removed somehow -->
+	    <groupId>org.jboss.spec.javax.transaction</groupId>
+	    <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+	    <version>1.1.1.Final</version>
+	</dependency>
+    
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
@@ -256,6 +286,28 @@
       <version>1.2.17</version>
     </dependency>
     <dependency>
+	    <groupId>joda-time</groupId>
+	    <artifactId>joda-time</artifactId>
+	    <version>2.10.6</version>
+	</dependency>
+	<dependency>
+	    <groupId>org.jadira.usertype</groupId>
+	    <artifactId>usertype.jodatime</artifactId>
+	    <version>2.0.1</version>
+	</dependency>
+	<dependency>
+	    <groupId>org.jadira.usertype</groupId>
+	    <artifactId>usertype.spi</artifactId>
+	    <version>2.0.1</version>
+	</dependency>
+    <dependency>
+      <!-- needed? -->
+      <groupId>org.jdom</groupId>
+      <artifactId>jdom2</artifactId>
+      <version>2.0.6</version>
+    </dependency>
+    <dependency>
+      <!-- needed? -->
       <groupId>org.jdom</groupId>
       <artifactId>jdom</artifactId>
       <version>1.1.3</version>
@@ -263,83 +315,91 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>4.2.4.RELEASE</version>
+      <version>4.3.28.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>4.2.4.RELEASE</version>
+      <version>4.3.28.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aspects</artifactId>
-      <version>4.2.4.RELEASE</version>
+      <version>4.3.28.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>4.2.4.RELEASE</version>
+      <version>4.3.28.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>4.2.4.RELEASE</version>
+      <version>4.3.28.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>4.2.4.RELEASE</version>
+      <version>4.3.28.RELEASE</version>
     </dependency>
     <dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>4.2.4.RELEASE</version>
+		<version>4.3.28.RELEASE</version>
 	</dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>4.2.4.RELEASE</version>
+      <version>4.3.28.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>4.2.4.RELEASE</version>
+      <version>4.3.28.RELEASE</version>
     </dependency>
     <dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-expression</artifactId>
-		<version>4.2.4.RELEASE</version>
+		<version>4.3.28.RELEASE</version>
 	</dependency>
-   <dependency>
+    <dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-orm</artifactId>
-		<version>4.2.4.RELEASE</version>
+		<version>4.3.28.RELEASE</version>
+	</dependency>
+	<dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-oxm</artifactId>
+		<version>4.3.28.RELEASE</version>
 	</dependency>
     <dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-jdbc</artifactId>
-		<version>4.2.4.RELEASE</version>
+		<version>4.3.28.RELEASE</version>
 	</dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>4.0.3.RELEASE</version>
+      <version>4.2.18.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
-      <version>4.0.3.RELEASE</version>
+      <version>4.2.18.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-remoting</artifactId>
-      <version>4.0.3.RELEASE</version>
+      <version>4.2.18.RELEASE</version>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
-    </dependency>
+    	<!-- dependency of spring security core, can be removed after
+    	upgrading to spring security 5.x -->
+	    <groupId>aopalliance</groupId>
+	    <artifactId>aopalliance</artifactId>
+	    <version>1.0</version>
+	</dependency>
+
     <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
@@ -349,24 +409,38 @@
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-imaging</artifactId>
         <version>1.0-alpha2</version>
-      </dependency>
-    <dependency>
-      <groupId>au.com.bytecode</groupId>
-      <artifactId>opencsv</artifactId>
-      <version>2.4</version>
     </dependency>
+	<dependency>
+	    <groupId>net.sf.opencsv</groupId>
+	    <artifactId>opencsv</artifactId>
+	    <version>2.3</version>
+	</dependency>
 
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
     </dependency>
 
-    <!-- jackson, not sure if really needed -->
     <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.10</version>
+        <version>3.11</version>
+    </dependency>
+    <dependency>
+        <!-- needed at least in taxeditor.test by BundleLoader; try to move there but test carefully -->
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.6</version>
     </dependency>
+    <dependency>
+        <!-- maybe only needed for tests, but does not work to only have there -->
+        <groupId>com.mchange</groupId>
+        <artifactId>c3p0</artifactId>
+        <version>0.9.5.2</version>
+<!--         <scope>test</scope> -->
+    </dependency>
+    
+    <!-- jackson, not sure if really needed -->
     <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
@@ -383,6 +457,134 @@
         <version>${jackson.version}</version>
     </dependency>
     
+    <dependency>
+        <!-- needed? -->
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>2.12.0</version>
+    </dependency>
+    
+    <dependency>
+       <groupId>org.aspectj</groupId>
+       <artifactId>aspectjweaver</artifactId>
+       <version>1.9.6</version>
+    </dependency>
+    <dependency>
+       <groupId>org.aspectj</groupId>
+       <artifactId>aspectjrt</artifactId>
+       <version>1.9.6</version>
+    </dependency>
+    <dependency>
+       <groupId>org.hibernate.javax.persistence</groupId>
+       <artifactId>hibernate-jpa-2.1-api</artifactId>
+       <version>1.0.2.Final</version>
+    </dependency>
+    <dependency>
+        <groupId>org.javassist</groupId>
+        <artifactId>javassist</artifactId>
+        <version>3.27.0-GA</version>
+    </dependency>
+    <dependency>
+        <groupId>org.hibernate.common</groupId>
+        <artifactId>hibernate-commons-annotations</artifactId>
+        <version>5.1.0.Final</version>
+    </dependency>
+    <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>1.4.01</version>
+    </dependency>
+    <dependency>
+        <groupId>com.ibm.lsid</groupId>
+        <artifactId>lsid-client</artifactId>
+        <version>1.1.2</version>
+    </dependency>
+    
+    <!-- poi -->
+    <!-- needed -->
+    <dependency>
+        <groupId>org.apache.poi</groupId>
+        <artifactId>poi</artifactId>
+        <version>${poi.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.poi</groupId>
+        <artifactId>poi-ooxml-schemas</artifactId>
+        <version>${poi.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.poi</groupId>
+        <artifactId>poi-ooxml</artifactId>
+        <version>${poi.version}</version>
+    </dependency>
+    <dependency>
+      	<groupId>org.apache.xmlbeans</groupId>
+      	<artifactId>xmlbeans</artifactId>
+      	<version>3.1.0</version>
+    </dependency>
+    <dependency>
+	    <groupId>org.apache.commons</groupId>
+	    <artifactId>commons-collections4</artifactId>
+	    <version>4.4</version>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.commons</groupId>
+	    <artifactId>commons-math3</artifactId>
+	    <version>3.6.1</version>
+	</dependency>
+    <!-- not yet included 
+       poi:   com.zaxxer:SparseBitSet
+       poi-ooxml   commons-compress,curvesapi
+     --> 
+      
+    <!-- jaxb -->
+    <dependency>
+	    <groupId>javax.xml.bind</groupId>
+	    <artifactId>jaxb-api</artifactId>
+	    <version>2.3.1</version>
+	</dependency>  
+    <dependency>
+        <groupId>javax.activation</groupId>
+        <artifactId>javax.activation-api</artifactId>
+        <version>1.2.0</version>
+    </dependency>
+ 
+	<!-- logging -->
+    <dependency>
+        <!-- needed? -->
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging</artifactId>
+        <version>3.4.1.Final</version>
+    </dependency>
+    <dependency> 
+	    <groupId>org.slf4j</groupId>
+	    <artifactId>slf4j-api</artifactId>
+	    <version>1.7.30</version>
+	</dependency>
+    <dependency> 
+	    <groupId>org.slf4j</groupId>
+	    <artifactId>slf4j-log4j12</artifactId>
+	    <version>1.7.30</version>
+	</dependency>
+	<!-- slf4j-nop is not needed -->
+    
+	<!-- validation, needed? -->
+	<dependency>
+    	<groupId>org.hibernate.validator</groupId>
+    	<artifactId>hibernate-validator</artifactId>
+    	<version>6.1.5.Final</version>
+	</dependency>
+    <dependency>
+        <groupId>com.fasterxml</groupId>
+        <artifactId>classmate</artifactId>
+        <version>1.5.1</version>
+    </dependency>
+    <dependency>
+        <groupId>javax.el</groupId>
+        <artifactId>javax.el-api</artifactId>
+        <version>3.0.0</version>
+    </dependency>
+    
     <dependency>
     	<!-- used in AuthenticatingHttpInvokerRequestExecutor -->
         <groupId>commons-codec</groupId>
@@ -396,10 +598,38 @@
 	    <artifactId>h2</artifactId>
 	    <version>1.4.190</version>
 	</dependency>
-
+	<dependency>
+        <groupId>mysql</groupId>
+        <artifactId>mysql-connector-java</artifactId>
+        <version>8.0.21</version>
+    </dependency>
+    <dependency>
+        <groupId>org.postgresql</groupId>
+        <artifactId>postgresql</artifactId>
+        <version>42.2.15</version>
+    </dependency>
+      
     <!-- For Unit Tests Start -->
-	<!-- still needed? -->
+	<!-- keep junit and its dependency hamcrest here as long as each plugin
+	     has its own unit tests and they junit is not yet added there in a way
+	     that it does not appear in production bundles -->
+	<dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.13</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-core</artifactId>
+        <version>1.3</version>
+<!--         <scope>test</scope> -->
+    </dependency>
+	 
+<!-- For Unit Tests End -->
 
+<!-- dbcp and pool needed for H2Local and unitils, 
+     move to taxeditor.webapp and taxedtior.test once all db dependencies are moved to webapp-->    
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
@@ -408,24 +638,50 @@
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.5.4</version>
+      <version>1.6</version>
     </dependency>
- 
-    <!-- For Unit Tests End -->
+
 
     <!-- For Hibernate Mapping Start -->
-    <dependency>
-      <groupId>wsdl4j</groupId>
-      <artifactId>wsdl4j</artifactId>
-      <version>1.6.3</version>
-    </dependency>
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>
-      <version>1.1.0.Final</version>
+      <version>2.0.1.Final</version>
     </dependency>
     <!-- For Hibernate Mapping End -->
     
+    <!-- Hibernate -->
+    <!-- still needed because cdmlib-service still uses classes from cdmlib-persistence (e.g. OrderHint),
+         and those load classes from hibernate -->
+    <!-- all other org.hibernate dependencies have been removed already -->
+    <dependency>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-core</artifactId>
+        <version>${hibernate.version}</version>
+    </dependency>    
+    <dependency>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-entitymanager</artifactId>
+        <version>${hibernate.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-envers</artifactId>
+        <version>${hibernate.version}</version>
+    </dependency>
+    <dependency>
+        <!-- probably only used by hibernate-core, so remove when removing hibernate-core,
+             probably it can be removed even before -->
+        <groupId>antlr</groupId>
+        <artifactId>antlr</artifactId>
+        <version>2.7.7</version>
+    </dependency>
+    <dependency>
+	    <groupId>cglib</groupId>
+	    <artifactId>cglib-nodep</artifactId>
+	    <version>3.3.0</version>
+	</dependency>
+    
     <!-- KML/IIIF dependencies should not bee needed for the taxeditor, but at current the KMLDocumentBuilder 
          is used in the EditGeoService bean which is needed to display the distribution maps in the editor.
      -->