diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-10-16 08:07:10 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-10-16 08:07:10 +0200 |
commit | da0174d3b037468d243fad688ca1fd91c2049d24 (patch) | |
tree | 1f6208891d0bff29ab7f8a95fa32622d3e856c47 /id/server/idserverlib | |
parent | abae1d0a880178568e742c09779bd2a47394f1e4 (diff) | |
download | moa-id-spss-da0174d3b037468d243fad688ca1fd91c2049d24.tar.gz moa-id-spss-da0174d3b037468d243fad688ca1fd91c2049d24.tar.bz2 moa-id-spss-da0174d3b037468d243fad688ca1fd91c2049d24.zip |
update third party libs to solve incompatibility with JDK11
Diffstat (limited to 'id/server/idserverlib')
-rw-r--r-- | id/server/idserverlib/pom.xml | 14 | ||||
-rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java | 4 |
2 files changed, 12 insertions, 6 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; |