From 59883d8b377a8c3040b4ac3e09f9f475a973020c Mon Sep 17 00:00:00 2001 From: georgweiss Date: Thu, 11 Jan 2024 16:07:09 +0100 Subject: [PATCH 1/2] Migrate to Java 17 --- .github/workflows/java-build-and-test.yml | 4 +- .settings/org.eclipse.jdt.core.prefs | 6 +- Dockerfile | 6 +- Dockerfile.integrationtest | 4 +- README.md | 2 +- pom.xml | 72 ++++++++++++++--------- 6 files changed, 54 insertions(+), 40 deletions(-) diff --git a/.github/workflows/java-build-and-test.yml b/.github/workflows/java-build-and-test.yml index 4406ce9..d0cc621 100644 --- 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 \ No newline at end of file diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 2bd4e77..af7ce86 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/Dockerfile b/Dockerfile index 7046dbd..dbafecc 100644 --- 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 index abfafe0..d031463 100644 --- 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 index 9758dd0..07d6e5d 100644 --- 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 index 415af56..ca2f8f0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.phoebus service-olog - 4.7.8-SNAPSHOT + 5.0.0-SNAPSHOT Phoebus Olog An online logbook service that allows for the creation and retrieval of log entries. https://github.com/Olog/phoebus-olog @@ -47,8 +48,8 @@ scm:git:git://github.com/Olog/phoebus-olog.git scm:git:https://github.com/Olog/phoebus-olog.git https://github.com/Olog/phoebus-olog/tree/master - HEAD - + HEAD + UTF-8 @@ -59,6 +60,7 @@ true true true + 2.14.3 @@ -78,10 +80,6 @@ org.springframework.boot spring-boot-starter-web - - - org.springframework.data spring-data-mongodb @@ -100,13 +98,35 @@ com.fasterxml.jackson.core jackson-databind - 2.13.3 + ${jackson.version} com.fasterxml.jackson.core jackson-core - 2.13.3 + ${jackson.version} + + + + + jakarta.json jakarta.json-api @@ -228,7 +248,6 @@ - @@ -252,13 +271,13 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M7 + 3.2.5 org.apache.maven.plugins maven-failsafe-plugin - 3.2.2 + 3.2.5 ${skipITs} @@ -269,16 +288,17 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.12.1 - 11 - 11 + 17 + 17 ${project.build.sourceEncoding} org.apache.maven.plugins maven-dependency-plugin + 3.6.1 copy @@ -314,7 +334,7 @@ merge verify - merge + merge @@ -342,15 +362,10 @@ - - org.springframework.boot - spring-boot-maven-plugin - 2.7.0 - org.apache.maven.plugins maven-source-plugin - 3.2.0 + 3.3.0 attach-sources @@ -363,7 +378,10 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.6.3 + + -missing + attach-javadocs @@ -376,7 +394,7 @@ org.apache.maven.plugins maven-release-plugin - 3.0.0-M5 + 3.0.1 v@{project.version} true @@ -405,7 +423,7 @@ none - 11 + 17 @@ -447,7 +465,7 @@ maven-failsafe-plugin - 2.22.0 + 3.2.2 From ef5efadd300c65f66cb99dea0f04da3477757463 Mon Sep 17 00:00:00 2001 From: georgweiss Date: Thu, 11 Jan 2024 16:16:04 +0100 Subject: [PATCH 2/2] Updating .classpath --- .classpath | 39 ------------------- .gitignore | 7 ++++ .project | 23 ----------- .settings/.jsdtscope | 12 ------ .settings/org.eclipse.core.resources.prefs | 6 --- .settings/org.eclipse.jdt.core.prefs | 16 -------- .settings/org.eclipse.m2e.core.prefs | 4 -- .settings/org.eclipse.wst.common.component | 11 ------ ....eclipse.wst.common.project.facet.core.xml | 11 ------ ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - .settings/org.eclipse.wst.validation.prefs | 2 - 12 files changed, 7 insertions(+), 126 deletions(-) delete mode 100644 .classpath delete mode 100644 .project delete mode 100644 .settings/.jsdtscope delete mode 100644 .settings/org.eclipse.core.resources.prefs delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 .settings/org.eclipse.m2e.core.prefs delete mode 100644 .settings/org.eclipse.wst.common.component delete mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.name delete mode 100644 .settings/org.eclipse.wst.validation.prefs diff --git a/.classpath b/.classpath deleted file mode 100644 index d8df1c6..0000000 --- a/.classpath +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index f922cee..6607645 100644 --- 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 deleted file mode 100644 index f2d2054..0000000 --- a/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - phoebus-olog - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope deleted file mode 100644 index 92e666d..0000000 --- a/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf99..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index af7ce86..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,16 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=17 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 6dd7a1c..0000000 --- a/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 6670935..0000000 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8c..0000000 --- a/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1