diff options
4 files changed, 25 insertions, 18 deletions
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index a8a1a2695..a0d8b9a22 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -489,13 +489,13 @@ <dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
- <version>1.8.14.RELEASE</version>
+ <version>2.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>2.4.3</version>
+ <version>2.6.0</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
@@ -503,7 +503,7 @@ <version>2.9.0</version>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.13</version>
@@ -512,7 +512,13 @@ <groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
- </dependency>
+ </dependency> -->
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.9.7</version>
+ </dependency>
</dependencies>
<build>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java index 8d36e81bb..5149186f6 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java @@ -36,7 +36,7 @@ import org.springframework.dao.DataAccessException; import org.springframework.data.redis.core.RedisOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.SessionCallback; -import org.springframework.data.redis.serializer.JacksonJsonRedisSerializer; +import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; import org.springframework.stereotype.Service; import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage; @@ -58,7 +58,7 @@ public class RedisTransactionStorage implements ITransactionStorage { protected AuthConfiguration authConfig; @Autowired - private JacksonJsonRedisSerializer assertionStoreSerializer; + private GenericJackson2JsonRedisSerializer assertionStoreSerializer; public RedisTemplate<String, Object> getTemplate(){ return this.redisTemplate; diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/NewMoaEidasMetadata.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/NewMoaEidasMetadata.java index bb52d2ffe..1e5609e4e 100644 --- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/NewMoaEidasMetadata.java +++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/NewMoaEidasMetadata.java @@ -378,7 +378,8 @@ public class NewMoaEidasMetadata { new ImmutableSortedSet.Builder<>(Ordering.<AttributeDefinition<?>>natural()); for (String attr : eIDASAttributeBuilder.getAllProvideableeIDASAttributes()) { - AttributeDefinition<?> supAttr = params.getIdpEngine().getProtocolProcessor().getAttributeDefinitionNullable(attr); + NewMoaEidasMetadata.LOGGER.trace("Build metadata-attr: " + attr); + AttributeDefinition<?> supAttr = params.getIdpEngine().getProtocolProcessor().getAttributeDefinitionNullable(attr); builder.add(supAttr); } @@ -26,21 +26,21 @@ <!-- =================================================================================== --> <egiz.eaaf.version>1.0.3</egiz.eaaf.version> - <org.springframework.version>4.3.18.RELEASE</org.springframework.version> - <org.springframework.data.spring-data-jpa>1.11.13.RELEASE</org.springframework.data.spring-data-jpa> + <org.springframework.version>5.1.0.RELEASE</org.springframework.version> + <org.springframework.data.spring-data-jpa>2.1.0.RELEASE</org.springframework.data.spring-data-jpa> <surefire.version>2.22.0</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> + <xmlsec.version>2.1.2</xmlsec.version> - <hibernate.version>5.2.17.Final</hibernate.version> - <org.apache.commons.commons.dbcp2>2.4.0</org.apache.commons.commons.dbcp2> + <hibernate.version>5.3.6.Final</hibernate.version> + <org.apache.commons.commons.dbcp2>2.5.0</org.apache.commons.commons.dbcp2> - <cxf.version>3.2.5</cxf.version> - <struts.version>2.5.17</struts.version> <!-- 2.5.10.1 --> + <cxf.version>3.2.6</cxf.version> + <struts.version>2.5.18</struts.version> <!-- 2.5.10.1 --> <egovutils.version>2.0.0</egovutils.version> @@ -50,7 +50,7 @@ <httpcore.version>4.4.10</httpcore.version> <!-- Maybe problems with Hibernate 5.0.10 --> - <mysql-connector.java>6.0.6</mysql-connector.java> + <mysql-connector.java>8.0.12</mysql-connector.java> <!-- <mysql-connector.java>5.1.40</mysql-connector.java> --> <junit.version>4.12</junit.version> @@ -60,9 +60,9 @@ <org.apache.commons.collections3.version>3.2.2</org.apache.commons.collections3.version> <jodatime.version>2.10</jodatime.version> - <jackson-version>2.9.1</jackson-version> - <apache-cli-version>1.4</apache-cli-version> - <spring-orm-version>${org.springframework.version}</spring-orm-version> + <jackson-version>2.9.7</jackson-version> + <apache-cli-version>1.4</apache-cli-version> + <spring-orm-version>${org.springframework.version}</spring-orm-version> </properties> |