<parent>\r
<groupId>eu.etaxonomy</groupId>\r
<artifactId>taxeditor-parent</artifactId>\r
- <version>5.18.0-SNAPSHOT</version>\r
+ <version>5.31.0-SNAPSHOT</version>\r
</parent>\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
<packaging>eclipse-plugin</packaging>\r
<properties>\r
- <jackson.version>2.11.2</jackson.version>\r
+ <jackson.version>2.13.1</jackson.version>\r
<poi.version>4.1.2</poi.version>\r
+ <hibernate.version>5.1.17.Final</hibernate.version>\r
+ <lucene.version>5.4.1</lucene.version>\r
+ <spring.version>4.3.30.RELEASE</spring.version> <!-- checked 2021-12, further upgrade possible -->\r
+ <spring-security.version>4.2.20.RELEASE</spring-security.version> <!-- checked 2021-12, further upgrade possible -->\r
+ <aspectj.version>1.9.7</aspectj.version>\r
</properties>\r
<name>CDM Library Dependencies Plugin</name>\r
<description>CDM Library and dependencies as a plugin</description>\r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-surefire-plugin</artifactId>\r
- <version>2.7</version>\r
+ <version>3.0.0-M5</version>\r
</plugin>\r
</plugins>\r
</pluginManagement>\r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-dependency-plugin</artifactId>\r
- <version>2.4</version>\r
+ <version>3.2.0</version>\r
<executions>\r
<execution>\r
<id>copy-dependencies</id>\r
cdmlib-remote-webapp\r
</excludeArtifactIds>\r
<includeArtifactIds>\r
- cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-services,cdmlib-cache,cdmlib-ext,cdmlib-io,cdmlib-remote,cdmlib-print\r
+ cdmlib-commons,cdmlib-model,cdmlib-api,cdmlib-persistence,cdmlib-services,cdmlib-cache,cdmlib-ext,cdmlib-io\r
</includeArtifactIds>\r
<outputDirectory>${basedir}/lib</outputDirectory>\r
<overWriteReleases>true</overWriteReleases>\r
<configuration>\r
<includeArtifactIds>\r
httpclient,JavaAPIforKml,iiif-apis,commons-beanutils,commons-lang3,commons-lang,commons-codec,\r
+ commons-collections,commons-io,commons-logging,ezmorph,\r
+ hibernate-search-engine,hibernate-search-orm,itextpdf,\r
+ json,json-lib,log4j,lucene-analyzers-common,lucene-core,lucene-queryparser,lucene-suggest,lucene-sandbox,\r
+ xalan,\r
commons-imaging,jackson-databind,jackson-annotations,jackson-core,jboss-logging,\r
validation-api,classmate,javax.el-api,slf4j-api,slf4j-log4j12,\r
- hibernate-validator,hibernate-validator-cdi,\r
+ ehcache,\r
+ hibernate-validator,\r
spring-context,spring-context-support,spring-aspects,spring-test,spring-beans,\r
spring-tx,spring-web,spring-core,spring-aop,spring-expression,spring-orm,\r
spring-oxm,spring-jdbc,spring-security-config,spring-security-core,\r
aopalliance,aspectjweaver,aspectjrt,\r
hibernate-jpa-2.1-api,javassist,hibernate-commons-annotations,\r
+ hibernate-core,hibernate-entitymanager,hibernate-envers,antlr,cglib-nodep,\r
xml-apis,lsid-client,jdom,jdom2,\r
poi,poi-ooxml,poi-ooxml-schemas,xmlbeans,commons-collections4,commons-math3,\r
- jaxb-api,javax.activation-api,\r
- c3p0,opencsv,joda-time,usertype.jodatime,usertype.spi,\r
- h2,mysql-connector-java,postgresql\r
+ c3p0,mchange-commons-java,\r
+ opencsv,joda-time,usertype.jodatime,usertype.spi,\r
+ apache-log4j-extras,\r
+ h2,mysql-connector-java,postgresql,\r
+ junit,hamcrest-core,commons-dbcp,commons-pool,\r
+ jboss-transaction-api_1.2_spec\r
</includeArtifactIds>\r
<outputDirectory>\r
${basedir}/lib\r
</goals>\r
<configuration>\r
<includeArtifactIds>\r
- httpclient-cache,httpcore,httpmime,xercesImpl\r
+ httpclient-cache,httpcore,xercesImpl\r
</includeArtifactIds>\r
<outputDirectory>\r
${basedir}/lib\r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-dependency-plugin</artifactId>\r
- <version>2.4</version>\r
+ <version>3.2.0</version>\r
<executions>\r
<execution>\r
<id>copy-all-dependencies</id>\r
<repository>\r
<id>repository.springsource.release</id>\r
<name>SpringSource GA Repository</name>\r
- <url>http://repo.springsource.org/release</url>\r
+ <url>https://repo.springsource.org/release</url>\r
</repository>\r
</repositories>\r
<dependencies>\r
</dependency>\r
<dependency>\r
<groupId>eu.etaxonomy</groupId>\r
- <artifactId>cdmlib-persistence</artifactId>\r
+ <artifactId>cdmlib-api</artifactId>\r
<version>${cdmlib.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>eu.etaxonomy</groupId>\r
- <artifactId>cdmlib-remote</artifactId>\r
- <version>${cdmlib.version}</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>eu.etaxonomy</groupId>\r
- <artifactId>cdmlib-print</artifactId>\r
+ <artifactId>cdmlib-persistence</artifactId>\r
<version>${cdmlib.version}</version>\r
</dependency>\r
<dependency>\r
<artifactId>cdmlib-cache</artifactId>\r
<version>${cdmlib.version}</version>\r
</dependency>\r
+ <!-- required -->\r
<dependency>\r
- <groupId>dom4j</groupId>\r
- <artifactId>dom4j</artifactId>\r
- <version>1.6</version>\r
- </dependency>\r
+ <groupId>net.sf.ehcache</groupId>\r
+ <artifactId>ehcache</artifactId>\r
+ <version>2.10.6</version>\r
+ </dependency>\r
+ \r
+ <!-- needed, but should try to remove -->\r
+ <dependency>\r
+ <!-- see #9205 for how to remove -->\r
+ <groupId>log4j</groupId>\r
+ <artifactId>apache-log4j-extras</artifactId>\r
+ <version>1.2.17</version>\r
+ </dependency>\r
+ <dependency>\r
+ <!-- somehow this is required for logging, covered by tests, but maybe can be removed somehow -->\r
+ <groupId>org.jboss.spec.javax.transaction</groupId>\r
+ <artifactId>jboss-transaction-api_1.2_spec</artifactId>\r
+ <version>1.1.1.Final</version>\r
+ </dependency>\r
+ \r
<dependency>\r
<groupId>log4j</groupId>\r
<artifactId>log4j</artifactId>\r
<dependency>\r
<groupId>joda-time</groupId>\r
<artifactId>joda-time</artifactId>\r
- <version>2.10.6</version>\r
+ <version>2.10.13</version>\r
</dependency>\r
<dependency>\r
<groupId>org.jadira.usertype</groupId>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-context</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-context-support</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-aspects</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-test</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-beans</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-tx</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-web</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-core</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-aop</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-expression</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
- <dependency>\r
+ <dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-orm</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-oxm</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-jdbc</artifactId>\r
- <version>4.3.28.RELEASE</version>\r
+ <version>${spring.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework.security</groupId>\r
<artifactId>spring-security-core</artifactId>\r
- <version>4.2.18.RELEASE</version>\r
+ <version>${spring-security.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework.security</groupId>\r
<artifactId>spring-security-config</artifactId>\r
- <version>4.2.18.RELEASE</version>\r
+ <version>${spring-security.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework.security</groupId>\r
<artifactId>spring-security-remoting</artifactId>\r
- <version>4.2.18.RELEASE</version>\r
+ <version>${spring-security.version}</version>\r
</dependency>\r
<dependency>\r
<!-- dependency of spring security core, can be removed after\r
<dependency>\r
<groupId>org.apache.httpcomponents</groupId>\r
<artifactId>httpclient</artifactId>\r
+ <!-- version defined in parent pom -->\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.httpcomponents</groupId>\r
+ <artifactId>httpclient-cache</artifactId>\r
+ <!-- version defined in parent pom -->\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.httpcomponents</groupId>\r
+ <artifactId>httpcore</artifactId>\r
+ <version>4.4.15</version>\r
</dependency>\r
\r
<dependency>\r
<groupId>org.apache.commons</groupId>\r
<artifactId>commons-lang3</artifactId>\r
- <version>3.11</version>\r
+ <version>3.12.0</version>\r
</dependency>\r
<dependency>\r
<!-- needed at least in taxeditor.test by BundleLoader; try to move there but test carefully -->\r
<artifactId>commons-lang</artifactId>\r
<version>2.6</version>\r
</dependency>\r
- <dependency>\r
- <!-- maybe only needed for tests, but does not work to only have there -->\r
- <groupId>com.mchange</groupId>\r
- <artifactId>c3p0</artifactId>\r
- <version>0.9.5.2</version>\r
-<!-- <scope>test</scope> -->\r
- </dependency>\r
\r
<!-- jackson, not sure if really needed -->\r
<dependency>\r
<!-- needed? -->\r
<groupId>xerces</groupId>\r
<artifactId>xercesImpl</artifactId>\r
- <version>2.12.0</version>\r
+ <version>2.12.1</version>\r
</dependency>\r
\r
<dependency>\r
<groupId>org.aspectj</groupId>\r
<artifactId>aspectjweaver</artifactId>\r
- <version>1.9.6</version>\r
+ <version>${aspectj.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.aspectj</groupId>\r
<artifactId>aspectjrt</artifactId>\r
- <version>1.9.6</version>\r
+ <version>${aspectj.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.hibernate.javax.persistence</groupId>\r
<dependency>\r
<groupId>org.javassist</groupId>\r
<artifactId>javassist</artifactId>\r
- <version>3.27.0-GA</version>\r
+ <version>3.28.0-GA</version>\r
</dependency>\r
<dependency>\r
<groupId>org.hibernate.common</groupId>\r
<!-- not yet included \r
poi: com.zaxxer:SparseBitSet\r
poi-ooxml commons-compress,curvesapi\r
- --> \r
- \r
- <!-- jaxb -->\r
+ -->\r
+ \r
+ <!-- the following were all taken without check if needed -->\r
+ <dependency>\r
+ <groupId>commons-collections</groupId>\r
+ <artifactId>commons-collections</artifactId>\r
+ <version>3.2.2</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>commons-io</groupId>\r
+ <artifactId>commons-io</artifactId>\r
+ <version>2.11.0</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>commons-logging</groupId>\r
+ <artifactId>commons-logging</artifactId>\r
+ <version>1.2</version>\r
+ </dependency>\r
<dependency>\r
- <groupId>javax.xml.bind</groupId>\r
- <artifactId>jaxb-api</artifactId>\r
- <version>2.3.1</version>\r
- </dependency> \r
+ <groupId>net.sf.ezmorph</groupId>\r
+ <artifactId>ezmorph</artifactId>\r
+ <version>1.0.6</version>\r
+ </dependency>\r
<dependency>\r
- <groupId>javax.activation</groupId>\r
- <artifactId>javax.activation-api</artifactId>\r
- <version>1.2.0</version>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-search-engine</artifactId>\r
+ <version>5.5.2.Final</version>\r
</dependency>\r
- \r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-search-orm</artifactId>\r
+ <version>5.5.2.Final</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>com.itextpdf</groupId>\r
+ <artifactId>itextpdf</artifactId> \r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.json</groupId>\r
+ <artifactId>json</artifactId>\r
+ <version>20211205</version>\r
+ </dependency> \r
+ <dependency>\r
+ <groupId>net.sf.json-lib</groupId>\r
+ <artifactId>json-lib</artifactId>\r
+ <version>2.4</version>\r
+ <!-- classifier required as json-lib exists on maven central as json-lib-2.4-jdk15.jar and xxx-jdk13.jar, see #9887 -->\r
+ <classifier>jdk15</classifier>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.lucene</groupId>\r
+ <artifactId>lucene-core</artifactId>\r
+ <version>${lucene.version}</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.lucene</groupId>\r
+ <artifactId>lucene-analyzers-common</artifactId>\r
+ <version>${lucene.version}</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.lucene</groupId>\r
+ <artifactId>lucene-queryparser</artifactId>\r
+ <version>${lucene.version}</version>\r
+ </dependency> \r
+ <dependency>\r
+ <groupId>org.apache.lucene</groupId>\r
+ <artifactId>lucene-suggest</artifactId>\r
+ <version>${lucene.version}</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.lucene</groupId>\r
+ <artifactId>lucene-sandbox</artifactId>\r
+ <version>${lucene.version}</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>xalan</groupId>\r
+ <artifactId>xalan</artifactId>\r
+ <version>2.7.2</version>\r
+ </dependency>\r
+ \r
+ <!-- end without check if needed --> \r
+ \r
+ \r
<!-- logging -->\r
<dependency>\r
<!-- needed? -->\r
<artifactId>hibernate-validator</artifactId>\r
<version>6.1.5.Final</version>\r
</dependency>\r
- <dependency>\r
- <groupId>org.hibernate.validator</groupId>\r
- <artifactId>hibernate-validator-cdi</artifactId>\r
- <version>6.1.5.Final</version>\r
- </dependency>\r
<dependency>\r
<groupId>com.fasterxml</groupId>\r
<artifactId>classmate</artifactId>\r
<!-- used in AuthenticatingHttpInvokerRequestExecutor -->\r
<groupId>commons-codec</groupId>\r
<artifactId>commons-codec</artifactId>\r
- <version>1.14</version>\r
+ <version>1.15</version>\r
</dependency>\r
\r
- <!-- only for supporting test button in datasource dialogue, dialogue should be moved to taxeditor.webapp -->\r
- <dependency>\r
- <groupId>com.h2database</groupId>\r
- <artifactId>h2</artifactId>\r
- <version>1.4.190</version>\r
- </dependency>\r
+ <!-- For Unit Tests Start -->\r
+ <!-- keep junit and its dependency hamcrest here as long as each plugin\r
+ has its own unit tests and junit is not yet added there in a way\r
+ that it does not appear in production bundles -->\r
<dependency>\r
- <groupId>mysql</groupId>\r
- <artifactId>mysql-connector-java</artifactId>\r
- <version>8.0.21</version>\r
+ <groupId>junit</groupId>\r
+ <artifactId>junit</artifactId>\r
+ <version>4.13.2</version>\r
+ <scope>test</scope>\r
</dependency>\r
<dependency>\r
- <groupId>org.postgresql</groupId>\r
- <artifactId>postgresql</artifactId>\r
- <version>42.2.15</version>\r
+ <groupId>org.hamcrest</groupId>\r
+ <artifactId>hamcrest-core</artifactId>\r
+ <version>1.3</version>\r
+<!-- <scope>test</scope> -->\r
</dependency>\r
- \r
- <!-- For Unit Tests Start -->\r
- <!-- still needed? -->\r
+ \r
+<!-- For Unit Tests End -->\r
\r
+<!-- dbcp and pool needed for H2Local and unitils, \r
+ move to taxeditor.webapp and taxedtior.test once all db dependencies are moved to webapp--> \r
<dependency>\r
<groupId>commons-dbcp</groupId>\r
<artifactId>commons-dbcp</artifactId>\r
<dependency>\r
<groupId>commons-pool</groupId>\r
<artifactId>commons-pool</artifactId>\r
- <version>1.5.4</version>\r
+ <version>1.6</version>\r
</dependency>\r
- \r
- <!-- For Unit Tests End -->\r
+\r
\r
<!-- For Hibernate Mapping Start -->\r
- <dependency>\r
- <groupId>wsdl4j</groupId>\r
- <artifactId>wsdl4j</artifactId>\r
- <version>1.6.3</version>\r
- </dependency>\r
<dependency>\r
<groupId>javax.validation</groupId>\r
<artifactId>validation-api</artifactId>\r
</dependency>\r
<!-- For Hibernate Mapping End -->\r
\r
+ <!-- Hibernate -->\r
+ <!-- still needed because cdmlib-service still uses classes from cdmlib-persistence (e.g. OrderHint),\r
+ and those load classes from hibernate -->\r
+ <!-- all other org.hibernate dependencies have been removed already -->\r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-core</artifactId>\r
+ <version>${hibernate.version}</version>\r
+ </dependency> \r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-entitymanager</artifactId>\r
+ <version>${hibernate.version}</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-envers</artifactId>\r
+ <version>${hibernate.version}</version>\r
+ </dependency>\r
+ <dependency>\r
+ <!-- probably only used by hibernate-core, so remove when removing hibernate-core,\r
+ probably it can be removed even before -->\r
+ <groupId>antlr</groupId>\r
+ <artifactId>antlr</artifactId>\r
+ <version>2.7.7</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>cglib</groupId>\r
+ <artifactId>cglib-nodep</artifactId>\r
+ <version>3.3.0</version>\r
+ </dependency>\r
+ \r
<!-- KML/IIIF dependencies should not bee needed for the taxeditor, but at current the KMLDocumentBuilder \r
is used in the EditGeoService bean which is needed to display the distribution maps in the editor.\r
-->\r
<dependency>\r
<groupId>de.digitalcollections.iiif</groupId>\r
<artifactId>iiif-apis</artifactId>\r
- <version>0.3.7</version>\r
+ <version>0.3.9</version>\r
+ </dependency>\r
+ \r
+ <!-- database related, should be moved to local/test when possible -->\r
+ <!-- only for supporting test button in datasource dialogue, dialogue should be moved to taxeditor.webapp -->\r
+ <dependency>\r
+ <groupId>mysql</groupId>\r
+ <artifactId>mysql-connector-java</artifactId>\r
+ <version>8.0.27</version>\r
</dependency>\r
+ <dependency>\r
+ <groupId>com.h2database</groupId>\r
+ <artifactId>h2</artifactId>\r
+ <version>1.4.190</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.postgresql</groupId>\r
+ <artifactId>postgresql</artifactId>\r
+ <version>42.3.1</version>\r
+ </dependency>\r
+ \r
+ <!-- mchange dependencies, needed in datasource view dialog for finish button (ClassName is needed for datasource.xml -->\r
+ <dependency>\r
+ <groupId>com.mchange</groupId>\r
+ <artifactId>c3p0</artifactId>\r
+ <version>0.9.5.2</version>\r
+ <!-- <scope>test</scope> -->\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>com.mchange</groupId>\r
+ <artifactId>mchange-commons-java</artifactId>\r
+ <!-- mchange-commons-java needs to match the version as defined in the c3p0/pom.xml -->\r
+ <version>0.2.11</version>\r
+ </dependency>\r
</dependencies>\r
</project>\r
\r
BGBM BDI Projects / taxeditor.git / blobdiff