diff options
| -rw-r--r-- | id/moa-spss-container/pom.xml | 22 | ||||
| -rw-r--r-- | id/server/auth-edu/pom.xml | 12 | ||||
| -rw-r--r-- | id/server/idserverlib/pom.xml | 22 | ||||
| -rw-r--r-- | pom.xml | 14 |
4 files changed, 49 insertions, 21 deletions
diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml index c69990361..d66a09621 100644 --- a/id/moa-spss-container/pom.xml +++ b/id/moa-spss-container/pom.xml @@ -107,7 +107,7 @@ <dependency> <groupId>iaik.prod</groupId> <artifactId>iaik_jce_full</artifactId> - <scope>provided</scope> + <!-- <scope>provided</scope> --> </dependency> <dependency> <groupId>iaik.prod</groupId> @@ -185,23 +185,27 @@ <optional>true</optional> </dependency> + + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>2.2.11</version> - </dependency> - + <version>${jaxb.version}</version> + </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId> - <version>2.2.11</version> + <version>${jaxb.version}</version> </dependency> <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> <!-- should be provided by the container or jre --> - <scope>provided</scope> + <!-- <scope>provided</scope> --> <exclusions> <exclusion> <artifactId>serializer</artifactId> @@ -213,19 +217,19 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <!-- should be provided by the container or jre --> - <scope>provided</scope> + <!-- <scope>provided</scope> --> </dependency> <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>xml-apis</artifactId> <!-- should be provided by the container or jre --> - <scope>provided</scope> + <!-- <scope>provided</scope> --> </dependency> <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>serializer</artifactId> <!-- should be provided by the container or jre --> - <scope>provided</scope> + <!-- <scope>provided</scope> --> </dependency> </dependencies> diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml index b8bdad311..3c400a635 100644 --- a/id/server/auth-edu/pom.xml +++ b/id/server/auth-edu/pom.xml @@ -220,7 +220,7 @@ <groupId>iaik.prod</groupId> <artifactId>iaik_jce_full</artifactId> <!-- should be in the ext directory of the jre --> - <scope>provided</scope> + <!-- <scope>provided</scope> --> </dependency> <!-- <dependency> <groupId>iaik.prod</groupId> @@ -238,13 +238,13 @@ <groupId>iaik.prod</groupId> <artifactId>iaik_Pkcs11Wrapper</artifactId> <!-- should be in the ext directory of the jre --> - <scope>provided</scope> + <!-- <scope>provided</scope> --> </dependency> <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> <!-- should be provided by the container or jre --> - <scope>provided</scope> + <!-- <scope>provided</scope> --> <exclusions> <exclusion> <groupId>xalan</groupId> @@ -256,19 +256,19 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <!-- should be provided by the container or jre --> - <scope>provided</scope> + <!-- <scope>provided</scope> --> </dependency> <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>xml-apis</artifactId> <!-- should be provided by the container or jre --> - <scope>provided</scope> + <!-- <scope>provided</scope> --> </dependency> <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>serializer</artifactId> <!-- should be provided by the container or jre --> - <scope>provided</scope> + <!-- <scope>provided</scope> --> </dependency> <dependency> diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 7652af302..f859b6a45 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -33,6 +33,27 @@ <version>6.9.10</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ <version>1.2</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -534,6 +555,7 @@ <version>${surefire.version}</version>
<configuration>
<threadCount>1</threadCount>
+ <argLine>--add-modules java.xml.bind</argLine>
</configuration>
<dependencies>
<dependency>
@@ -34,19 +34,21 @@ <moa-id-module-elga_mandate_client>1.3</moa-id-module-elga_mandate_client> - <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> + <org.springframework.version>4.3.13.RELEASE</org.springframework.version> + <org.springframework.data.spring-data-jpa>1.11.9.RELEASE</org.springframework.data.spring-data-jpa> <surefire.version>2.20.1</surefire.version> + <jaxb.version>2.3.0</jaxb.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.1.0</xmlsec.version> - <hibernate.version>5.2.11.Final</hibernate.version> - <org.apache.commons.commons.dbcp2>2.1.1</org.apache.commons.commons.dbcp2> + <hibernate.version>5.2.12.Final</hibernate.version> + <org.apache.commons.commons.dbcp2>2.2.0</org.apache.commons.commons.dbcp2> <cxf.version>3.2.0</cxf.version> - <struts.version>2.5.13</struts.version> <!-- 2.5.10.1 --> + <struts.version>2.5.14.1</struts.version> <!-- 2.5.10.1 --> <egovutils.version>2.0.0</egovutils.version> @@ -652,7 +654,7 @@ <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> - <version>2.2.12</version> + <version>${jaxb.version}</version> </dependency> <dependency> |