aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml179
1 files changed, 128 insertions, 51 deletions
diff --git a/pom.xml b/pom.xml
index b991b92e9..41af492da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,34 +21,48 @@
<moa-commons-version>2.0.1</moa-commons-version>
-->
- <!-- Project Version -->
- <moa-commons-version>3.0.3-Snapshot</moa-commons-version>
- <moa-id-version>3.0.3-Snapshot</moa-id-version>
+ <!-- Project Version -->
+ <moa-id-version>3.2.0-OPB-Snapshot</moa-id-version>
+
+ <moa-id-version-final>3.1.0-RC2</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>
- <moa-spss-version>2.0.5-Snapshot</moa-spss-version>
- <configtool-version>2.0.3-Snapshot</configtool-version>
- <demo-oa-version>2.0.5-Snapshot</demo-oa-version>
-
+
+ <configtool-version>2.2.0-OPB-Snapshot</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>
+
+
<!-- Library Versions -->
- <org.springframework.version>4.1.6.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.0.4</cxf.version>
- <struts.version>2.3.20</struts.version>
+ <moa-spss-version>2.0.5</moa-spss-version>
+
+ <org.springframework.version>4.2.5.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.5</cxf.version>
+ <struts.version>2.3.24.1</struts.version>
+
<egovutils.version>2.0.0</egovutils.version>
- <slf4j.version>1.7.12</slf4j.version>
- <hibernate.version>4.3.8.Final</hibernate.version>
- <mysql-connector.java>5.1.35</mysql-connector.java>
- <junit.version>4.11</junit.version>
+
+ <slf4j.version>1.7.19</slf4j.version>
+ <mysql-connector.java>5.1.38</mysql-connector.java>
+ <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.0</org.apache.commons.collections4.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.5.4</jackson-version>
- <apache-cli-version>1.2</apache-cli-version>
- <spring-orm-version>3.1.1.RELEASE</spring-orm-version>
+ <jackson-version>2.7.3</jackson-version>
+ <apache-cli-version>1.3.1</apache-cli-version>
+ <spring-orm-version>${org.springframework.version}</spring-orm-version>
</properties>
@@ -62,9 +76,11 @@
</property>
</activation>
<modules>
- <module>common</module>
- <module>spss</module>
+<!-- <module>common</module> -->
+<!-- <module>spss</module> -->
+
<module>id</module>
+
</modules>
<repositories>
<repository>
@@ -215,10 +231,12 @@
<finalName>moa</finalName>
<encoding>UTF-8</encoding>
<descriptors>
- <descriptor>id/assembly-auth.xml</descriptor>
- <descriptor>id/assembly-proxy.xml</descriptor>
- <descriptor>spss/assembly.xml</descriptor>
- <descriptor>spss/assembly-lib.xml</descriptor>
+ <descriptor>id/assembly-auth-final.xml</descriptor>
+ <descriptor>id/assembly-auth-edu.xml</descriptor>
+ <descriptor>id/assembly-proxy.xml</descriptor>
+
+<!-- <descriptor>spss/assembly.xml</descriptor>
+ <descriptor>spss/assembly-lib.xml</descriptor> -->
</descriptors>
</configuration>
</plugin>
@@ -268,6 +286,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>
@@ -280,6 +305,11 @@
<version>${cxf.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${org.apache.commons.collections3.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
@@ -320,7 +350,7 @@
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
<version>1.0_IAIK_1.2</version>
@@ -343,7 +373,8 @@
<artifactId>axis-wsdl4j</artifactId>
<version>1.5.1</version>
<scope>compile</scope>
- </dependency>
+ </dependency> -->
+
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
@@ -356,12 +387,20 @@
<scope>compile</scope>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<scope>compile</scope>
- </dependency>
+ </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>
@@ -386,7 +425,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.4.1</version>
+ <version>4.5.2</version>
</dependency>
<dependency>
<groupId>dav4j</groupId>
@@ -407,18 +446,30 @@
</dependency> -->
- <dependency>
+<!-- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>1.46</version>
+ </dependency> -->
+
+ <dependency>
+ <groupId>MOA.id.server</groupId>
+ <artifactId>moa-id-spring-initializer</artifactId>
+ <version>${moa-id-version}</version>
</dependency>
- <dependency>
- <groupId>MOA</groupId>
- <artifactId>moa-common</artifactId>
- <version>${moa-commons-version}</version>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>MOA.id.server</groupId>
+ <artifactId>moa-id-frontend-resources</artifactId>
+ <version>${moa-id-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>MOA.id</groupId>
+ <artifactId>moa-spss-container</artifactId>
+ <version>${moa-id-version}</version>
+ </dependency>
+
<dependency>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-lib</artifactId>
@@ -431,6 +482,14 @@
<version>${moa-id-version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>MOA.id.server</groupId>
+ <artifactId>moa-id-lib</artifactId>
+ <version>${moa-id-version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
<dependency>
<groupId>MOA.id.server.modules</groupId>
<artifactId>moa-id-module-stork</artifactId>
@@ -461,18 +520,35 @@
<artifactId>moa-id-module-eIDAS</artifactId>
<version>${moa-id-version}</version>
</dependency>
-
-
- <dependency>
+ <dependency>
+ <groupId>MOA.id.server.modules</groupId>
+ <artifactId>moa-id-module-pvp2</artifactId>
+ <version>${moa-id-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>MOA.id.server.modules</groupId>
+ <artifactId>moa-id-modules-federated_authentication</artifactId>
+ <version>${moa-id-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>MOA.id.server.modules</groupId>
+ <artifactId>moa-id-module-elga_mandate_service</artifactId>
+ <version>${moa-id-module-elga_mandate_client}</version>
+ </dependency>
+
+
+ <dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
<version>${moa-spss-version}</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>MOA</groupId>
- <artifactId>moa-common</artifactId>
- <version>${moa-commons-version}</version>
+
+ <dependency>
+ <groupId>MOA.id.server</groupId>
+ <artifactId>moa-id-commons</artifactId>
+ <version>${moa-id-version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -482,10 +558,11 @@
<version>${moa-spss-version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -497,9 +574,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>
@@ -721,7 +798,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.3.1</version>
+ <version>3.4</version>
</dependency>
<dependency>
<groupId>org.unitils</groupId>