Skip to content

Commit

Permalink
Merge pull request #1303 from joynr/release_1_21_3
Browse files Browse the repository at this point in the history
Release 1.21.3

Reviewed-by: guidoostkamppartner <Guido.Ostkamp@partner.bmw.de>
  • Loading branch information
zuul[bot] authored and GitHub Enterprise committed Sep 1, 2022
2 parents 3abe9e8 + 83487c4 commit 4a2b33d
Show file tree
Hide file tree
Showing 145 changed files with 200 additions and 151 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ android {
}

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

dependencies {
Expand Down
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.21.3-SNAPSHOT'
joynr_version = '1.21.3'
}
repositories {
google()
Expand Down
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.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
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.21.3-SNAPSHOT"
joynr_version = "1.21.3"
}
repositories {
google()
Expand Down
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.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/examples/android-hello-world-binder/pom.xml
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.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

buildscript {
ext {
joynrVersion = "1.21.3-SNAPSHOT"
joynrVersion = "1.21.3"
}
repositories {
google()
Expand Down
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.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

buildscript {
ext {
joynrVersion = "1.21.3-SNAPSHOT"
joynrVersion = "1.21.3"
}
repositories {
google()
Expand Down
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.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/examples/android-hello-world/pom.xml
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.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/examples/pom.xml
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.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/joynr-android-binder-runtime/build.gradle
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.21.3-SNAPSHOT'
version = '1.21.3'

buildscript {
repositories {
Expand Down
2 changes: 1 addition & 1 deletion android/joynr-android-binder-runtime/pom.xml
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.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/libjoynr-android-integration-tests/pom.xml
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.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ android {
}

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

dependencies {
Expand Down
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.21.3-SNAPSHOT'
classpath 'io.joynr.tools.generator:joynr-generator-gradle-plugin:1.21.3'
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
}

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

dependencies {
Expand Down
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.21.3-SNAPSHOT'
classpath 'io.joynr.tools.generator:joynr-generator-gradle-plugin:1.21.3'
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/libjoynr-android-websocket-runtime/README.md
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.21.3-SNAPSHOT'`
`implementation 'io.joynr.android:libjoynr-android-websocket-runtime:1.21.3'`

## Logging

Expand Down
2 changes: 1 addition & 1 deletion android/libjoynr-android-websocket-runtime/build.gradle
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.21.3-SNAPSHOT'
version = '1.21.3'

buildscript {
repositories {
Expand Down
2 changes: 1 addition & 1 deletion android/libjoynr-android-websocket-runtime/pom.xml
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.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion android/pom.xml
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.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions android/slf4j-android-bindings/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
joynrVersion = "1.21.3-SNAPSHOT"
joynrVersion = "1.21.3"
}
repositories {
google()
Expand Down Expand Up @@ -54,7 +54,7 @@ dependencies {
}

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

task androidSourcesJar(type: Jar) {
classifier = 'sources'
Expand Down
2 changes: 1 addition & 1 deletion android/slf4j-android-bindings/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>android</artifactId>
<version>1.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion basemodel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>dependency-lock</artifactId>
<version>1.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../dependency-lock/pom.xml</relativePath>
</parent>
<profiles>
Expand Down
2 changes: 1 addition & 1 deletion cpp/libjoynr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>cpp</artifactId>
<version>1.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion examples/custom-headers/custom-headers-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<parent>
<groupId>io.joynr.examples</groupId>
<artifactId>custom-headers</artifactId>
<version>1.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.examples</groupId>
<artifactId>custom-headers</artifactId>
<version>1.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr.examples</groupId>
<artifactId>custom-headers</artifactId>
<version>1.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions examples/hello-world/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
<groupId>io.joynr</groupId>
<artifactId>hello-world-parent</artifactId>
<packaging>pom</packaging>
<version>1.21.3-SNAPSHOT</version>
<version>1.21.3</version>

<modules>
<module>interface</module>
<module>java</module>
</modules>

<properties>
<joynr.version>1.21.3-SNAPSHOT</joynr.version>
<joynr.version>1.21.3</joynr.version>
</properties>

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion examples/radio-jee/radio-jee-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<parent>
<groupId>io.joynr.examples</groupId>
<artifactId>radio-jee</artifactId>
<version>1.21.3-SNAPSHOT</version>
<version>1.21.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

Expand Down

0 comments on commit 4a2b33d

Please sign in to comment.