aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml177
1 files changed, 59 insertions, 118 deletions
diff --git a/pom.xml b/pom.xml
index 2634176f5..36593774f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,41 +22,46 @@
-->
<!-- Project Version -->
- <moa-id-version>3.2.0-OPB-Snapshot</moa-id-version>
- <moa-id-version-final>3.2.0-RC1</moa-id-version-final>
+ <moa-id-version>3.1.1</moa-id-version>
+
+ <moa-id-version-final>3.1.1</moa-id-version-final>
<moa-id-version-edu>3.2.0-OPB-Snapshot</moa-id-version-edu>
<moa-id-proxy-version>2.0.1-Snapshot</moa-id-proxy-version>
- <configtool-version>2.2.0-OPB-Snapshot</configtool-version>
+ <configtool-version>2.2.1-final</configtool-version>
<demo-oa-version>2.0.5</demo-oa-version>
- <moa-id-module-elga_mandate_client>1.0.0-Snapshot</moa-id-module-elga_mandate_client>
-
-
- <moa-spss-version>3.0.0-RC1</moa-spss-version>
-
+ <moa-id-module-elga_mandate_client>1.0</moa-id-module-elga_mandate_client>
+
<!-- Library Versions -->
- <org.springframework.version>4.2.4.RELEASE</org.springframework.version>
- <surefire.version>2.18.1</surefire.version>
- <opensaml.version>2.6.5</opensaml.version>
- <xmltooling.version>1.4.5</xmltooling.version>
- <cxf.version>3.1.4</cxf.version>
- <struts.version>2.3.24.1</struts.version>
+ <moa-spss-version>3.0.0-RC1</moa-spss-version>
+
+ <org.springframework.version>4.2.6.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>
+
+ <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>
+
<egovutils.version>2.0.0</egovutils.version>
- <slf4j.version>1.7.13</slf4j.version>
- <hibernate.version>4.3.11.Final</hibernate.version>
+
+ <slf4j.version>1.7.21</slf4j.version>
<mysql-connector.java>5.1.38</mysql-connector.java>
- <junit.version>4.11</junit.version>
+ <junit.version>3.8.2</junit.version>
<org.apache.commons.io.version>2.4</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>
- <jackson-version>2.7.0</jackson-version>
+ <jackson-version>2.7.4</jackson-version>
<apache-cli-version>1.3.1</apache-cli-version>
- <spring-orm-version>3.1.1.RELEASE</spring-orm-version>
+ <spring-orm-version>${org.springframework.version}</spring-orm-version>
</properties>
@@ -280,6 +285,13 @@
<artifactId>xmltooling</artifactId>
<version>${xmltooling.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.santuario</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>${xmlsec.version}</version>
+ </dependency>
+
+
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -335,32 +347,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>
@@ -373,12 +360,14 @@
<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>
+ <version>2.5</version>
+ </dependency>
+
+
+
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
@@ -403,7 +392,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.1</version>
+ <version>4.5.2</version>
</dependency>
<dependency>
<groupId>dav4j</groupId>
@@ -424,11 +413,11 @@
</dependency> -->
- <dependency>
+<!-- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>1.46</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>MOA.id.server</groupId>
@@ -446,6 +435,7 @@
<groupId>MOA.id</groupId>
<artifactId>moa-spss-container</artifactId>
<version>${moa-id-version}</version>
+ <type>pom</type>
</dependency>
<dependency>
@@ -518,7 +508,14 @@
<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>
@@ -540,7 +537,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -552,9 +549,9 @@
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provide</scope>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ <scope>provide</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
@@ -572,33 +569,10 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_jce_full</artifactId>
- <version>5.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_moa</artifactId>
- <version>2.00-RC1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_cms</artifactId>
- <version>5.1</version>
+ <version>5.3_MOA</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>
- <scope>compile</scope>
- </dependency>-->
+
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_X509TrustManager</artifactId>
@@ -671,40 +645,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>