DATAGO-59967: Move the EMA to JDK 17 + Spring 3.1.2 (#112)

SolaceProducts · Aug 15, 2023 · cf7852a · cf7852a
1 parent 819df58
commit cf7852a
Show file tree

Hide file tree

Showing 49 changed files with 352 additions and 251 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -32,10 +32,10 @@ jobs:
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
           cache: 'maven'
       - name: Set Build Params

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,10 +20,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
           cache: 'maven'
       - name: Pre-Release Check - Version
@@ -132,4 +132,4 @@ jobs:
           export image_tag=${{ github.event.inputs.releaseVersion }}
           export chart_version="n/a"
           export sha=${{ github.sha }}
-          ./.github/workflows/release_scripts/update_release_manifest.sh          
+          ./.github/workflows/release_scripts/update_release_manifest.sh          
diff --git a/README.md b/README.md
@@ -194,7 +194,7 @@ curl -X 'POST' \
 
 ## Prerequisites
 
-* Java 11 (JDK 11.0.14+)
+* Java 17 (JDK 17.0.8_7+)
 * Maven
 
 ## Cloning the GitHub Event Management Agent repository

diff --git a/service/application/docker/buildEventManagementAgentDocker.sh b/service/application/docker/buildEventManagementAgentDocker.sh
@@ -80,7 +80,7 @@ setup_colors
 
 msg "${GREEN}Building image:${YELLOW} event-management-agent:${IMAGE_TAG}\n${NOFORMAT}"
 
-export BASE_IMAGE=eclipse-temurin:11.0.19_7-jdk-alpine
+export BASE_IMAGE=eclipse-temurin:17.0.8_7-jdk-alpine
 export GITHASH=$(git rev-parse HEAD)
 export GITBRANCH=$(git branch --show-current)
 export BUILD_TIMESTAMP=$(date -u)

diff --git a/service/application/pom.xml b/service/application/pom.xml
@@ -18,7 +18,7 @@
         <snakeyaml.version>2.0</snakeyaml.version>
         <spring-cloud-starter-sleuth.version>3.1.5</spring-cloud-starter-sleuth.version>
         <spring-security-rsa.version>1.1.1</spring-security-rsa.version>
-        <spring-kafka.version>2.9.0</spring-kafka.version>
+        <spring-kafka.version>3.0.9</spring-kafka.version>
         <kafka-clients.version>3.5.0</kafka-clients.version>
     </properties>
     <repositories>
@@ -41,12 +41,12 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>9.0.75</version>
+            <version>10.1.11</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
-            <version>2.7.12</version>
+            <version>3.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -89,10 +89,17 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
+            <version>${mockito-inline.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -110,6 +117,11 @@
             <artifactId>camel-jackson</artifactId>
             <version>${camel.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-directvm-starter</artifactId>
+            <version>4.0.0-M2</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -260,6 +272,10 @@
             <artifactId>snakeyaml</artifactId>
             <version>${snakeyaml.version}</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/service/application/src/main/java/com/solace/maas/ep/common/model/ScanRequestDTO.java b/service/application/src/main/java/com/solace/maas/ep/common/model/ScanRequestDTO.java
@@ -9,7 +9,7 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 @AllArgsConstructor

diff --git a/...on/src/main/java/com/solace/maas/ep/event/management/agent/config/CamelContextConfig.java b/...on/src/main/java/com/solace/maas/ep/event/management/agent/config/CamelContextConfig.java
@@ -1,8 +1,6 @@
 package com.solace.maas.ep.event.management.agent.config;
 
-import com.solace.maas.ep.event.management.agent.logging.CustomUnitOfWork;
 import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.spring.boot.CamelContextConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
@@ -16,7 +14,7 @@ public CamelContextConfiguration contextConfiguration() {
             @Override
             public void beforeApplicationStart(CamelContext context) {
                 context.setUseMDCLogging(true);
-                context.adapt(ExtendedCamelContext.class).setUnitOfWorkFactory(CustomUnitOfWork::new);
+                context.setStreamCaching(false);
             }
 
             @Override

diff --git a/...com/solace/maas/ep/event/management/agent/processor/ScanTypeDescendentsProcessorImpl.java b/...com/solace/maas/ep/event/management/agent/processor/ScanTypeDescendentsProcessorImpl.java
@@ -8,7 +8,7 @@
 import org.apache.camel.Exchange;
 import org.springframework.stereotype.Component;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

diff --git a/...solace/maas/ep/event/management/agent/repository/model/file/DataCollectionFileEntity.java b/...solace/maas/ep/event/management/agent/repository/model/file/DataCollectionFileEntity.java
@@ -8,16 +8,16 @@
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.List;
 

diff --git a/...aas/ep/event/management/agent/repository/model/file/aggregation/AggregatedFileEntity.java b/...aas/ep/event/management/agent/repository/model/file/aggregation/AggregatedFileEntity.java
@@ -7,14 +7,14 @@
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.List;
 

diff --git a/...as/ep/event/management/agent/repository/model/manualimport/ManualImportDetailsEntity.java b/...as/ep/event/management/agent/repository/model/manualimport/ManualImportDetailsEntity.java
@@ -6,10 +6,10 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 @ExcludeFromJacocoGeneratedReport

diff --git a/...lace/maas/ep/event/management/agent/repository/model/manualimport/ManualImportEntity.java b/...lace/maas/ep/event/management/agent/repository/model/manualimport/ManualImportEntity.java
@@ -7,14 +7,14 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 @ExcludeFromJacocoGeneratedReport

diff --git a/...maas/ep/event/management/agent/repository/model/manualimport/ManualImportFilesEntity.java b/...maas/ep/event/management/agent/repository/model/manualimport/ManualImportFilesEntity.java
@@ -6,10 +6,10 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 @ExcludeFromJacocoGeneratedReport

diff --git a/.../event/management/agent/repository/model/mesagingservice/AuthenticationDetailsEntity.java b/.../event/management/agent/repository/model/mesagingservice/AuthenticationDetailsEntity.java
@@ -6,16 +6,16 @@
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.List;
 

diff --git a/...ent/management/agent/repository/model/mesagingservice/AuthenticationPropertiesEntity.java b/...ent/management/agent/repository/model/mesagingservice/AuthenticationPropertiesEntity.java
@@ -7,15 +7,15 @@
 import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 @AllArgsConstructor

diff --git a/...s/ep/event/management/agent/repository/model/mesagingservice/ConnectionDetailsEntity.java b/...s/ep/event/management/agent/repository/model/mesagingservice/ConnectionDetailsEntity.java
@@ -6,16 +6,16 @@
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.List;
 

diff --git a/...p/event/management/agent/repository/model/mesagingservice/ConnectionPropertiesEntity.java b/...p/event/management/agent/repository/model/mesagingservice/ConnectionPropertiesEntity.java
@@ -7,15 +7,15 @@
 import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 @AllArgsConstructor

diff --git a/...s/ep/event/management/agent/repository/model/mesagingservice/CredentialDetailsEntity.java b/...s/ep/event/management/agent/repository/model/mesagingservice/CredentialDetailsEntity.java
@@ -6,16 +6,16 @@
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.List;