Skip to content

Commit

Permalink
Merge pull request #1459 from joynr/release_1_22_0
Browse files Browse the repository at this point in the history 
Release 1.22.0

Reviewed-by: guidoostkamppartner <[email protected]>
Reviewed-by: thomasreuterpartner <[email protected]>
Reviewed-by: mateuszszumilaspartner
  • Loading branch information
zuul[bot] authored and GitHub Enterprise committed Feb 20, 2023
2 parents 2586748 + 6741486 commit 77c61b8
Show file tree
Hide file tree
Showing 167 changed files with 254 additions and 197 deletions.
2 changes: 1 addition & 1 deletion android/clustercontroller-android-standalone/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ android {
}

ext {
joynr_version = '1.22.0-SNAPSHOT'
joynr_version = '1.22.0'
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/common/access-control-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>common</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/common/discovery-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>common</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/common/guice-integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>common</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/common/infrastructure-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>common</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>dependency-lock</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/common/status-metrics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>common</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/core/clustercontroller/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>core</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/core/libjoynr-websocket-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>core</artifactId>
<groupId>io.joynr.android</groupId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/core/libjoynr/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>core</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>dependency-lock</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/javaapi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>dependency-lock</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/messaging/messaging-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>messaging</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/messaging/mqtt/hivemq-mqtt-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>io.joynr.android.messaging</groupId>
<artifactId>mqtt</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/messaging/mqtt/joynr-mqtt-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>io.joynr.android.messaging</groupId>
<artifactId>mqtt</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/messaging/mqtt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>messaging</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/messaging/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>dependency-lock</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/messaging/websocket/joynr-websocket-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>io.joynr.android.messaging</groupId>
<artifactId>websocket</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/messaging/websocket/joynr-websocket-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.android.messaging</groupId>
<artifactId>websocket</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/messaging/websocket/joynr-websocket-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>io.joynr.android.messaging</groupId>
<artifactId>websocket</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/messaging/websocket/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>messaging</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/dependency-lock/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>android</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/examples/android-hello-world-binder/android-hello-world-binder-consumer/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
buildscript {
ext {
kotlin_version = '1.3.61'
joynr_version = '1.22.0-SNAPSHOT'
joynr_version = '1.22.0'
}
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion android/examples/android-hello-world-binder/android-hello-world-binder-consumer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>io.joynr.examples</groupId>
<artifactId>android-hello-world-binder</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/examples/android-hello-world-binder/android-hello-world-binder-provider/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
buildscript {
ext {
kotlin_version = '1.3.61'
joynr_version = "1.22.0-SNAPSHOT"
joynr_version = "1.22.0"
}
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion android/examples/android-hello-world-binder/android-hello-world-binder-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>io.joynr.examples</groupId>
<artifactId>android-hello-world-binder</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/examples/android-hello-world-binder/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>examples</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/examples/android-hello-world/android-hello-world-consumer/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

buildscript {
ext {
joynrVersion = "1.22.0-SNAPSHOT"
joynrVersion = "1.22.0"
}
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion android/examples/android-hello-world/android-hello-world-consumer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>io.joynr.examples</groupId>
<artifactId>android-hello-world</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/examples/android-hello-world/android-hello-world-provider/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

buildscript {
ext {
joynrVersion = "1.22.0-SNAPSHOT"
joynrVersion = "1.22.0"
}
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion android/examples/android-hello-world/android-hello-world-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>io.joynr.examples</groupId>
<artifactId>android-hello-world</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/examples/android-hello-world/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>io.joynr.android</groupId>
<artifactId>examples</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>android</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/joynr-android-binder-runtime/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ apply plugin: 'maven-publish'
apply plugin: 'maven'

group = 'io.joynr.android'
version = '1.22.0-SNAPSHOT'
version = '1.22.0'

buildscript {
repositories {
Expand Down
2 changes: 1 addition & 1 deletion android/joynr-android-binder-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>android</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/libjoynr-android-integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>android</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/libjoynr-android-integration-tests/test-radio-consumer/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ android {
}

ext {
joynr_version = '1.22.0-SNAPSHOT'
joynr_version = '1.22.0'
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion android/libjoynr-android-integration-tests/test-radio-consumer/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.22.0-SNAPSHOT'
classpath 'io.joynr.tools.generator:joynr-generator-gradle-plugin:1.22.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/libjoynr-android-integration-tests/test-radio-provider/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
}

ext {
joynr_version = '1.22.0-SNAPSHOT'
joynr_version = '1.22.0'
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion android/libjoynr-android-integration-tests/test-radio-provider/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.22.0-SNAPSHOT'
classpath 'io.joynr.tools.generator:joynr-generator-gradle-plugin:1.22.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/libjoynr-android-websocket-runtime/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.22.0-SNAPSHOT'`
`implementation 'io.joynr.android:libjoynr-android-websocket-runtime:1.22.0'`

## Logging

Expand Down
2 changes: 1 addition & 1 deletion android/libjoynr-android-websocket-runtime/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ apply plugin: 'maven-publish'
apply plugin: 'maven'

group = 'io.joynr.android'
version = '1.22.0-SNAPSHOT'
version = '1.22.0'

buildscript {
repositories {
Expand Down
2 changes: 1 addition & 1 deletion android/libjoynr-android-websocket-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>android</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>joynr</artifactId>
<version>1.22.0-SNAPSHOT</version>
<version>1.22.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Loading

0 comments on commit 77c61b8

Please sign in to comment.