Merge pull request #53 from usdot-jpo-ode/candidate_r1

Merge candidate_r1 into master
usdot-jpo-ode · Feb 26, 2024 · 3ee478b · 3ee478b
2 parents 1634697 + f11f6c4
commit 3ee478b
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 48 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,9 @@
-name: ci
-
-on: [pull_request, push]
+name: CI
+on: 
+  pull_request:
+    types: [opened, reopened, synchronize]
+  push:
+    branches: [develop, master]
 
 jobs:
   docker:
@@ -18,7 +21,7 @@ jobs:
         with:
           submodules: recursive
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: "21"
           distribution: "temurin"

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -1,12 +1,8 @@
 name: Docker build
 
 on:
-  push:
-    branches-ignore:
-      - "develop"
-      - "master"
-      - "release/*"
   pull_request:
+      types: [opened, synchronize, reopened]
 
 jobs:
   jpo-geojsonconverter:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.8.1-openjdk-11 as builder
+FROM maven:3.8-eclipse-temurin-21-alpine as builder
 
 WORKDIR /home
 
@@ -24,7 +24,7 @@ WORKDIR /home/jpo-geojsonconverter
 
 RUN mvn clean package -DskipTests
 
-FROM openjdk:11-jre-slim
+FROM eclipse-temurin:21-jre-alpine
 
 WORKDIR /home
 

diff --git a/README.md b/README.md
@@ -203,6 +203,8 @@ git config --global core.autocrlf false
 
 #### Step 1 - Download the Source Code
 
+Note: to avoid cloning redundant local copies of submodules, if you intend to run the entire ConflictVisualizer system, you should instead start with [step 1 of the ConflictVisualizer Installation Guide](https://github.com/usdot-jpo-ode/jpo-conflictvisualizer?tab=readme-ov-file#1-initialize-and-update-submodules) before returning to step 2 below.
+
 The jpo-geojsonconverter software system consists of the following modules hosted in separate Github repositories:
 
 |Name|Visibility|Description|
@@ -212,10 +214,6 @@ The jpo-geojsonconverter software system consists of the following modules hoste
 
 You may download the stable, default branch for ALL of these dependencies by using the following recursive git clone command:
 
-```bash
-git clone --recurse-submodules https://github.com/usdot-jpo-ode/jpo-ode.git
-```
-
 ```bash
 git clone --recurse-submodules https://github.com/usdot-jpo-ode/jpo-geojsonconverter.git
 ```
@@ -238,6 +236,7 @@ Verify the jpo-ode, kafka, zookeeper, asn1-decoder and asn1-encoder are running
 **Notes:**
 - Docker builds may fail if you are on a corporate network due to DNS resolution errors.
 - In order for Docker to automatically read the environment variable file, you must rename it from `sample.env` to `.env`. **This file will contain private keys, do not put add it to version control.**
+- Unless you intend to run geojsonconverter without jpo-ode, replace the contents of docker-compose.yml with those of docker-compose-standalone.yml.
 
 Navigate to the root directory of the jpo-geojsonconverter project and run the following command:
 

diff --git a/docs/Release_notes.md b/docs/Release_notes.md
@@ -1,6 +1,16 @@
 JPO GeoJSON Converter Release Notes
 ----------------------------
 
+Version 1.2.0
+----------------------------------------
+
+### **Summary**
+This release includes upgrading the project to use Java 21 in order to future proof the project.
+
+Enhancements in this release:
+- PR44: Java 21 support.
+
+
 Version 1.1.0
 ----------------------------------------
 

diff --git a/jpo-geojsonconverter/pom.xml b/jpo-geojsonconverter/pom.xml
@@ -6,22 +6,22 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.8</version>
+        <version>3.1.3</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
     <groupId>usdot.jpo.ode</groupId>
     <artifactId>jpo-geojsonconverter</artifactId>
-    <version>1.0.0</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>jpo-geojsonconverter</name>
     <description>J2735 message to GeoJSON converter for US DOT ITS JPO ODE</description>
     <properties>
-        <java.version>11</java.version>
+        <java.version>21</java.version>
         <sonar.organization>usdot-jpo-ode</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.exclusions>src/main/**/GeoJsonConverterApplication.java, src/main/**/GeoJsonConverterProperties.java, src/main/**/KafkaConfiguration.java</sonar.exclusions>
         <!-- JaCoCo Properties -->
-        <jacoco.version>0.8.8</jacoco.version>
+        <jacoco.version>0.8.11</jacoco.version>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
         <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
@@ -126,24 +126,24 @@
         <dependency>
             <groupId>usdot.jpo.ode</groupId>
             <artifactId>jpo-ode-core</artifactId>
-            <version>1.3.0</version>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>usdot.jpo.ode</groupId>
             <artifactId>jpo-ode-plugins</artifactId>
-            <version>1.3.0</version>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
         <!-- Other Dependencies -->
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>
-            <version>1.0.73</version>
+            <version>1.0.88</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.14.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -161,13 +161,13 @@
             <plugin>
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
-                <version>3.9.0.2155</version>
+                <version>3.10.0.2594</version>
             </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <jvmArguments>${argLine}</jvmArguments>
+                    <jvmArguments>@{argLine}</jvmArguments>
                 </configuration>
                 <executions>
                     <execution>
@@ -181,16 +181,22 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.2.5</version>
                 <configuration>
                     <enableProcessChecker>all</enableProcessChecker>
                     <shutdown>exit</shutdown>
+                    <!-- Prevent JDK 21 warnings related to Mockito during tests. -->
+                    <!-- See:  https://github.com/mockito/mockito/issues/3037 -->
+                    <argLine>
+                        @{argLine}
+                        -XX:+EnableDynamicAgentLoading
+                    </argLine>
                 </configuration>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit47</artifactId>
-                        <version>3.0.0-M7</version>
+                        <version>3.2.5</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -235,24 +241,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <!--to
-                            be imported on other projects-->
-                            <classifier>jpo-geojsonconverter</classifier>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/...onconverter/src/main/java/us/dot/its/jpo/geojsonconverter/GeoJsonConverterProperties.java b/...onconverter/src/main/java/us/dot/its/jpo/geojsonconverter/GeoJsonConverterProperties.java
@@ -17,7 +17,7 @@
 
 import java.util.Properties;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...ava/us/dot/its/jpo/geojsonconverter/serialization/deserializers/JsonDeserializerTest.java b/...ava/us/dot/its/jpo/geojsonconverter/serialization/deserializers/JsonDeserializerTest.java
@@ -68,9 +68,10 @@ public void testProcessedSpatDeserializer() {
             ProcessedSpat spat = serializer.deserialize("the_topic", spatBytes);
             assertNotNull(spat);
             assertEquals(false, spat.getCti4501Conformant());
-            assertEquals("2022-11-17T22:55:28.744Z[UTC]", spat.getUtcTimeStamp().toString());
+            assertEquals("2022-11-17T22:55:28.744Z", spat.getUtcTimeStamp().toString());
 
             //assertEquals(spatString, spat.toString().replace(" ", ""));
+
         } catch (Exception e) {
             fail("Unexpected exception: " + e);
         }

diff --git a/jpo-ode b/jpo-ode