Merge pull request #186 from Olog/java_17

Java 17
Olog · Jan 11, 2024 · 6ee6ddb · 6ee6ddb
2 parents dba2894 + 5294914
commit 6ee6ddb
Show file tree

Hide file tree

Showing 17 changed files with 58 additions and 163 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.github/workflows/java-build-and-test.yml b/.github/workflows/java-build-and-test.yml
@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 17
     - name: Build with Maven
       run: mvn clean verify
diff --git a/.gitignore b/.gitignore
@@ -3,9 +3,16 @@
 **/.idea
 **/*iml
 
+# Eclipse stuff
+/.project
+/.classpath
+/.settings
+
 # The H2 database files
 **/*mv.db
 **/*trace.db
+
+### Docker ###
 docker-compose-local*
 
 pom.xml.releaseBackup

diff --git a/.project b/.project
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Use Maven image to execute build.
-FROM maven:3.6.3-openjdk-11 AS maven-build
+FROM maven:3.6.3-openjdk-17 AS maven-build
 RUN mkdir phoebus-olog
 WORKDIR /phoebus-olog
 COPY . .
@@ -10,9 +10,7 @@ RUN mvn clean install \
     -Pdeployable-jar
 
 # Use smaller openjdk image for running.
-FROM openjdk:11
-# apt clean is run automatically in debian-based images.
-RUN apt update && apt install -y wait-for-it
+FROM openjdk:17
 # Run commands as user 'olog'
 RUN useradd -ms /bin/bash olog
 # Use previous maven-build image.

diff --git a/Dockerfile.integrationtest b/Dockerfile.integrationtest
@@ -16,10 +16,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 # ------------------------------------------------------------------------------
 
-FROM openjdk:11
+FROM openjdk:17
 
-# apt clean is run automatically in debian-based images.
-RUN apt update && apt install -y wait-for-it
 # Run commands as user 'olog'
 RUN useradd -ms /bin/bash olog
 

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Olog
 
 * Prerequisites
 
-  * JDK 11 or newer
+  * JDK 17 or newer
   * Elastic version 8.2.x
   * mongo gridfs
 

diff --git a/pom.xml b/pom.xml
@@ -1,9 +1,10 @@
 <?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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.phoebus</groupId>
     <artifactId>service-olog</artifactId>
-    <version>4.7.8-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <name>Phoebus Olog</name>
     <description>An online logbook service that allows for the creation and retrieval of log entries.</description>
     <url>https://github.com/Olog/phoebus-olog</url>
@@ -47,8 +48,8 @@
         <connection>scm:git:git://github.com/Olog/phoebus-olog.git</connection>
         <developerConnection>scm:git:https://github.com/Olog/phoebus-olog.git</developerConnection>
         <url>https://github.com/Olog/phoebus-olog/tree/master</url>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -60,6 +61,7 @@
         <skipITs>true</skipITs>
         <skipITCoverage>true</skipITCoverage>
         <jacoco.skip>true</jacoco.skip>
+        <jackson.version>2.14.3</jackson.version>
     </properties>
 
     <dependencyManagement>
@@ -79,10 +81,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId>
-          </dependency> -->
-        <!-- https://mvnrepository.com/artifact/org.springframework.data/spring-data-mongodb-parent -->
-
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-mongodb</artifactId>
@@ -101,13 +99,35 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.3</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.13.3</version>
+            <version>${jackson.version}</version>
+        </dependency>
+        <!--
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <version>2.16.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.16.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-parameter-names</artifactId>
+            <version>2.16.1</version>
+        </dependency>
+        -->
+
+
+
         <dependency>
             <groupId>jakarta.json</groupId>
             <artifactId>jakarta.json-api</artifactId>
@@ -236,7 +256,6 @@
         </dependency>
 
 
-
     </dependencies>
     <build>
         <!-- read properties from the pom file and add them to the application.properties -->
@@ -260,13 +279,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.2.5</version>
             </plugin>
             <!-- use self-contained integration tests - org.phoebus.olog.docker -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.2.5</version>
                 <configuration>
                     <skipITs>${skipITs}</skipITs>
                     <includes>
@@ -277,16 +296,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.12.1</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>17</source>
+                    <target>17</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <id>copy</id>
@@ -322,7 +342,7 @@
                         <id>merge</id>
                         <phase>verify</phase>
                         <goals>
-                          <goal>merge</goal>
+                            <goal>merge</goal>
                         </goals>
                         <configuration>
                             <fileSets>
@@ -350,15 +370,10 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.7.0</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -371,7 +386,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.6.3</version>
+                <configuration>
+                    <doclint>-missing</doclint>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -384,7 +402,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>3.0.0-M5</version>
+                <version>3.0.1</version>
                 <configuration>
                     <tagNameFormat>v@{project.version}</tagNameFormat>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
@@ -413,7 +431,7 @@
                                 <configuration>
                                     <!-- add this to disable checking -->
                                     <doclint>none</doclint>
-                                    <source>11</source>
+                                    <source>17</source>
                                 </configuration>
                             </execution>
                         </executions>
@@ -455,7 +473,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>2.22.0</version>
+                        <version>3.2.2</version>
                         <executions>
                             <execution>
                                 <goals>