diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-10-17 15:04:49 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-10-17 15:04:49 +0200 |
| commit | 92834aed9d97772a0d37330b9c60aee18374c759 (patch) | |
| tree | 30adff7052c6eca919aed447a9640522b2c94c3d /pom.xml | |
| parent | 698a0066e84dee07f0f8de8aa408d9744f755660 (diff) | |
| parent | 7c5d84f1f4054d2c85207364d5d996c4ec6fe1f8 (diff) | |
| download | moa-id-spss-92834aed9d97772a0d37330b9c60aee18374c759.tar.gz moa-id-spss-92834aed9d97772a0d37330b9c60aee18374c759.tar.bz2 moa-id-spss-92834aed9d97772a0d37330b9c60aee18374c759.zip | |
Merge branch 'eIDAS_node_implementation' into development_preview
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 53 |
1 files changed, 29 insertions, 24 deletions
@@ -22,42 +22,41 @@ --> <!-- Project Version --> - <moa-id-version>3.2.3</moa-id-version> + <moa-id-version>3.3.0-snapshot</moa-id-version> - <moa-id-version-final>3.2.3</moa-id-version-final> - <moa-id-version-edu>3.2.3</moa-id-version-edu> + <moa-id-version-final>3.3.0-snapshot</moa-id-version-final> + <moa-id-version-edu>3.3.0-snapshot</moa-id-version-edu> <moa-id-proxy-version>2.0.1</moa-id-proxy-version> - <configtool-version>2.3.3</configtool-version> + <configtool-version>2.4.0-snapshot</configtool-version> <demo-oa-version>2.0.6</demo-oa-version> - <moa-id-module-elga_mandate_client>1.2</moa-id-module-elga_mandate_client> + <moa-id-module-elga_mandate_client>1.3</moa-id-module-elga_mandate_client> - <org.springframework.version>4.3.10.RELEASE</org.springframework.version> - <surefire.version>2.19.1</surefire.version> + <org.springframework.version>4.3.11.RELEASE</org.springframework.version> + <org.springframework.data.spring-data-jpa>1.11.7.RELEASE</org.springframework.data.spring-data-jpa> + <surefire.version>2.20.1</surefire.version> <opensaml.version>2.6.6</opensaml.version> <!-- update to v3 (v2 is end-of-life in june 2016)--> <xmltooling.version>1.4.6</xmltooling.version> - <xmlsec.version>2.0.8</xmlsec.version> + <xmlsec.version>2.1.0</xmlsec.version> - <!-- Maybe problems with 5.2.3.Final --> - <hibernate.version>5.2.10.Final</hibernate.version> <!-- update to v5 --> - <!-- <hibernate.version>5.0.10.Final</hibernate.version> update to v5 --> - - - <cxf.version>3.1.12</cxf.version> + <hibernate.version>5.2.11.Final</hibernate.version> + <org.apache.commons.commons.dbcp2>2.1.1</org.apache.commons.commons.dbcp2> + + <cxf.version>3.2.0</cxf.version> <struts.version>2.5.13</struts.version> <!-- 2.5.10.1 --> <egovutils.version>2.0.0</egovutils.version> - <slf4j.version>1.7.24</slf4j.version> + <slf4j.version>1.7.25</slf4j.version> <httpclient.version>4.5.3</httpclient.version> - <httpcore.version>4.4.6</httpcore.version> + <httpcore.version>4.4.8</httpcore.version> <!-- Maybe problems with Hibernate 5.0.10 --> - <mysql-connector.java>6.0.5</mysql-connector.java> + <mysql-connector.java>6.0.6</mysql-connector.java> <!-- <mysql-connector.java>5.1.40</mysql-connector.java> --> <junit.version>4.12</junit.version> @@ -65,10 +64,10 @@ <org.apache.commons.lang3.version>3.6</org.apache.commons.lang3.version> <org.apache.commons.collections4.version>4.1</org.apache.commons.collections4.version> <org.apache.commons.collections3.version>3.2.2</org.apache.commons.collections3.version> - <jodatime.version>2.9.4</jodatime.version> + <jodatime.version>2.9.9</jodatime.version> - <jackson-version>2.8.7</jackson-version> - <apache-cli-version>1.3.1</apache-cli-version> + <jackson-version>2.9.1</jackson-version> + <apache-cli-version>1.4</apache-cli-version> <spring-orm-version>${org.springframework.version}</spring-orm-version> </properties> @@ -281,6 +280,11 @@ <dependencyManagement> <dependencies> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-dbcp2</artifactId> + <version>${org.apache.commons.commons.dbcp2}</version> + </dependency> <dependency> <groupId>org.opensaml</groupId> <artifactId>opensaml</artifactId> @@ -398,7 +402,7 @@ <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.3.1</version> + <version>1.3.3</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -721,12 +725,13 @@ <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>3.4</version> + <scope>test</scope> + <version>3.5</version> </dependency> <dependency> <groupId>org.unitils</groupId> <artifactId>unitils-core</artifactId> - <version>3.4.3</version> + <version>3.4.6</version> </dependency> </dependencies> @@ -778,7 +783,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> + <version>${org.apache.commons.io.version}</version> </dependency> </dependencies> |