From 511258f48692efc0e28b0cc402da69addca77ca7 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Fri, 17 Jan 2020 09:43:15 -0600 Subject: [PATCH 1/2] Upgrade to Infinispan 10.1.1.Final See gh-19790 --- .../spring-boot-dependencies/build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index e6957fd5ba3..50aa37746c1 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -534,12 +534,12 @@ bom { ] } } - library('Infinispan', '9.4.16.Final') { + library('Infinispan', '10.1.0.Final') { group('org.infinispan') { modules = [ + 'infinispan-api', 'infinispan-cachestore-jdbc', 'infinispan-cachestore-jpa', - 'infinispan-cachestore-leveldb', 'infinispan-cachestore-remote', 'infinispan-cachestore-rest', 'infinispan-cachestore-rocksdb', @@ -547,22 +547,25 @@ bom { 'infinispan-cdi-embedded', 'infinispan-cdi-remote', 'infinispan-client-hotrod', - 'infinispan-cloud', + 'infinispan-client-rest', 'infinispan-clustered-counter', 'infinispan-clustered-lock', 'infinispan-commons', + 'infinispan-component-annotations', 'infinispan-core', 'infinispan-directory-provider', 'infinispan-hibernate-cache-v53', + 'infinispan-jboss-marshalling', 'infinispan-jcache', 'infinispan-jcache-commons', 'infinispan-jcache-remote', + 'infinispan-key-value-store-client', 'infinispan-lucene-directory', 'infinispan-objectfilter', 'infinispan-osgi', - 'infinispan-persistence-cli', 'infinispan-persistence-soft-index', 'infinispan-query', + 'infinispan-query-core', 'infinispan-query-dsl', 'infinispan-remote-query-client', 'infinispan-remote-query-server', @@ -570,17 +573,14 @@ bom { 'infinispan-server-core', 'infinispan-server-hotrod', 'infinispan-server-memcached', + 'infinispan-server-rest', 'infinispan-server-router', - 'infinispan-spring4-common', - 'infinispan-spring4-embedded', - 'infinispan-spring4-remote', 'infinispan-spring5-common', 'infinispan-spring5-embedded', 'infinispan-spring5-remote', 'infinispan-tasks', 'infinispan-tasks-api', - 'infinispan-tools', - 'infinispan-tree' + 'infinispan-tools' ] plugins = [ 'infinispan-protocol-parser-generator-maven-plugin' From 4d70f58bc892c4e42e4b244c9cd69ffce158a5ca Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 21 Jan 2020 11:29:35 +0100 Subject: [PATCH 2/2] Polish "Upgrade to Infinispan 10.1.1.Final" See gh-19790 --- .../spring-boot-autoconfigure/build.gradle | 1 + .../spring-boot-dependencies/build.gradle | 48 ++----------------- 2 files changed, 5 insertions(+), 44 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 15677b247f6..ace5581d318 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -87,6 +87,7 @@ dependencies { optional 'org.hibernate:hibernate-core' optional 'org.hibernate:hibernate-jcache' optional 'org.hibernate.validator:hibernate-validator' + optional 'org.infinispan:infinispan-component-annotations' optional 'org.infinispan:infinispan-jcache' optional 'org.infinispan:infinispan-spring5-embedded' optional 'org.influxdb:influxdb-java' diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 50aa37746c1..9605f3abbe8 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -534,53 +534,13 @@ bom { ] } } - library('Infinispan', '10.1.0.Final') { + library('Infinispan', '10.1.1.Final') { group('org.infinispan') { + imports = [ + 'infinispan-bom' + ] modules = [ - 'infinispan-api', - 'infinispan-cachestore-jdbc', - 'infinispan-cachestore-jpa', - 'infinispan-cachestore-remote', - 'infinispan-cachestore-rest', - 'infinispan-cachestore-rocksdb', - 'infinispan-cdi-common', - 'infinispan-cdi-embedded', - 'infinispan-cdi-remote', - 'infinispan-client-hotrod', - 'infinispan-client-rest', - 'infinispan-clustered-counter', - 'infinispan-clustered-lock', - 'infinispan-commons', - 'infinispan-component-annotations', - 'infinispan-core', - 'infinispan-directory-provider', - 'infinispan-hibernate-cache-v53', - 'infinispan-jboss-marshalling', - 'infinispan-jcache', 'infinispan-jcache-commons', - 'infinispan-jcache-remote', - 'infinispan-key-value-store-client', - 'infinispan-lucene-directory', - 'infinispan-objectfilter', - 'infinispan-osgi', - 'infinispan-persistence-soft-index', - 'infinispan-query', - 'infinispan-query-core', - 'infinispan-query-dsl', - 'infinispan-remote-query-client', - 'infinispan-remote-query-server', - 'infinispan-scripting', - 'infinispan-server-core', - 'infinispan-server-hotrod', - 'infinispan-server-memcached', - 'infinispan-server-rest', - 'infinispan-server-router', - 'infinispan-spring5-common', - 'infinispan-spring5-embedded', - 'infinispan-spring5-remote', - 'infinispan-tasks', - 'infinispan-tasks-api', - 'infinispan-tools' ] plugins = [ 'infinispan-protocol-parser-generator-maven-plugin'