This is an automated email from the ASF dual-hosted git repository. timothyjward pushed a commit to branch feature/v1.1 in repository https://gitbox.apache.org/repos/asf/aries-typedevent.git
commit 2c93df8492f95fa7d19f64635ff72f33921c01ff Merge: cf70894 3b1c438 Author: Tim Ward <[email protected]> AuthorDate: Mon Feb 17 11:04:30 2025 +0000 Merge branch 'main' into feature/v1.1 Resynchronise with the main branch .../org/apache/aries/typedevent/bus/impl/TypedEventBusImpl.java | 1 + .../apache/aries/typedevent/bus/impl/TypedEventBusImplTest.java | 9 ++++++--- .../test.bndrun | 4 ++-- .../org.apache.aries.typedevent.remote.spi/pom.xml | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --cc org.apache.aries.typedevent.bus/src/test/java/org/apache/aries/typedevent/bus/impl/TypedEventBusImplTest.java index b7058f6,2113f7d..4bb1470 --- a/org.apache.aries.typedevent.bus/src/test/java/org/apache/aries/typedevent/bus/impl/TypedEventBusImplTest.java +++ b/org.apache.aries.typedevent.bus/src/test/java/org/apache/aries/typedevent/bus/impl/TypedEventBusImplTest.java @@@ -30,6 -27,11 +30,7 @@@ import static org.osgi.service.typedeve import static org.osgi.service.typedevent.TypedEventConstants.TYPED_EVENT_TYPE; import static org.osgi.util.converter.Converters.standardConverter; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; + import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.Semaphore; @@@ -124,12 -127,25 +125,14 @@@ public class TypedEventBusImplTest return null; }).when(unhandledHandler).notifyUnhandled(Mockito.anyString(), Mockito.any()); - monitorImpl = new TypedEventMonitorImpl(new HashMap<String, Object>()); - Map<String, Object> config; - if(info.getTestMethod() - .map(m -> m.isAnnotationPresent(AllowSingleLevelWildcard.class)) - .orElse(false)) { - config = Collections.singletonMap("extended.wildcards.enabled", true); - } else { - config = Collections.emptyMap(); - } ++ Map<String, Object> config = Collections.emptyMap(); + + monitorImpl = new TypedEventMonitorImpl(config); - impl = new TypedEventBusImpl(monitorImpl, new HashMap<String, Object>()); + impl = new TypedEventBusImpl(monitorImpl, config); impl.start(); } - + - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.METHOD) - public static @interface AllowSingleLevelWildcard { } - @AfterEach public void stop() throws Exception { impl.stop(); diff --cc org.apache.aries.typedevent.remote/org.apache.aries.typedevent.remote.remoteservices/test.bndrun index 286e017,fb30124..9d9e626 --- a/org.apache.aries.typedevent.remote/org.apache.aries.typedevent.remote.remoteservices/test.bndrun +++ b/org.apache.aries.typedevent.remote/org.apache.aries.typedevent.remote.remoteservices/test.bndrun @@@ -53,8 -52,8 +53,8 @@@ org.opentest4j;version='[1.3.0,1.3.1)',\ org.osgi.test.common;version='[1.2.1,1.2.2)',\ org.osgi.test.junit5;version='[1.2.1,1.2.2)',\ - org.apache.aries.typedevent.remote.api;version='[0.0.2,0.0.3)',\ - org.apache.aries.typedevent.bus;version='[0.0.3,0.0.4)',\ - org.apache.aries.typedevent.remote.api;version='[0.0.3,0.0.4)',\ - org.apache.aries.typedevent.remote.remoteservices;version='[0.0.3,0.0.4)',\ - org.apache.aries.typedevent.remote.remoteservices-tests;version='[0.0.3,0.0.4)',\ - org.apache.aries.typedevent.remote.spi;version='[0.0.3,0.0.4)' + org.osgi.service.typedevent;version='[1.1.0,1.1.1)',\ + org.osgi.util.promise;version='[1.1.1,1.1.2)',\ - org.osgi.util.pushstream;version='[1.0.1,1.0.2)' ++ org.osgi.util.pushstream;version='[1.0.1,1.0.2)',\ ++ org.apache.aries.typedevent.remote.api;version='[1.1.0,1.1.1)' + diff --cc org.apache.aries.typedevent.remote/org.apache.aries.typedevent.remote.spi/pom.xml index 680caa8,b569293..6a384cb --- a/org.apache.aries.typedevent.remote/org.apache.aries.typedevent.remote.spi/pom.xml +++ b/org.apache.aries.typedevent.remote/org.apache.aries.typedevent.remote.spi/pom.xml @@@ -50,7 -49,7 +50,7 @@@ <dependency> <groupId>org.apache.aries.typedevent.remote</groupId> <artifactId>org.apache.aries.typedevent.remote.api</artifactId> - <version>0.0.2-SNAPSHOT</version> - <version>0.0.3-SNAPSHOT</version> ++ <version>1.1.0-SNAPSHOT</version> </dependency> </dependencies>
