diff --git a/android/clustercontroller-android-standalone/app/build.gradle b/android/clustercontroller-android-standalone/app/build.gradle index 461c18e26a..115d190568 100644 --- a/android/clustercontroller-android-standalone/app/build.gradle +++ b/android/clustercontroller-android-standalone/app/build.gradle @@ -37,7 +37,7 @@ android { } ext { - joynr_version = '1.24.0' + joynr_version = '1.25.0' } dependencies { diff --git a/android/dependency-lock/common/access-control-common/pom.xml b/android/dependency-lock/common/access-control-common/pom.xml index bc4be20970..705ee0ed92 100644 --- a/android/dependency-lock/common/access-control-common/pom.xml +++ b/android/dependency-lock/common/access-control-common/pom.xml @@ -26,7 +26,7 @@ io.joynr.android common - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/common/discovery-common/pom.xml b/android/dependency-lock/common/discovery-common/pom.xml index 7a55bc898b..f4339ccda0 100644 --- a/android/dependency-lock/common/discovery-common/pom.xml +++ b/android/dependency-lock/common/discovery-common/pom.xml @@ -26,7 +26,7 @@ io.joynr.android common - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/common/guice-integration/pom.xml b/android/dependency-lock/common/guice-integration/pom.xml index 0846a944de..6472250034 100644 --- a/android/dependency-lock/common/guice-integration/pom.xml +++ b/android/dependency-lock/common/guice-integration/pom.xml @@ -28,7 +28,7 @@ io.joynr.android common - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/common/infrastructure-common/pom.xml b/android/dependency-lock/common/infrastructure-common/pom.xml index 399fa5e25c..92a63ac694 100644 --- a/android/dependency-lock/common/infrastructure-common/pom.xml +++ b/android/dependency-lock/common/infrastructure-common/pom.xml @@ -26,7 +26,7 @@ io.joynr.android common - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/common/pom.xml b/android/dependency-lock/common/pom.xml index 5d910bc655..a1d136346e 100644 --- a/android/dependency-lock/common/pom.xml +++ b/android/dependency-lock/common/pom.xml @@ -26,7 +26,7 @@ io.joynr.android dependency-lock - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/common/status-metrics/pom.xml b/android/dependency-lock/common/status-metrics/pom.xml index c35d668bba..f84091a179 100644 --- a/android/dependency-lock/common/status-metrics/pom.xml +++ b/android/dependency-lock/common/status-metrics/pom.xml @@ -26,7 +26,7 @@ io.joynr.android common - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/core/clustercontroller/pom.xml b/android/dependency-lock/core/clustercontroller/pom.xml index ff1fde65ae..c6a0bfa00c 100644 --- a/android/dependency-lock/core/clustercontroller/pom.xml +++ b/android/dependency-lock/core/clustercontroller/pom.xml @@ -26,7 +26,7 @@ io.joynr.android core - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/core/libjoynr-websocket-runtime/pom.xml b/android/dependency-lock/core/libjoynr-websocket-runtime/pom.xml index df0e60053d..2bffe1781a 100644 --- a/android/dependency-lock/core/libjoynr-websocket-runtime/pom.xml +++ b/android/dependency-lock/core/libjoynr-websocket-runtime/pom.xml @@ -27,7 +27,7 @@ core io.joynr.android - 1.24.0 + 1.25.0 diff --git a/android/dependency-lock/core/libjoynr/pom.xml b/android/dependency-lock/core/libjoynr/pom.xml index b8da46ec37..b572d89068 100644 --- a/android/dependency-lock/core/libjoynr/pom.xml +++ b/android/dependency-lock/core/libjoynr/pom.xml @@ -26,7 +26,7 @@ io.joynr.android core - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/core/pom.xml b/android/dependency-lock/core/pom.xml index d4346bc896..0787fc8fd3 100644 --- a/android/dependency-lock/core/pom.xml +++ b/android/dependency-lock/core/pom.xml @@ -26,7 +26,7 @@ io.joynr.android dependency-lock - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/javaapi/pom.xml b/android/dependency-lock/javaapi/pom.xml index c5a0dc6687..5ede17d0fb 100644 --- a/android/dependency-lock/javaapi/pom.xml +++ b/android/dependency-lock/javaapi/pom.xml @@ -27,7 +27,7 @@ io.joynr.android dependency-lock - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/messaging/messaging-common/pom.xml b/android/dependency-lock/messaging/messaging-common/pom.xml index b2c44355e1..1fcc6f08be 100644 --- a/android/dependency-lock/messaging/messaging-common/pom.xml +++ b/android/dependency-lock/messaging/messaging-common/pom.xml @@ -27,7 +27,7 @@ io.joynr.android messaging - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/messaging/mqtt/hivemq-mqtt-client/pom.xml b/android/dependency-lock/messaging/mqtt/hivemq-mqtt-client/pom.xml index a0027f2ae0..096f7693f2 100644 --- a/android/dependency-lock/messaging/mqtt/hivemq-mqtt-client/pom.xml +++ b/android/dependency-lock/messaging/mqtt/hivemq-mqtt-client/pom.xml @@ -25,7 +25,7 @@ io.joynr.android.messaging mqtt - 1.24.0 + 1.25.0 diff --git a/android/dependency-lock/messaging/mqtt/joynr-mqtt-client/pom.xml b/android/dependency-lock/messaging/mqtt/joynr-mqtt-client/pom.xml index 8b4fc28f8e..eddb63528f 100644 --- a/android/dependency-lock/messaging/mqtt/joynr-mqtt-client/pom.xml +++ b/android/dependency-lock/messaging/mqtt/joynr-mqtt-client/pom.xml @@ -25,7 +25,7 @@ io.joynr.android.messaging mqtt - 1.24.0 + 1.25.0 diff --git a/android/dependency-lock/messaging/mqtt/pom.xml b/android/dependency-lock/messaging/mqtt/pom.xml index beebf39067..33968a0ae9 100644 --- a/android/dependency-lock/messaging/mqtt/pom.xml +++ b/android/dependency-lock/messaging/mqtt/pom.xml @@ -26,7 +26,7 @@ io.joynr.android messaging - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/messaging/pom.xml b/android/dependency-lock/messaging/pom.xml index 22081cf117..584ca8b38a 100644 --- a/android/dependency-lock/messaging/pom.xml +++ b/android/dependency-lock/messaging/pom.xml @@ -26,7 +26,7 @@ io.joynr.android dependency-lock - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/messaging/websocket/joynr-websocket-client/pom.xml b/android/dependency-lock/messaging/websocket/joynr-websocket-client/pom.xml index aedbe31cf4..6b074e67cc 100644 --- a/android/dependency-lock/messaging/websocket/joynr-websocket-client/pom.xml +++ b/android/dependency-lock/messaging/websocket/joynr-websocket-client/pom.xml @@ -25,7 +25,7 @@ io.joynr.android.messaging websocket - 1.24.0 + 1.25.0 diff --git a/android/dependency-lock/messaging/websocket/joynr-websocket-common/pom.xml b/android/dependency-lock/messaging/websocket/joynr-websocket-common/pom.xml index 39e3ce22ed..fead2f21ad 100644 --- a/android/dependency-lock/messaging/websocket/joynr-websocket-common/pom.xml +++ b/android/dependency-lock/messaging/websocket/joynr-websocket-common/pom.xml @@ -26,7 +26,7 @@ io.joynr.android.messaging websocket - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/messaging/websocket/joynr-websocket-server/pom.xml b/android/dependency-lock/messaging/websocket/joynr-websocket-server/pom.xml index 0dcdb5692d..3f104df37e 100644 --- a/android/dependency-lock/messaging/websocket/joynr-websocket-server/pom.xml +++ b/android/dependency-lock/messaging/websocket/joynr-websocket-server/pom.xml @@ -25,7 +25,7 @@ io.joynr.android.messaging websocket - 1.24.0 + 1.25.0 diff --git a/android/dependency-lock/messaging/websocket/pom.xml b/android/dependency-lock/messaging/websocket/pom.xml index 89ec07eea8..b141529f4c 100644 --- a/android/dependency-lock/messaging/websocket/pom.xml +++ b/android/dependency-lock/messaging/websocket/pom.xml @@ -26,7 +26,7 @@ io.joynr.android messaging - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/dependency-lock/pom.xml b/android/dependency-lock/pom.xml index 51da03e896..0239938fe7 100644 --- a/android/dependency-lock/pom.xml +++ b/android/dependency-lock/pom.xml @@ -29,7 +29,7 @@ io.joynr android - 1.24.0 + 1.25.0 ../pom.xml @@ -193,7 +193,7 @@ com.google.errorprone error_prone_annotations jar - 2.11.0 + 2.18.0 com.google.flatbuffers @@ -211,7 +211,7 @@ com.google.guava guava jar - 31.1-jre + 32.0.1-jre com.google.guava @@ -235,7 +235,7 @@ com.google.j2objc j2objc-annotations jar - 1.3 + 3.0.0 com.googlecode.concurrent-trees @@ -265,43 +265,43 @@ io.netty netty-buffer jar - 4.1.89.Final + 4.1.100.Final io.netty netty-codec jar - 4.1.89.Final + 4.1.100.Final io.netty netty-common jar - 4.1.89.Final + 4.1.100.Final io.netty netty-handler jar - 4.1.89.Final + 4.1.100.Final io.netty netty-resolver jar - 4.1.89.Final + 4.1.100.Final io.netty netty-transport jar - 4.1.89.Final + 4.1.100.Final io.netty netty-transport-native-unix-common jar - 4.1.89.Final + 4.1.100.Final io.reactivex.rxjava2 @@ -309,24 +309,12 @@ jar 2.2.19 - - jakarta.annotation - jakarta.annotation-api - jar - 2.1.1 - jakarta.platform jakarta.jakartaee-api jar 8.0.0 - - jakarta.transaction - jakarta.transaction-api - jar - 2.0.0 - javax.inject javax.inject @@ -385,85 +373,67 @@ org.checkerframework checker-qual jar - 3.12.0 + 3.45.0 org.eclipse.jetty jetty-alpn-client jar - 11.0.11 - - - org.eclipse.jetty - jetty-annotations - jar - 11.0.11 + 11.0.18 org.eclipse.jetty jetty-client jar - 11.0.11 + 11.0.18 org.eclipse.jetty jetty-http jar - 11.0.11 + 11.0.18 org.eclipse.jetty jetty-io jar - 11.0.11 - - - org.eclipse.jetty - jetty-jndi - jar - 11.0.11 - - - org.eclipse.jetty - jetty-plus - jar - 11.0.11 + 11.0.18 org.eclipse.jetty jetty-security jar - 11.0.11 + 11.0.18 org.eclipse.jetty jetty-server jar - 11.0.11 + 11.0.18 org.eclipse.jetty jetty-servlet jar - 11.0.11 + 11.0.18 org.eclipse.jetty jetty-util jar - 11.0.11 + 11.0.18 org.eclipse.jetty jetty-webapp jar - 11.0.11 + 11.0.18 org.eclipse.jetty jetty-xml jar - 11.0.11 + 11.0.18 org.eclipse.jetty.toolchain @@ -475,49 +445,49 @@ org.eclipse.jetty.websocket websocket-core-client jar - 11.0.11 + 11.0.18 org.eclipse.jetty.websocket websocket-core-common jar - 11.0.11 + 11.0.18 org.eclipse.jetty.websocket websocket-core-server jar - 11.0.11 + 11.0.18 org.eclipse.jetty.websocket websocket-jetty-api jar - 11.0.11 + 11.0.18 org.eclipse.jetty.websocket websocket-jetty-client jar - 11.0.11 + 11.0.18 org.eclipse.jetty.websocket websocket-jetty-common jar - 11.0.11 + 11.0.18 org.eclipse.jetty.websocket websocket-jetty-server jar - 11.0.11 + 11.0.18 org.eclipse.jetty.websocket websocket-servlet jar - 11.0.11 + 11.0.18 org.hamcrest @@ -561,24 +531,6 @@ jar 3.3 - - org.ow2.asm - asm - jar - 9.4 - - - org.ow2.asm - asm-commons - jar - 9.4 - - - org.ow2.asm - asm-tree - jar - 9.4 - org.reactivestreams reactive-streams @@ -589,13 +541,13 @@ org.slf4j slf4j-api jar - 1.7.36 + 2.0.9 org.xerial sqlite-jdbc jar - 3.41.0.0 + 3.43.2.2 diff --git a/android/examples/android-hello-world-binder/android-hello-world-binder-consumer/build.gradle b/android/examples/android-hello-world-binder/android-hello-world-binder-consumer/build.gradle index c878fbf764..9a0fd4d5b9 100644 --- a/android/examples/android-hello-world-binder/android-hello-world-binder-consumer/build.gradle +++ b/android/examples/android-hello-world-binder/android-hello-world-binder-consumer/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '1.3.61' - joynr_version = '1.24.0' + joynr_version = '1.25.0' } repositories { google() diff --git a/android/examples/android-hello-world-binder/android-hello-world-binder-consumer/pom.xml b/android/examples/android-hello-world-binder/android-hello-world-binder-consumer/pom.xml index 186b9b029e..4163602b01 100644 --- a/android/examples/android-hello-world-binder/android-hello-world-binder-consumer/pom.xml +++ b/android/examples/android-hello-world-binder/android-hello-world-binder-consumer/pom.xml @@ -28,7 +28,7 @@ io.joynr.examples android-hello-world-binder - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/examples/android-hello-world-binder/android-hello-world-binder-provider/build.gradle b/android/examples/android-hello-world-binder/android-hello-world-binder-provider/build.gradle index 1fbf0669fd..e37d916a04 100644 --- a/android/examples/android-hello-world-binder/android-hello-world-binder-provider/build.gradle +++ b/android/examples/android-hello-world-binder/android-hello-world-binder-provider/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '1.3.61' - joynr_version = "1.24.0" + joynr_version = "1.25.0" } repositories { google() diff --git a/android/examples/android-hello-world-binder/android-hello-world-binder-provider/pom.xml b/android/examples/android-hello-world-binder/android-hello-world-binder-provider/pom.xml index abe045cc99..5aebe40a50 100644 --- a/android/examples/android-hello-world-binder/android-hello-world-binder-provider/pom.xml +++ b/android/examples/android-hello-world-binder/android-hello-world-binder-provider/pom.xml @@ -28,7 +28,7 @@ io.joynr.examples android-hello-world-binder - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/examples/android-hello-world-binder/pom.xml b/android/examples/android-hello-world-binder/pom.xml index 3c13b75a98..2b0ede2734 100644 --- a/android/examples/android-hello-world-binder/pom.xml +++ b/android/examples/android-hello-world-binder/pom.xml @@ -28,7 +28,7 @@ io.joynr.android examples - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/examples/android-hello-world/android-hello-world-consumer/build.gradle b/android/examples/android-hello-world/android-hello-world-consumer/build.gradle index cac6427968..7be9d9da3e 100644 --- a/android/examples/android-hello-world/android-hello-world-consumer/build.gradle +++ b/android/examples/android-hello-world/android-hello-world-consumer/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { - joynrVersion = "1.24.0" + joynrVersion = "1.25.0" } repositories { google() diff --git a/android/examples/android-hello-world/android-hello-world-consumer/pom.xml b/android/examples/android-hello-world/android-hello-world-consumer/pom.xml index 43607fd436..80a2e51da1 100644 --- a/android/examples/android-hello-world/android-hello-world-consumer/pom.xml +++ b/android/examples/android-hello-world/android-hello-world-consumer/pom.xml @@ -28,7 +28,7 @@ io.joynr.examples android-hello-world - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/examples/android-hello-world/android-hello-world-provider/build.gradle b/android/examples/android-hello-world/android-hello-world-provider/build.gradle index 591d76d6a9..137ee95e6c 100644 --- a/android/examples/android-hello-world/android-hello-world-provider/build.gradle +++ b/android/examples/android-hello-world/android-hello-world-provider/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { - joynrVersion = "1.24.0" + joynrVersion = "1.25.0" } repositories { google() diff --git a/android/examples/android-hello-world/android-hello-world-provider/pom.xml b/android/examples/android-hello-world/android-hello-world-provider/pom.xml index cd0601ad8d..9fe5ba0ee0 100644 --- a/android/examples/android-hello-world/android-hello-world-provider/pom.xml +++ b/android/examples/android-hello-world/android-hello-world-provider/pom.xml @@ -28,7 +28,7 @@ io.joynr.examples android-hello-world - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/examples/android-hello-world/pom.xml b/android/examples/android-hello-world/pom.xml index 4c49edbcb9..059431faca 100644 --- a/android/examples/android-hello-world/pom.xml +++ b/android/examples/android-hello-world/pom.xml @@ -28,7 +28,7 @@ io.joynr.android examples - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/examples/pom.xml b/android/examples/pom.xml index 1a7e7a2fcc..953e3c8ebe 100644 --- a/android/examples/pom.xml +++ b/android/examples/pom.xml @@ -28,7 +28,7 @@ io.joynr android - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/joynr-android-binder-runtime/build.gradle b/android/joynr-android-binder-runtime/build.gradle index 2d6bc52daa..e9d1c4a04f 100644 --- a/android/joynr-android-binder-runtime/build.gradle +++ b/android/joynr-android-binder-runtime/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'maven-publish' apply plugin: 'maven' group = 'io.joynr.android' -version = '1.24.0' +version = '1.25.0' buildscript { repositories { diff --git a/android/joynr-android-binder-runtime/pom.xml b/android/joynr-android-binder-runtime/pom.xml index c7914a93d9..575c25ff8a 100644 --- a/android/joynr-android-binder-runtime/pom.xml +++ b/android/joynr-android-binder-runtime/pom.xml @@ -26,7 +26,7 @@ io.joynr android - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/libjoynr-android-integration-tests/pom.xml b/android/libjoynr-android-integration-tests/pom.xml index 2d492dd0a8..04a721b4b6 100644 --- a/android/libjoynr-android-integration-tests/pom.xml +++ b/android/libjoynr-android-integration-tests/pom.xml @@ -26,7 +26,7 @@ io.joynr android - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/libjoynr-android-integration-tests/test-radio-consumer/app/build.gradle b/android/libjoynr-android-integration-tests/test-radio-consumer/app/build.gradle index b83b4c585c..3124c127ab 100644 --- a/android/libjoynr-android-integration-tests/test-radio-consumer/app/build.gradle +++ b/android/libjoynr-android-integration-tests/test-radio-consumer/app/build.gradle @@ -25,7 +25,7 @@ android { } ext { - joynr_version = '1.24.0' + joynr_version = '1.25.0' } dependencies { diff --git a/android/libjoynr-android-integration-tests/test-radio-consumer/build.gradle b/android/libjoynr-android-integration-tests/test-radio-consumer/build.gradle index 0be9f6a1c6..e265d41810 100644 --- a/android/libjoynr-android-integration-tests/test-radio-consumer/build.gradle +++ b/android/libjoynr-android-integration-tests/test-radio-consumer/build.gradle @@ -10,7 +10,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.5.0' - classpath 'io.joynr.tools.generator:joynr-generator-gradle-plugin:1.24.0' + classpath 'io.joynr.tools.generator:joynr-generator-gradle-plugin:1.25.0' } } diff --git a/android/libjoynr-android-integration-tests/test-radio-provider/app/build.gradle b/android/libjoynr-android-integration-tests/test-radio-provider/app/build.gradle index c26105d45a..1d672ac062 100644 --- a/android/libjoynr-android-integration-tests/test-radio-provider/app/build.gradle +++ b/android/libjoynr-android-integration-tests/test-radio-provider/app/build.gradle @@ -26,7 +26,7 @@ android { } ext { - joynr_version = '1.24.0' + joynr_version = '1.25.0' } dependencies { diff --git a/android/libjoynr-android-integration-tests/test-radio-provider/build.gradle b/android/libjoynr-android-integration-tests/test-radio-provider/build.gradle index 3bebea9dbc..f2fb8dce2b 100644 --- a/android/libjoynr-android-integration-tests/test-radio-provider/build.gradle +++ b/android/libjoynr-android-integration-tests/test-radio-provider/build.gradle @@ -10,7 +10,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.5.0' - classpath 'io.joynr.tools.generator:joynr-generator-gradle-plugin:1.24.0' + classpath 'io.joynr.tools.generator:joynr-generator-gradle-plugin:1.25.0' } } diff --git a/android/libjoynr-android-websocket-runtime/README.md b/android/libjoynr-android-websocket-runtime/README.md index a1918287c2..590100e127 100644 --- a/android/libjoynr-android-websocket-runtime/README.md +++ b/android/libjoynr-android-websocket-runtime/README.md @@ -23,7 +23,7 @@ and thus it's necessary to configure joynr libraries to use the provided **no_ao Add this line to build.gradle file and verify if you have mavenLocal() under your maven repositories list. -`implementation 'io.joynr.android:libjoynr-android-websocket-runtime:1.24.0'` +`implementation 'io.joynr.android:libjoynr-android-websocket-runtime:1.25.0'` ## Logging diff --git a/android/libjoynr-android-websocket-runtime/build.gradle b/android/libjoynr-android-websocket-runtime/build.gradle index 568f63f907..56070a0ce2 100644 --- a/android/libjoynr-android-websocket-runtime/build.gradle +++ b/android/libjoynr-android-websocket-runtime/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'maven-publish' apply plugin: 'maven' group = 'io.joynr.android' -version = '1.24.0' +version = '1.25.0' buildscript { repositories { diff --git a/android/libjoynr-android-websocket-runtime/pom.xml b/android/libjoynr-android-websocket-runtime/pom.xml index 4dea85c0d5..e3e2eb9375 100644 --- a/android/libjoynr-android-websocket-runtime/pom.xml +++ b/android/libjoynr-android-websocket-runtime/pom.xml @@ -26,7 +26,7 @@ io.joynr android - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/pom.xml b/android/pom.xml index 78305edf68..cb42d263da 100644 --- a/android/pom.xml +++ b/android/pom.xml @@ -26,7 +26,7 @@ io.joynr joynr - 1.24.0 + 1.25.0 ../pom.xml diff --git a/android/slf4j-android-bindings/build.gradle b/android/slf4j-android-bindings/build.gradle index 02f03e3c18..0380e5cade 100644 --- a/android/slf4j-android-bindings/build.gradle +++ b/android/slf4j-android-bindings/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - joynrVersion = "1.24.0" + joynrVersion = "1.25.0" } repositories { google() @@ -54,7 +54,7 @@ dependencies { } group = 'io.joynr.android' -version = '1.24.0' +version = '1.25.0' task androidSourcesJar(type: Jar) { classifier = 'sources' diff --git a/android/slf4j-android-bindings/pom.xml b/android/slf4j-android-bindings/pom.xml index 66a0d0e163..5e3cc57169 100644 --- a/android/slf4j-android-bindings/pom.xml +++ b/android/slf4j-android-bindings/pom.xml @@ -27,7 +27,7 @@ io.joynr android - 1.24.0 + 1.25.0 ../pom.xml diff --git a/basemodel/pom.xml b/basemodel/pom.xml index 9f5d234d01..e4d6f2549d 100644 --- a/basemodel/pom.xml +++ b/basemodel/pom.xml @@ -25,7 +25,7 @@ io.joynr dependency-lock - 1.24.0 + 1.25.0 ../dependency-lock/pom.xml diff --git a/cpp/CMake/AddGtestGmock.cmake b/cpp/CMake/AddGtestGmock.cmake index 1c96cfd78f..c5dee6bd66 100644 --- a/cpp/CMake/AddGtestGmock.cmake +++ b/cpp/CMake/AddGtestGmock.cmake @@ -145,7 +145,8 @@ function(RegisterToCtest TARGET ${ARGN}) ) gtest_discover_tests(${TARGET} - WORKING_DIRECTORY ${output_directory} + PROPERTIES TEST_DISCOVERY_TIMEOUT 600 + WORKING_DIRECTORY ${output_directory} ) endfunction(RegisterToCtest) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 93154ac0e5..a91fb13756 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.10) -project(Joynr VERSION 1.24.0 LANGUAGES CXX) +project(Joynr VERSION 1.25.0 LANGUAGES CXX) message(STATUS "-----------------------------------------------------") message(STATUS "- PROJECT: Joynr ${Joynr_VERSION}") message(STATUS "-----------------------------------------------------") diff --git a/cpp/JoynrConfig.cmake.in b/cpp/JoynrConfig.cmake.in index 945d1a4ec6..4bd4813acc 100644 --- a/cpp/JoynrConfig.cmake.in +++ b/cpp/JoynrConfig.cmake.in @@ -3,7 +3,7 @@ set(JOYNR_SUPPORT_WEBSOCKET @JOYNR_SUPPORT_WEBSOCKET@) set(JOYNR_SUPPORT_UDS @JOYNR_SUPPORT_UDS@) include(CMakeFindDependencyMacro) -include(FindPkgConfig) +find_package(PkgConfig) set(Boost_FOUND False) find_dependency(Boost @JOYNR_BOOST_REQUIRED_VERSION@ REQUIRED diff --git a/cpp/distribution/joynr.spec b/cpp/distribution/joynr.spec index 57717595dd..4e2c127cf2 100644 --- a/cpp/distribution/joynr.spec +++ b/cpp/distribution/joynr.spec @@ -2,7 +2,7 @@ BuildRoot: /data/build/joynr/package/RPM/joynr Summary: joynr base package including executables, libraries and default settings Name: joynr -Version: 1.24.0 +Version: 1.25.0 Release: 1 License: Apache License, Version 2.0 Group: unknown diff --git a/cpp/libjoynr/basemodel/include/joynr/AbstractJoynrProvider.h b/cpp/libjoynr/basemodel/include/joynr/AbstractJoynrProvider.h index e075a5d19e..1b883bd0d9 100644 --- a/cpp/libjoynr/basemodel/include/joynr/AbstractJoynrProvider.h +++ b/cpp/libjoynr/basemodel/include/joynr/AbstractJoynrProvider.h @@ -101,6 +101,15 @@ class JOYNR_EXPORT AbstractJoynrProvider : public virtual IJoynrProvider const std::string& broadcastName, std::shared_ptr broadcastListener) override; + /** + * @brief Unregister and delete a listener for multicast broadcasts + * @param broadcastName The name of the broadcast for which publications shall be done + * @param broadcastListener The listener object containing the callbacks for publications and + * failures + */ + void unregisterBroadcastListener( + std::shared_ptr broadcastListener) override; + protected: /** * @brief Called by subclasses when the value of an attribute changes diff --git a/cpp/libjoynr/basemodel/provider/AbstractJoynrProvider.cpp b/cpp/libjoynr/basemodel/provider/AbstractJoynrProvider.cpp index b2a9a36c6c..047baae7bc 100644 --- a/cpp/libjoynr/basemodel/provider/AbstractJoynrProvider.cpp +++ b/cpp/libjoynr/basemodel/provider/AbstractJoynrProvider.cpp @@ -97,6 +97,17 @@ void AbstractJoynrProvider::unregisterBroadcastListener( } } +void AbstractJoynrProvider::unregisterBroadcastListener( + std::shared_ptr broadcastListener) +{ + WriteLocker locker(_lockBroadcastListeners); + auto listenerIt = + std::find(_broadcastListeners.cbegin(), _broadcastListeners.cend(), broadcastListener); + if (listenerIt != _broadcastListeners.cend()) { + _broadcastListeners.erase(listenerIt); + } +} + const CallContext& AbstractJoynrProvider::getCallContext() const { return CallContextStorage::get(); diff --git a/cpp/libjoynr/basemodel/subscription/SubscriptionManager.cpp b/cpp/libjoynr/basemodel/subscription/SubscriptionManager.cpp index d28ce26a82..a908503299 100644 --- a/cpp/libjoynr/basemodel/subscription/SubscriptionManager.cpp +++ b/cpp/libjoynr/basemodel/subscription/SubscriptionManager.cpp @@ -191,6 +191,13 @@ void SubscriptionManager::registerSubscription( _multicastSubscribersMutex); std::string subscriptionId = subscriptionRequest.getSubscriptionId(); + JOYNR_LOG_DEBUG(logger(), + "MulticastSubscription: subscriptionId: {}, " + "proxy participantId: {}, provider participantId: {}", + subscriptionId, + subscriberParticipantId, + providerParticipantId); + // remove pre-exisiting multicast subscription if (_subscriptions.contains(subscriptionId)) { std::shared_ptr subscription(_subscriptions.value(subscriptionId)); diff --git a/cpp/libjoynr/capabilities/include/joynr/CapabilitiesRegistrar.h b/cpp/libjoynr/capabilities/include/joynr/CapabilitiesRegistrar.h index adf00fdcc4..ce2bbbb22d 100644 --- a/cpp/libjoynr/capabilities/include/joynr/CapabilitiesRegistrar.h +++ b/cpp/libjoynr/capabilities/include/joynr/CapabilitiesRegistrar.h @@ -93,8 +93,9 @@ class JOYNR_EXPORT CapabilitiesRegistrar const std::string participantId = _participantIdStorage->getProviderParticipantId( domain, interfaceName, T::MAJOR_VERSION); std::shared_ptr caller = RequestCallerFactory::create(provider); - provider->registerBroadcastListener( - std::make_shared(participantId, _publicationManager)); + auto multicastBroadcastListener = + std::make_shared(participantId, _publicationManager); + provider->registerBroadcastListener(multicastBroadcastListener); const std::int64_t now = std::chrono::duration_cast( std::chrono::system_clock::now().time_since_epoch()) @@ -119,14 +120,18 @@ class JOYNR_EXPORT CapabilitiesRegistrar discoveryEntryExpiryDateMs, defaultPublicKeyId); bool isGloballyVisible = providerQos.getScope() == types::ProviderScope::GLOBAL; - + auto onErrorWrapper = [provider, multicastBroadcastListener, onError = std::move(onError)]( + const joynr::exceptions::JoynrRuntimeException& error) { + provider->unregisterBroadcastListener(multicastBroadcastListener); + onError(error); + }; for (auto&& gbid : gbids) { if (gbid.empty()) { - onError(joynr::exceptions::JoynrRuntimeException("gbid(s) must not be empty")); + onErrorWrapper( + joynr::exceptions::JoynrRuntimeException("gbid(s) must not be empty")); return participantId; } } - // dispatcher is captured here to avoid compilation problem with gcc 7.x auto onSuccessWrapper = [domain, interfaceName, @@ -140,7 +145,7 @@ class JOYNR_EXPORT CapabilitiesRegistrar entry = std::move(entry), awaitGlobalRegistration, onSuccess = std::move(onSuccess), - onError, + onErrorWrapper, persist, isInternalProvider, addToAll, @@ -153,25 +158,26 @@ class JOYNR_EXPORT CapabilitiesRegistrar } } - auto onErrorWrapper = [participantId, - messageRouter = std::move(messageRouter), - onError = std::move(onError)]( - const joynr::exceptions::JoynrRuntimeException& error) { - if (auto ptr = messageRouter.lock()) { - ptr->removeNextHop(participantId); - } - onError(error); - }; + auto onErrorWrapperInternal = + [participantId, + messageRouter = std::move(messageRouter), + onErrorWrapper = std::move(onErrorWrapper)]( + const joynr::exceptions::JoynrRuntimeException& error) { + if (auto ptr = messageRouter.lock()) { + ptr->removeNextHop(participantId); + } + onErrorWrapper(error); + }; - auto onApplicationErrorWrapper = + auto onApplicationErrorWrapperInternal = [participantId, messageRouter = std::move(messageRouter), - onError = std::move(onError)]( + onErrorWrapper = std::move(onErrorWrapper)]( const joynr::types::DiscoveryError::Enum& errorEnum) { if (auto ptr = messageRouter.lock()) { ptr->removeNextHop(participantId); } - onError(joynr::exceptions::JoynrRuntimeException( + onErrorWrapper(joynr::exceptions::JoynrRuntimeException( "Registration failed with DiscoveryError " + joynr::types::DiscoveryError::getLiteral(errorEnum))); }; @@ -194,8 +200,8 @@ class JOYNR_EXPORT CapabilitiesRegistrar interfaceName); onSuccess(); }, - std::move(onApplicationErrorWrapper), - std::move(onErrorWrapper), + std::move(onApplicationErrorWrapperInternal), + std::move(onErrorWrapperInternal), messagingQos); } else { discoveryProxyPtr->addAsync( @@ -212,8 +218,8 @@ class JOYNR_EXPORT CapabilitiesRegistrar interfaceName); onSuccess(); }, - std::move(onApplicationErrorWrapper), - std::move(onErrorWrapper), + std::move(onApplicationErrorWrapperInternal), + std::move(onErrorWrapperInternal), messagingQos); } } else { @@ -231,8 +237,8 @@ class JOYNR_EXPORT CapabilitiesRegistrar interfaceName); onSuccess(); }, - std::move(onApplicationErrorWrapper), - std::move(onErrorWrapper)); + std::move(onApplicationErrorWrapperInternal), + std::move(onErrorWrapperInternal)); } else { discoveryProxyPtr->addAsync( entry, @@ -248,14 +254,14 @@ class JOYNR_EXPORT CapabilitiesRegistrar interfaceName); onSuccess(); }, - std::move(onApplicationErrorWrapper), - std::move(onErrorWrapper)); + std::move(onApplicationErrorWrapperInternal), + std::move(onErrorWrapperInternal)); } } } else { const joynr::exceptions::JoynrRuntimeException error( "runtime and required discovery proxy have been already destroyed"); - onErrorWrapper(error); + onErrorWrapperInternal(error); } }; @@ -269,7 +275,7 @@ class JOYNR_EXPORT CapabilitiesRegistrar expiryDateMs, isSticky, std::move(onSuccessWrapper), - std::move(onError)); + std::move(onErrorWrapper)); return participantId; } diff --git a/cpp/libjoynr/interface/include/joynr/IJoynrProvider.h b/cpp/libjoynr/interface/include/joynr/IJoynrProvider.h index 76cd869b12..88f5625d67 100644 --- a/cpp/libjoynr/interface/include/joynr/IJoynrProvider.h +++ b/cpp/libjoynr/interface/include/joynr/IJoynrProvider.h @@ -86,6 +86,14 @@ class IJoynrProvider virtual void unregisterBroadcastListener( const std::string& broadcastName, std::shared_ptr broadcastListener) = 0; + /** + * @brief Unregister and delete a listener for multicast broadcasts + * @param broadcastName The name of the broadcast for which publications shall be done + * @param broadcastListener The listener object containing the callbacks for publications and + * failures + */ + virtual void unregisterBroadcastListener( + std::shared_ptr broadcastListener) = 0; /** * @brief Gets the interface name diff --git a/cpp/libjoynr/interface/include/joynr/IMessageSender.h b/cpp/libjoynr/interface/include/joynr/IMessageSender.h index c3af501482..10e506d9a9 100644 --- a/cpp/libjoynr/interface/include/joynr/IMessageSender.h +++ b/cpp/libjoynr/interface/include/joynr/IMessageSender.h @@ -117,13 +117,6 @@ class IMessageSender : public IPublicationSender const BroadcastSubscriptionRequest& subscriptionRequest, bool isLocalMessage) = 0; - virtual void sendMulticastSubscriptionRequest( - const std::string& senderParticipantId, - const std::string& receiverParticipantId, - const MessagingQos& qos, - const MulticastSubscriptionRequest& subscriptionRequest, - bool isLocalMessage) = 0; - virtual void sendSubscriptionStop(const std::string& senderParticipantId, const std::string& receiverParticipantId, const MessagingQos& qos, diff --git a/cpp/libjoynr/joynr-messaging/AbstractMessageRouter.cpp b/cpp/libjoynr/joynr-messaging/AbstractMessageRouter.cpp index a46f018f1f..30021bc3a3 100644 --- a/cpp/libjoynr/joynr-messaging/AbstractMessageRouter.cpp +++ b/cpp/libjoynr/joynr-messaging/AbstractMessageRouter.cpp @@ -119,9 +119,6 @@ void AbstractMessageRouter::shutdown() _messageQueueCleanerTimer.cancel(); _routingTableCleanerTimer.cancel(); _messageScheduler->shutdown(); - if (_messagingStubFactory) { - _messagingStubFactory->shutdown(); - } } void AbstractMessageRouter::addProvisionedNextHop( diff --git a/cpp/libjoynr/joynr-messaging/MessageSender.cpp b/cpp/libjoynr/joynr-messaging/MessageSender.cpp index 60378a9c53..7e56c59fcc 100644 --- a/cpp/libjoynr/joynr-messaging/MessageSender.cpp +++ b/cpp/libjoynr/joynr-messaging/MessageSender.cpp @@ -209,33 +209,6 @@ void MessageSender::sendBroadcastSubscriptionRequest( } } -void MessageSender::sendMulticastSubscriptionRequest( - const std::string& senderParticipantId, - const std::string& receiverParticipantId, - const MessagingQos& qos, - const MulticastSubscriptionRequest& subscriptionRequest, - bool isLocalMessage) -{ - std::ignore = isLocalMessage; - - try { - // MulticastSubscriptionRequest is no longer transmitted, instead - // the SubscriptionReply formerly sent by provider is simulated and - // routed back to invoke regular reply handling as before. - JOYNR_LOG_DEBUG(logger(), - "MulticastSubscription: subscriptionId: {}, " - "proxy participantId: {}, provider participantId: {}", - subscriptionRequest.getSubscriptionId(), - senderParticipantId, - receiverParticipantId); - SubscriptionReply subscriptionReply; - subscriptionReply.setSubscriptionId(subscriptionRequest.getSubscriptionId()); - sendSubscriptionReply(receiverParticipantId, senderParticipantId, qos, subscriptionReply); - } catch (const std::invalid_argument& exception) { - throw joynr::exceptions::MethodInvocationException(exception.what()); - } -} - void MessageSender::sendSubscriptionReply(const std::string& senderParticipantId, const std::string& receiverParticipantId, const MessagingQos& qos, diff --git a/cpp/libjoynr/joynr-messaging/MessagingSettings.cpp b/cpp/libjoynr/joynr-messaging/MessagingSettings.cpp index f1f873d04f..c06e55e1bd 100644 --- a/cpp/libjoynr/joynr-messaging/MessagingSettings.cpp +++ b/cpp/libjoynr/joynr-messaging/MessagingSettings.cpp @@ -105,6 +105,12 @@ const std::string& MessagingSettings::SETTING_MQTT_KEEP_ALIVE_TIME_SECONDS() return value; } +const std::string& MessagingSettings::SETTING_MQTT_RETAIN() +{ + static const std::string value("messaging/mqtt-retain"); + return value; +} + std::chrono::seconds MessagingSettings::DEFAULT_MQTT_KEEP_ALIVE_TIME_SECONDS() { static const std::chrono::seconds value(60); @@ -370,6 +376,16 @@ void MessagingSettings::setMqttKeepAliveTimeSeconds(std::chrono::seconds mqttKee _settings.set(SETTING_MQTT_KEEP_ALIVE_TIME_SECONDS(), mqttKeepAliveTimeSeconds.count()); } +bool MessagingSettings::getMqttRetain() const +{ + return _settings.get(SETTING_MQTT_RETAIN()); +} + +void MessagingSettings::setMqttRetain(const bool& retainStatus) +{ + _settings.set(SETTING_MQTT_RETAIN(), retainStatus); +} + std::chrono::seconds MessagingSettings::getMqttReconnectDelayTimeSeconds() const { return std::chrono::seconds( diff --git a/cpp/libjoynr/joynr-messaging/include/joynr/MessageSender.h b/cpp/libjoynr/joynr-messaging/include/joynr/MessageSender.h index bb9082aeeb..2f13483e81 100644 --- a/cpp/libjoynr/joynr-messaging/include/joynr/MessageSender.h +++ b/cpp/libjoynr/joynr-messaging/include/joynr/MessageSender.h @@ -124,12 +124,6 @@ class JOYNR_EXPORT MessageSender : public IMessageSender const BroadcastSubscriptionRequest& subscriptionRequest, bool isLocalMessage) override; - void sendMulticastSubscriptionRequest(const std::string& senderParticipantId, - const std::string& receiverParticipantId, - const MessagingQos& qos, - const MulticastSubscriptionRequest& subscriptionRequest, - bool isLocalMessage) override; - void sendSubscriptionReply(const std::string& senderParticipantId, const std::string& receiverParticipantId, const MessagingQos& qos, diff --git a/cpp/libjoynr/joynr-messaging/include/joynr/MessagingSettings.h b/cpp/libjoynr/joynr-messaging/include/joynr/MessagingSettings.h index fe1d7805a6..c4a160dc11 100644 --- a/cpp/libjoynr/joynr-messaging/include/joynr/MessagingSettings.h +++ b/cpp/libjoynr/joynr-messaging/include/joynr/MessagingSettings.h @@ -50,6 +50,7 @@ class JOYNR_EXPORT MessagingSettings static const std::string& SETTING_CAPABILITIES_DIRECTORY_CHANNELID(); static const std::string& SETTING_CAPABILITIES_DIRECTORY_PARTICIPANTID(); static const std::string& SETTING_MQTT_KEEP_ALIVE_TIME_SECONDS(); + static const std::string& SETTING_MQTT_RETAIN(); static const std::string& SETTING_MQTT_RECONNECT_DELAY_TIME_SECONDS(); static const std::string& SETTING_MQTT_RECONNECT_MAX_DELAY(); static const std::string& SETTING_MQTT_EXPONENTIAL_BACKOFF_ENABLED(); @@ -121,6 +122,8 @@ class JOYNR_EXPORT MessagingSettings std::chrono::seconds getMqttKeepAliveTimeSeconds() const; void setMqttKeepAliveTimeSeconds(std::chrono::seconds mqttKeepAliveTimeSeconds); + bool getMqttRetain() const; + void setMqttRetain(const bool& retainStatus); std::chrono::seconds getMqttReconnectDelayTimeSeconds() const; void setMqttReconnectDelayTimeSeconds(std::chrono::seconds mqttReconnectDelayTimeSeconds); std::chrono::seconds getMqttReconnectMaxDelayTimeSeconds() const; diff --git a/cpp/libjoynr/pom.xml b/cpp/libjoynr/pom.xml index 47161505fe..8e16105faf 100644 --- a/cpp/libjoynr/pom.xml +++ b/cpp/libjoynr/pom.xml @@ -26,7 +26,7 @@ io.joynr cpp - 1.24.0 + 1.25.0 ../pom.xml diff --git a/cpp/libjoynr/util/include/joynr/Util.h b/cpp/libjoynr/util/include/joynr/Util.h index f3cc502676..70036d112b 100644 --- a/cpp/libjoynr/util/include/joynr/Util.h +++ b/cpp/libjoynr/util/include/joynr/Util.h @@ -38,6 +38,8 @@ #include #include +#include "joynr/Logger.h" + namespace joynr { @@ -155,8 +157,8 @@ template