Skip to content

Commit

Permalink
Move to Java 17 incl. updates to build environment (#688)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
fwendland authored Mar 14, 2023
1 parent 5695aef commit 5649863
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
FROM eclipse-temurin:11.0.17_8-jre
FROM eclipse-temurin:17-jre

LABEL org.opencontainers.image.authors="Fraunhofer AISEC <[email protected]>"

# JVM monitoring and profiling
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"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion docs/Getting Started/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/Getting Started/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description: >
---

## Prerequisites
* Java 11 or higher
* Java 17 or higher


## Build from Source
Expand Down
2 changes: 1 addition & 1 deletion docs/contributors/code.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description: >

## Prerequisites

* Java (OpenJDK) 11 or later
* Java SE 17 or later

## Check out, build, and extend Codyze

Expand Down

0 comments on commit 5649863

Please sign in to comment.