From 56498633b2c8778ae38fb980b25ad91e2ffac5f1 Mon Sep 17 00:00:00 2001
From: Florian Wendland <florian.wendland@aisec.fraunhofer.de>
Date: Tue, 14 Mar 2023 14:59:02 +0100
Subject: [PATCH] Move to Java 17 incl. updates to build environment (#688)

* Move to Java 17 incl. updates to build environment

* Update to Gh workflows to Java 17, distro Eclipse Temurin

* Update to Java 17 prerequisite

* Update docs to mention Java 17
---
 .github/workflows/codecov.yml        |  4 ++--
 .github/workflows/detekt.yml         |  4 ++--
 Dockerfile                           | 10 +++++-----
 README.md                            |  2 +-
 docs/Getting Started/cli.md          |  2 +-
 docs/Getting Started/installation.md |  2 +-
 docs/contributors/code.md            |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index 0e31512fb..b04e6b8c5 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -17,8 +17,8 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          distribution: "zulu"
-          java-version: 11
+          distribution: "temurin"
+          java-version: 17
       - name: Generate coverage report
         uses: gradle/gradle-build-action@v2
         with:
diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml
index b9bfb49fb..bcb5c6496 100644
--- a/.github/workflows/detekt.yml
+++ b/.github/workflows/detekt.yml
@@ -22,8 +22,8 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          distribution: "zulu"
-          java-version: 11
+          distribution: "temurin"
+          java-version: 17
 
       - name: Run analysis
         uses: gradle/gradle-build-action@v2
diff --git a/Dockerfile b/Dockerfile
index 3348e954f..cb8cc0539 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.17_8-jre
+FROM eclipse-temurin:17-jre
 
 LABEL org.opencontainers.image.authors="Fraunhofer AISEC <codyze@aisec.fraunhofer.de>"
 
@@ -6,14 +6,14 @@ LABEL org.opencontainers.image.authors="Fraunhofer AISEC <codyze@aisec.fraunhofe
 EXPOSE 9000
 
 # extract versioned distribution
-ADD codyze-cli/build/distributions/codyze-cli*.tar /usr/local/lib/
+ADD codyze-cli/build/distributions/codyze*.tar /usr/local/lib/
 # make Codyze script accessible through PATH and create version independent directory
-RUN ln -s /usr/local/lib/codyze-cli*/bin/codyze-cli /usr/local/bin/ \
-    && ln -s /usr/local/lib/codyze-cli* /codyze-cli
+RUN ln -s /usr/local/lib/codyze*/bin/codyze /usr/local/bin/ \
+    && ln -s /usr/local/lib/codyze* /codyze
 
 # default location for project to be analyzed
 WORKDIR /source
 
 # default execution
-ENTRYPOINT ["codyze-cli"]
+ENTRYPOINT ["codyze"]
 CMD ["analyze", "--config", "./codyze.json"]
diff --git a/README.md b/README.md
index 37d7a6458..0dc11647f 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 Codyze is a static code analyzer that focuses on verifying security compliance in source code, i.e. by inferring the correct use of cryptographic libraries. It operates on code property graphs and is thus able to handle non-compiling or even incomplete code fragments.
 
 ## Build & Run Codyze
-A Java SE 11 JDK is a prerequisite. We build and test using Eclipse Temurin but any distribution should work.
+A Java SE 17 JDK is a prerequisite. We build and test using Eclipse Temurin but any distribution should work.
 
 To build an executable version of Codyze, use the `installDist` task in the project's root:
 
diff --git a/docs/Getting Started/cli.md b/docs/Getting Started/cli.md
index b9b68eb4b..1182c1ffd 100644
--- a/docs/Getting Started/cli.md	
+++ b/docs/Getting Started/cli.md	
@@ -42,7 +42,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: "temurin"
-          java-version: "11"
+          java-version: "17"
       - name: Install Codyze
         run: |
           wget "https://github.com/Fraunhofer-AISEC/codyze/releases/download/v${CODYZE_VERSION}/codyze-${CODYZE_VERSION}.zip" && unzip codyze-${CODYZE_VERSION}.zip
diff --git a/docs/Getting Started/installation.md b/docs/Getting Started/installation.md
index a14019dd6..cee0aada9 100644
--- a/docs/Getting Started/installation.md	
+++ b/docs/Getting Started/installation.md	
@@ -9,7 +9,7 @@ description: >
 ---
 
 ## Prerequisites
-* Java 11 or higher
+* Java 17 or higher
 
 
 ## Build from Source
diff --git a/docs/contributors/code.md b/docs/contributors/code.md
index fdf79742a..2a004def4 100644
--- a/docs/contributors/code.md
+++ b/docs/contributors/code.md
@@ -10,7 +10,7 @@ description: >
 
 ## Prerequisites
 
-* Java (OpenJDK) 11 or later
+* Java SE 17 or later
 
 ## Check out, build, and extend Codyze