Skip to content

Commit

Permalink
Merge branch 'bmwcarit:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@ceciliahwang
ceciliahwang authored Sep 3, 2024
2 parents 045f1a9 + 461d07e commit 8a8d7cc
Show file tree
Hide file tree
Showing 474 changed files with 7,683 additions and 4,649 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.24.0'
joynr_version = '1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.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.24.0</version>
<version>1.25.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Loading

0 comments on commit 8a8d7cc

Please sign in to comment.