diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-09-08 14:37:54 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-09-08 14:37:54 +0200 |
| commit | 698a0066e84dee07f0f8de8aa408d9744f755660 (patch) | |
| tree | 17085c61b97cef37b7d2443513622c1d02553710 /pom.xml | |
| parent | b754f06150f8a8b6235bc3a138ab403175036171 (diff) | |
| parent | a512ce06caa134ea978ca54a87a8b78d5c10bf1c (diff) | |
| download | moa-id-spss-698a0066e84dee07f0f8de8aa408d9744f755660.tar.gz moa-id-spss-698a0066e84dee07f0f8de8aa408d9744f755660.tar.bz2 moa-id-spss-698a0066e84dee07f0f8de8aa408d9744f755660.zip | |
Merge tag 'MOA-ID-3.2.3' into development_previewMOA-ID-3.2.3
JoinUp Release
# Conflicts:
# pom.xml
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 38 |
1 files changed, 22 insertions, 16 deletions
@@ -22,19 +22,19 @@ --> <!-- Project Version --> - <moa-id-version>3.2.2</moa-id-version> + <moa-id-version>3.2.3</moa-id-version> - <moa-id-version-final>3.2.2</moa-id-version-final> - <moa-id-version-edu>3.2.2</moa-id-version-edu> + <moa-id-version-final>3.2.3</moa-id-version-final> + <moa-id-version-edu>3.2.3</moa-id-version-edu> <moa-id-proxy-version>2.0.1</moa-id-proxy-version> - <configtool-version>2.3.2</configtool-version> + <configtool-version>2.3.3</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> - <org.springframework.version>4.3.4.RELEASE</org.springframework.version> + <org.springframework.version>4.3.10.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)--> @@ -42,19 +42,19 @@ <xmlsec.version>2.0.8</xmlsec.version> <!-- Maybe problems with 5.2.3.Final --> - <hibernate.version>5.2.5.Final</hibernate.version> <!-- update to v5 --> + <hibernate.version>5.2.10.Final</hibernate.version> <!-- update to v5 --> <!-- <hibernate.version>5.0.10.Final</hibernate.version> update to v5 --> - <cxf.version>3.1.9</cxf.version> - <struts.version>2.3.32</struts.version> + <cxf.version>3.1.12</cxf.version> + <struts.version>2.5.13</struts.version> <!-- 2.5.10.1 --> <egovutils.version>2.0.0</egovutils.version> - <slf4j.version>1.7.22</slf4j.version> + <slf4j.version>1.7.24</slf4j.version> - <httpclient.version>4.5.2</httpclient.version> - <httpcore.version>4.4.4</httpcore.version> + <httpclient.version>4.5.3</httpclient.version> + <httpcore.version>4.4.6</httpcore.version> <!-- Maybe problems with Hibernate 5.0.10 --> <mysql-connector.java>6.0.5</mysql-connector.java> @@ -62,12 +62,12 @@ <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.lang3.version>3.6</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.9.4</jodatime.version> - <jackson-version>2.8.4</jackson-version> + <jackson-version>2.8.7</jackson-version> <apache-cli-version>1.3.1</apache-cli-version> <spring-orm-version>${org.springframework.version}</spring-orm-version> @@ -91,13 +91,13 @@ <name>local</name> <url>file:${basedir}/../../../repository</url> </repository> - <repository> +<!-- <repository> <id>hyberjaxb</id> <url>http://repository.highsource.org/maven2/releases/</url> <releases> <enabled>false</enabled> </releases> - </repository> + </repository> --> <repository> <id>jboss</id> <url>https://repository.jboss.org/nexus/content/repositories/central/</url> @@ -526,6 +526,12 @@ </dependency> <dependency> + <groupId>MOA.id.server.modules</groupId> + <artifactId>moa-id-module-bkaMobilaAuthSAML2Test</artifactId> + <version>${moa-id-version}</version> + </dependency> + + <dependency> <groupId>MOA.id.server</groupId> <artifactId>moa-id-commons</artifactId> <version>${moa-id-version}</version> @@ -568,7 +574,7 @@ <dependency> <groupId>iaik.prod</groupId> <artifactId>iaik_jce_full</artifactId> - <version>5.3_MOA</version> + <version>5.5_MOA</version> <scope>compile</scope> </dependency> |