Merge pull request #1619 from joynr/payara-update

Payara update This branch contains rebased commits from java-guice-version-update. Commits resolving merge conflicts have been removed, conflicts have been resolved. This should provide a branch which is easier to work with. However, bear in mind, that these commits are not ready yet, as some files are edited in wrong commits. Reviewed-by: szymondabrowskipartner <szymon.dabrowski@partner.bmw.de> Reviewed-by: dmytrobaranovpartner <dmytro.baranov@partner.bmw.de> Reviewed-by: vukvojtapartner <vuk.vojta@partner.bmw.de>
bmwcarit · Jan 13, 2025 · 26c0adf · 26c0adf
2 parents eade594 + a6408f5
commit 26c0adf
Show file tree

Hide file tree

Showing 236 changed files with 2,283 additions and 1,052 deletions.
diff --git a/android/dependency-lock/core/clustercontroller/pom.xml b/android/dependency-lock/core/clustercontroller/pom.xml
@@ -1,7 +1,7 @@
 <!--
   #%L
   %%
-  Copyright (C) 2022 BMW Car IT GmbH
+  Copyright (C) 2025 BMW Car IT GmbH
   %%
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -80,10 +80,6 @@
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>

diff --git a/android/dependency-lock/core/libjoynr/pom.xml b/android/dependency-lock/core/libjoynr/pom.xml
@@ -1,7 +1,7 @@
 <!--
   #%L
   %%
-  Copyright (C) 2022 BMW Car IT GmbH
+  Copyright (C) 2025 BMW Car IT GmbH
   %%
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -42,6 +42,12 @@
 			<groupId>io.joynr.android</groupId>
 			<artifactId>javaapi</artifactId>
 			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>jakarta.inject</groupId>
+					<artifactId>jakarta.inject-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.joynr.android.common</groupId>
@@ -71,10 +77,6 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
@@ -120,6 +122,10 @@
 			<artifactId>log4j-api</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.inject</groupId>
+			<artifactId>jakarta.inject-api</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -201,6 +207,7 @@
 									<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
 									<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
 									<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-api</ignoredUnusedDeclaredDependency>
+									<ignoredUnusedDeclaredDependency>jakarta.inject:jakarta.inject-api</ignoredUnusedDeclaredDependency>
 								</ignoredUnusedDeclaredDependencies>
 							</configuration>
 						</execution>

diff --git a/android/dependency-lock/javaapi/pom.xml b/android/dependency-lock/javaapi/pom.xml
@@ -1,7 +1,7 @@
 <!--
   #%L
   %%
-  Copyright (C) 2022 BMW Car IT GmbH
+  Copyright (C) 2025 BMW Car IT GmbH
   %%
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -68,14 +68,14 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.inject</groupId>
+			<artifactId>jakarta.inject-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -115,6 +115,7 @@
 									<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
 									<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
 									<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-api</ignoredUnusedDeclaredDependency>
+									<ignoredUnusedDeclaredDependency>jakarta.inject:jakarta.inject-api</ignoredUnusedDeclaredDependency>
 								</ignoredUnusedDeclaredDependencies>
 							</configuration>
 						</execution>

diff --git a/android/dependency-lock/messaging/messaging-common/pom.xml b/android/dependency-lock/messaging/messaging-common/pom.xml
@@ -1,7 +1,7 @@
 <!--
   #%L
   %%
-  Copyright (C) 2022 BMW Car IT GmbH
+  Copyright (C) 2025 BMW Car IT GmbH
   %%
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -71,10 +71,6 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest</artifactId>

diff --git a/android/dependency-lock/messaging/mqtt/hivemq-mqtt-client/pom.xml b/android/dependency-lock/messaging/mqtt/hivemq-mqtt-client/pom.xml
@@ -1,7 +1,7 @@
 <!--
   #%L
   %%
-  Copyright (C) 2022 BMW Car IT GmbH
+  Copyright (C) 2025 BMW Car IT GmbH
   %%
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -61,6 +61,10 @@
 			<groupId>com.hivemq</groupId>
 			<artifactId>hivemq-mqtt-client</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.platform</groupId>
+			<artifactId>jakarta.jakartaee-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
@@ -100,6 +104,7 @@
 									<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
 									<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
 									<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-api</ignoredUnusedDeclaredDependency>
+									<ignoredUnusedDeclaredDependency>jakarta.platform:jakarta.jakartaee-api</ignoredUnusedDeclaredDependency>
 								</ignoredUnusedDeclaredDependencies>
 							</configuration>
 						</execution>

diff --git a/android/dependency-lock/messaging/mqtt/joynr-mqtt-client/pom.xml b/android/dependency-lock/messaging/mqtt/joynr-mqtt-client/pom.xml
@@ -1,7 +1,7 @@
 <!--
   #%L
   %%
-  Copyright (C) 2022 BMW Car IT GmbH
+  Copyright (C) 2025 BMW Car IT GmbH
   %%
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -61,10 +61,6 @@
 			<groupId>com.hivemq</groupId>
 			<artifactId>hivemq-mqtt-client</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>

diff --git a/android/dependency-lock/messaging/websocket/joynr-websocket-common/pom.xml b/android/dependency-lock/messaging/websocket/joynr-websocket-common/pom.xml
@@ -1,7 +1,7 @@
 <!--
   #%L
   %%
-  Copyright (C) 2022 BMW Car IT GmbH
+  Copyright (C) 2025 BMW Car IT GmbH
   %%
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -40,10 +40,6 @@
 			<artifactId>javaapi</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

diff --git a/android/dependency-lock/messaging/websocket/joynr-websocket-server/pom.xml b/android/dependency-lock/messaging/websocket/joynr-websocket-server/pom.xml
@@ -1,7 +1,7 @@
 <!--
   #%L
   %%
-  Copyright (C) 2022 BMW Car IT GmbH
+  Copyright (C) 2025 BMW Car IT GmbH
   %%
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -56,10 +56,6 @@
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlet</artifactId>