aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml168
1 files changed, 51 insertions, 117 deletions
diff --git a/pom.xml b/pom.xml
index 4a71a1898..c447546d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,45 +22,52 @@
-->
<!-- Project Version -->
- <moa-id-version>3.1.5</moa-id-version>
+ <moa-id-version>3.2.1-Snapshot</moa-id-version>
- <moa-id-version-final>3.1.5-final</moa-id-version-final>
- <moa-id-version-edu>3.2.0-OPB-Snapshot</moa-id-version-edu>
+ <moa-id-version-final>3.2.1-Snapshot</moa-id-version-final>
+ <moa-id-version-edu>3.2.1-edu-Snapshot</moa-id-version-edu>
<moa-id-proxy-version>2.0.1-Snapshot</moa-id-proxy-version>
- <configtool-version>2.2.5-final</configtool-version>
- <demo-oa-version>2.0.5</demo-oa-version>
+ <configtool-version>2.3.1-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.1</moa-id-module-elga_mandate_client>
-
<!-- Library Versions -->
- <moa-spss-version>2.0.5</moa-spss-version>
+ <moa-spss-version>3.0.0</moa-spss-version>
- <org.springframework.version>4.2.6.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>
- <hibernate.version>5.1.0.Final</hibernate.version> <!-- update to v5 -->
- <cxf.version>3.1.6</cxf.version>
- <struts.version>2.3.28.1</struts.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 -->
+
+
+ <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>
- <junit.version>3.8.2</junit.version>
- <org.apache.commons.io.version>2.4</org.apache.commons.io.version>
+
+ <!-- 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>
@@ -207,8 +214,8 @@
<executable>${env.BUILD_EXECUTEABLE}</executable>
<compilerVersion>${env.BUILD_VERSION}</compilerVersion>
<encoding>${project.build.sourceEncoding}</encoding>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
@@ -348,33 +355,7 @@
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
-
-
-<!-- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.0_IAIK_1.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>1.5.1</version>
- <scope>compile</scope>
- </dependency> -->
-
+
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
@@ -387,12 +368,6 @@
<scope>compile</scope>
</dependency>
- <!-- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>compile</scope>
- </dependency> -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
@@ -471,6 +446,8 @@
<type>pom</type>
</dependency>
+
+
<dependency>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-lib</artifactId>
@@ -483,6 +460,13 @@
<version>${moa-id-version}</version>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>MOA.id.server</groupId>
+ <artifactId>moa-id-jaxb_classes</artifactId>
+ <version>${moa-id-version}</version>
+ </dependency>
+
<dependency>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-lib</artifactId>
@@ -539,13 +523,20 @@
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>MOA.spss.server</groupId>
- <artifactId>moa-spss-lib</artifactId>
+ <artifactId>moa-sig-lib</artifactId>
<version>${moa-spss-version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>MOA.spss</groupId>
+ <artifactId>common</artifactId>
+ <version>${moa-spss-version}</version>
+ <scope>compile</scope>
+ </dependency> -->
+
<dependency>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-commons</artifactId>
@@ -595,38 +586,14 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_jce_full</artifactId>
- <!-- <version>4.0_MOA</version>-->
- <version>5.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_moa</artifactId>
- <version>1.51</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_cms</artifactId>
- <version>5.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc</artifactId>
- <version>2.19</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ixsil</artifactId>
- <version>1.2.2.5</version>
+ <version>5.3_MOA</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_X509TrustManager</artifactId>
- <version>0.3</version>
+ <version>0.3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -695,40 +662,7 @@
<artifactId>jaxb-api</artifactId>
<version>2.2.12</version>
</dependency>
-
- <!-- TSL -->
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_tsl</artifactId>
- <version>1.1</version>
- </dependency>
-
-<!-- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_util</artifactId>
- <version>0.23</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_xsect_eval</artifactId>
- <version>1.1709142</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.7</version>
- </dependency>
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.7.8-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>iaik</groupId>
- <artifactId>iaik_jsse</artifactId>
- <version>4.4</version>
- </dependency> -->
-
+
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
@@ -804,7 +738,7 @@
<dependency>
<groupId>org.unitils</groupId>
<artifactId>unitils-core</artifactId>
- <version>3.4.2</version>
+ <version>3.4.3</version>
</dependency>
</dependencies>