From aba565114d8bdee3ceb77fdf513cc4c77650eb4e Mon Sep 17 00:00:00 2001
From: Harry9656 <singharpal9656@gmail.com>
Date: Sat, 13 Jan 2024 19:59:54 +0530
Subject: [PATCH] JAVA-27682: Fix messaging-modules for JDK 17 (#15454)

---
 messaging-modules/apache-rocketmq/pom.xml     |  1 +
 messaging-modules/pom.xml                     |  8 ++--
 messaging-modules/rabbitmq/pom.xml            |  1 +
 .../baeldung/pubsubmq/server/Publisher.java   |  2 +-
 .../spring-apache-camel/README.md             |  2 +-
 messaging-modules/spring-apache-camel/pom.xml | 37 ++-----------------
 messaging-modules/spring-jms/pom.xml          |  1 +
 7 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/messaging-modules/apache-rocketmq/pom.xml b/messaging-modules/apache-rocketmq/pom.xml
index a362644de3..d38c34470f 100644
--- a/messaging-modules/apache-rocketmq/pom.xml
+++ b/messaging-modules/apache-rocketmq/pom.xml
@@ -24,6 +24,7 @@
     <properties>
         <geode.core>1.6.0</geode.core>
         <rocketmq.version>2.0.4</rocketmq.version>
+        <spring-boot.repackage.skip>true</spring-boot.repackage.skip> <!-- to avoid repackaging of the jar -->
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/messaging-modules/pom.xml b/messaging-modules/pom.xml
index f96d57b960..3642eb4260 100644
--- a/messaging-modules/pom.xml
+++ b/messaging-modules/pom.xml
@@ -8,10 +8,10 @@
     <packaging>pom</packaging>
 
     <parent>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
     <modules>
@@ -20,8 +20,8 @@
         <module>jgroups</module>
         <module>rabbitmq</module>
         <module>spring-amqp</module>
-        <!--<module>spring-apache-camel</module> <!- failing after upgrading to jdk17-->
-        <!--<module>spring-jms</module>  <!- failing after upgrading to jdk17-->
+        <module>spring-apache-camel</module>
+        <module>spring-jms</module>
         <module>postgres-notify</module>
     </modules>
 
diff --git a/messaging-modules/rabbitmq/pom.xml b/messaging-modules/rabbitmq/pom.xml
index 2add4b8d35..2ea2700c4a 100644
--- a/messaging-modules/rabbitmq/pom.xml
+++ b/messaging-modules/rabbitmq/pom.xml
@@ -42,6 +42,7 @@
 
     <properties>
         <spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
+        <spring-boot.repackage.skip>true</spring-boot.repackage.skip> <!-- to avoid repackaging of the jar -->
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/messaging-modules/rabbitmq/src/main/java/com/baeldung/pubsubmq/server/Publisher.java b/messaging-modules/rabbitmq/src/main/java/com/baeldung/pubsubmq/server/Publisher.java
index 24c4be0a70..70adc9f1c8 100644
--- a/messaging-modules/rabbitmq/src/main/java/com/baeldung/pubsubmq/server/Publisher.java
+++ b/messaging-modules/rabbitmq/src/main/java/com/baeldung/pubsubmq/server/Publisher.java
@@ -2,7 +2,7 @@ package com.baeldung.pubsubmq.server;
 
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 public class Publisher {
 
diff --git a/messaging-modules/spring-apache-camel/README.md b/messaging-modules/spring-apache-camel/README.md
index d77befc328..9807802fdf 100644
--- a/messaging-modules/spring-apache-camel/README.md
+++ b/messaging-modules/spring-apache-camel/README.md
@@ -14,7 +14,7 @@ This module contains articles about Spring with Apache Camel
 ### Framework Versions:
 
 - Spring 5.3.25
-- Apache Camel 3.21.0
+- Apache Camel 3.22.0
 
 ### Build and Run Application
 
diff --git a/messaging-modules/spring-apache-camel/pom.xml b/messaging-modules/spring-apache-camel/pom.xml
index 8776901469..d867c2f7a0 100644
--- a/messaging-modules/spring-apache-camel/pom.xml
+++ b/messaging-modules/spring-apache-camel/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung.apache.camel</groupId>
     <artifactId>spring-apache-camel</artifactId>
@@ -37,11 +37,6 @@
             <artifactId>camel-stream</artifactId>
             <version>${camel.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel.springboot</groupId>
             <artifactId>camel-servlet-starter</artifactId>
@@ -80,34 +75,10 @@
     </dependencies>
 
     <properties>
-        <spring.version>5.3.25</spring.version>
         <camel.version>4.3.0</camel.version>
         <camel-swagger.version>3.22.0</camel-swagger.version>
+        <junit-jupiter.version>5.10.1</junit-jupiter.version> <!--Version not compatible with the one inherited from parent-->
+        <spring-boot.repackage.skip>true</spring-boot.repackage.skip> <!--Skip repackaging for multiple main classes-->
     </properties>
 
-    <profiles>
-        <profile>
-            <id>spring-boot</id>
-            <build>
-                <defaultGoal>spring-boot:run</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.springframework.boot</groupId>
-                        <artifactId>spring-boot-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>repackage</goal>
-                                </goals>
-                                <configuration>
-                                    <mainClass>com.baeldung.camel.boot.boot.testing.GreetingsFileSpringApplication</mainClass>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>
\ No newline at end of file
diff --git a/messaging-modules/spring-jms/pom.xml b/messaging-modules/spring-jms/pom.xml
index ef1e0cb3a8..aad416433d 100644
--- a/messaging-modules/spring-jms/pom.xml
+++ b/messaging-modules/spring-jms/pom.xml
@@ -86,6 +86,7 @@
         <mockito-core.version>4.6.1</mockito-core.version>
         <activemq-junit.version>5.16.5</activemq-junit.version>
         <testcontainers.version>1.17.3</testcontainers.version>
+        <junit-jupiter.version>5.10.1</junit-jupiter.version>
     </properties>
 
 </project>
\ No newline at end of file