diff --git a/coherence-bom/build.gradle b/coherence-bom/build.gradle index ac15b93f..07f23a85 100644 --- a/coherence-bom/build.gradle +++ b/coherence-bom/build.gradle @@ -2,3 +2,21 @@ plugins { id "io.micronaut.build.internal.coherence-base" id 'io.micronaut.build.internal.bom' } + +javaPlatform { + allowDependencies() +} + +micronautBom { + suppressions { + dependencies.addAll([ + "io.micronaut.coherence:micronaut-coherence-data:${projectVersion}", + "io.micronaut.coherence:micronaut-coherence-grpc-test:${projectVersion}", + "io.micronaut.coherence:micronaut-coherence-cache:${projectVersion}", + "io.micronaut.coherence:micronaut-coherence-grpc-client:${projectVersion}", + "io.micronaut.coherence:micronaut-coherence-distributed-configuration:${projectVersion}", + "io.micronaut.coherence:micronaut-coherence:${projectVersion}", + "io.micronaut.coherence:micronaut-coherence-session:${projectVersion}" + ]) + } +} diff --git a/coherence/src/test/java/io/micronaut/coherence/event/EventsHelper.java b/coherence/src/test/java/io/micronaut/coherence/event/EventsHelper.java index c34a55bd..3c29e10c 100644 --- a/coherence/src/test/java/io/micronaut/coherence/event/EventsHelper.java +++ b/coherence/src/test/java/io/micronaut/coherence/event/EventsHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Oracle and/or its affiliates. + * Copyright (c) 2020, 2024 Oracle and/or its affiliates. * * Licensed under the Universal Permissive License v 1.0 as shown at * http://oss.oracle.com/licenses/upl. @@ -10,6 +10,7 @@ import java.util.Map; import com.tangosol.coherence.component.util.daemon.queueProcessor.service.grid.partitionedService.PartitionedCache; +import com.tangosol.coherence.component.util.daemon.queueProcessor.service.grid.partitionedService.partitionedCache.Storage; import com.tangosol.coherence.component.util.safeService.SafeCacheService; import com.tangosol.net.CacheService; import com.tangosol.net.NamedMap; @@ -26,21 +27,21 @@ private EventsHelper() { } public static int getTotalListenerCount(NamedMap map) { - PartitionedCache.Storage storage = getStorage(map); + Storage storage = getStorage(map); return getKeyListenerCount(storage) + getListenerCount(storage); } public static int getListenerCount(NamedMap map) { - PartitionedCache.Storage storage = getStorage(map); + Storage storage = getStorage(map); return getListenerCount(storage); } public static int getKeyListenerCount(NamedMap map) { - PartitionedCache.Storage storage = getStorage(map); + Storage storage = getStorage(map); return getKeyListenerCount(storage); } - private static int getListenerCount(PartitionedCache.Storage storage) { + private static int getListenerCount(Storage storage) { if (storage == null) { return 0; } @@ -48,7 +49,7 @@ private static int getListenerCount(PartitionedCache.Storage storage) { return map != null ? map.size() : 0; } - private static int getKeyListenerCount(PartitionedCache.Storage storage) { + private static int getKeyListenerCount(Storage storage) { if (storage == null) { return 0; } @@ -56,7 +57,7 @@ private static int getKeyListenerCount(PartitionedCache.Storage storage) { return map != null ? map.size() : 0; } - private static PartitionedCache.Storage getStorage(NamedMap map) { + private static Storage getStorage(NamedMap map) { CacheService service = map.getService(); if (service instanceof SafeCacheService) { service = ((SafeCacheService) service).getRunningCacheService(); diff --git a/coherence/src/test/java/io/micronaut/coherence/messaging/CoherenceTopicListenerTest.java b/coherence/src/test/java/io/micronaut/coherence/messaging/CoherenceTopicListenerTest.java index e84f45d2..7bedbcc3 100644 --- a/coherence/src/test/java/io/micronaut/coherence/messaging/CoherenceTopicListenerTest.java +++ b/coherence/src/test/java/io/micronaut/coherence/messaging/CoherenceTopicListenerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 original authors + * Copyright 2017-2024 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ import com.tangosol.internal.net.topic.impl.paged.model.SubscriberGroupId; import com.tangosol.io.Serializer; import com.tangosol.net.CacheService; +import com.tangosol.net.PagedTopicService; import com.tangosol.net.topic.Position; import com.tangosol.util.Binary; import com.tangosol.util.ExternalizableHelper; @@ -326,7 +327,7 @@ public void shouldReceiveMessagesForMultipleSubscribersInSameGroup() { @Test public void shouldCommitWithDefaultStrategy() throws Exception { NamedTopic topic = coherence.getSession().getTopic("TwentyDefault"); - PagedTopicCaches caches = new PagedTopicCaches(topic.getName(), (CacheService) topic.getService(), null); + PagedTopicCaches caches = new PagedTopicCaches(topic.getName(), (PagedTopicService) topic.getService()); SubscriberGroupId groupId = SubscriberGroupId.withName(ListenerSix.GROUP_ID); try (Publisher publisher = topic.createPublisher()) { @@ -342,7 +343,7 @@ public void shouldCommitWithDefaultStrategy() throws Exception { @Test public void shouldCommitWithSyncStrategy() throws Exception { NamedTopic topic = coherence.getSession().getTopic("TwentySync"); - PagedTopicCaches caches = new PagedTopicCaches(topic.getName(), (CacheService) topic.getService(), null); + PagedTopicCaches caches = new PagedTopicCaches(topic.getName(), (PagedTopicService) topic.getService()); SubscriberGroupId groupId = SubscriberGroupId.withName(ListenerSix.GROUP_ID); try (Publisher publisher = topic.createPublisher()) { @@ -358,7 +359,7 @@ public void shouldCommitWithSyncStrategy() throws Exception { @Test public void shouldCommitWithAsyncStrategy() { NamedTopic topic = coherence.getSession().getTopic("TwentyAsync"); - PagedTopicCaches caches = new PagedTopicCaches(topic.getName(), (CacheService) topic.getService(), null); + PagedTopicCaches caches = new PagedTopicCaches(topic.getName(), (PagedTopicService) topic.getService()); SubscriberGroupId groupId = SubscriberGroupId.withName(ListenerSix.GROUP_ID); try (Publisher publisher = topic.createPublisher()) { @@ -374,7 +375,7 @@ public void shouldCommitWithAsyncStrategy() { @Test public void shouldCommitWithManualStrategy() throws Exception { NamedTopic topic = coherence.getSession().getTopic("TwentyManual"); - PagedTopicCaches caches = new PagedTopicCaches(topic.getName(), (CacheService) topic.getService(), null); + PagedTopicCaches caches = new PagedTopicCaches(topic.getName(), (PagedTopicService) topic.getService()); SubscriberGroupId groupId = SubscriberGroupId.withName(ListenerSix.GROUP_ID); try (Publisher publisher = topic.createPublisher()) { diff --git a/gradle.properties b/gradle.properties index dc70dcb5..ef6ff064 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -projectVersion=3.7.2 +projectVersion=3.10.0 projectGroup=io.micronaut.coherence micronautDocsVersion=2.0.0 groovyVersion=3.0.13 @@ -28,7 +28,7 @@ developers=Aleks Seovic, Jonathan Knight, Vaso Putica, Ryan Lubke githubBranch=master # Micronaut core branch for BOM pull requests -githubCoreBranch=3.7.x +githubCoreBranch=3.10.x bomProperty=micronautCoherenceVersion # If needed, set additional properties diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 78176889..ef60ddc4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -managed-coherence = "22.06.2" +managed-coherence = "22.06.7" bedrock = "7.0.0" hamcrest = "2.2" @@ -8,13 +8,13 @@ junit = "5.9.1" mockito = "4.8.1" # Micronaut -micronaut = "3.7.3" -micronaut-grpc = "3.3.1" +micronaut = "3.10.4" +micronaut-grpc = "3.6.0" micronaut-cache = "3.5.0" -micronaut-data = "3.8.1" -micronaut-discovery-client = "3.2.0" +micronaut-data = "3.9.7" +micronaut-discovery-client = "3.3.1" micronaut-docs-asciidoc-config-props = "2.0.0" -micronaut-test = "3.7.0" +micronaut-test = "3.9.2" micronaut-test-junit5 = "3.1.1" diff --git a/settings.gradle b/settings.gradle index 69e34372..a2a6c2d9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("io.micronaut.build.shared.settings") version "5.3.15" + id("io.micronaut.build.shared.settings") version "5.4.10" } include 'coherence'