aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--id/server/idserverlib/pom.xml13
-rw-r--r--id/server/moa-id-commons/pom.xml12
-rw-r--r--pom.xml32
3 files changed, 35 insertions, 22 deletions
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 6c6353be0..7652af302 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -74,7 +74,7 @@
<scope>test</scope>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
@@ -85,16 +85,16 @@
</exclusion>
</exclusions>
</dependency>
- <!-- dependency>
+ dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
<version>${hibernate.version}</version>
- </dependency-->
+ </dependency
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${hibernate.version}</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>MOA.id</groupId>
@@ -288,7 +288,6 @@
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
- <version>2.0.5</version>
</dependency>
<!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
@@ -410,7 +409,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
- <version>1.7.2.RELEASE</version>
+ <version>1.7.4.RELEASE</version>
</dependency>
<dependency>
@@ -421,7 +420,7 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
- <version>2.8.1</version>
+ <version>2.9.0</version>
</dependency>
<dependency>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 6b9591059..6d6acef82 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -144,17 +144,17 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
- </dependency>
+ </dependency>
<!-- dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
<version>${hibernate.version}</version>
</dependency-->
- <dependency>
+<!-- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${hibernate.version}</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>jaxen</groupId>
@@ -239,6 +239,12 @@
<artifactId>spring-tx</artifactId>
<version>${org.springframework.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.data</groupId>
+ <artifactId>spring-data-jpa</artifactId>
+ <version>1.10.4.RELEASE</version>
+ </dependency>
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/pom.xml b/pom.xml
index 5b3810e36..43e9a813e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,44 +22,52 @@
-->
<!-- Project Version -->
- <moa-id-version>3.2.0-OPB-Snapshot</moa-id-version>
+ <moa-id-version>3.2.0-OPB-RC1</moa-id-version>
- <moa-id-version-final>3.2.0-final-Snapshot</moa-id-version-final>
- <moa-id-version-edu>3.2.0-OPB-Snapshot</moa-id-version-edu>
+ <moa-id-version-final>3.2.0-final-RC1</moa-id-version-final>
+ <moa-id-version-edu>3.2.0-OPB-RC1</moa-id-version-edu>
<moa-id-proxy-version>2.0.1-Snapshot</moa-id-proxy-version>
- <configtool-version>2.2.2-final</configtool-version>
- <demo-oa-version>2.0.5</demo-oa-version>
+ <configtool-version>2.3.0-final-RC1</configtool-version>
+ <demo-oa-version>2.0.6</demo-oa-version>
<moa-id-module-elga_mandate_client>1.1</moa-id-module-elga_mandate_client>
<!-- Library Versions -->
<moa-spss-version>3.0.0</moa-spss-version>
- <org.springframework.version>4.3.2.RELEASE</org.springframework.version>
+ <org.springframework.version>4.3.3.RELEASE</org.springframework.version>
<surefire.version>2.19.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.6</xmlsec.version>
+ <xmlsec.version>2.0.7</xmlsec.version>
+
+ <!-- Maybe problems with 5.2.3.Final -->
+ <hibernate.version>5.2.3.Final</hibernate.version> <!-- update to v5 -->
+ <!-- <hibernate.version>5.0.10.Final</hibernate.version> update to v5 -->
+
- <hibernate.version>5.0.10.Final</hibernate.version> <!-- update to v5 -->
<cxf.version>3.1.7</cxf.version>
<struts.version>2.3.30</struts.version>
<egovutils.version>2.0.0</egovutils.version>
<slf4j.version>1.7.21</slf4j.version>
- <mysql-connector.java>5.1.39</mysql-connector.java>
+
+ <!-- Maybe problems with Hibernate 5.0.10 -->
+ <mysql-connector.java>6.0.4</mysql-connector.java>
+ <!-- <mysql-connector.java>5.1.40</mysql-connector.java> -->
+
<junit.version>4.12</junit.version>
<org.apache.commons.io.version>2.5</org.apache.commons.io.version>
<org.apache.commons.lang3.version>3.4</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.7</jodatime.version>
+ <jodatime.version>2.9.4</jodatime.version>
- <jackson-version>2.7.4</jackson-version>
+ <jackson-version>2.8.4</jackson-version>
<apache-cli-version>1.3.1</apache-cli-version>
<spring-orm-version>${org.springframework.version}</spring-orm-version>
@@ -576,7 +584,7 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_X509TrustManager</artifactId>
- <version>0.3</version>
+ <version>0.3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 12:17:43 +0000