Skip to content

Commit

Permalink
migrate to Java 17 and GraalVM 22.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JohT committed Oct 14, 2022
1 parent cc7d8f2 commit 66cc660
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 13 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,24 @@ jobs:

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
#- name: Autobuild
# uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 17
cache: 'maven'
- name: Build with Maven
working-directory: showcase-quarkus-eventsourcing
run: mvn -B package --file pom.xml

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [11]
java: [17]
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.java }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/native-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: ['java11']
java: ['java17']
env:
CI_COMMIT_MESSAGE: Automated native image agent results (CI)
CI_COMMIT_AUTHOR: ${{ github.event.repository.name }} Continuous Integration
GRAALVM_VERSION: 22.0.0.2
GRAALVM_VERSION: 22.1.0
steps:
- name: Checkout git repository
uses: actions/checkout@v3
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
run: cp target/native-image-agent-trace.json ${{ env.native-image-agent-results-directory }}
- name: Copy the native image agent configuration files into the native image agent results directory
working-directory: showcase-quarkus-eventsourcing
run: cp target/native-image-agent-trace-configs/* ${{ env.native-image-agent-results-directory }}
run: cp --recursive target/native-image-agent-trace-configs/* ${{ env.native-image-agent-results-directory }}

# Upload the native image agent results in case they are needed for troubleshooting for a couple of days
- name: Archive native image agent results
Expand Down
12 changes: 9 additions & 3 deletions showcase-quarkus-eventsourcing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<properties>
<compiler-plugin.version>3.10.1</compiler-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

Expand All @@ -29,7 +29,7 @@
<quarkus.plugin.version>2.13.1.Final</quarkus.plugin.version>

<axon.version>4.6.1</axon.version>
<dom4j.version>1.6.1</dom4j.version>
<dom4j.version>2.1.3</dom4j.version>
<xom.version>1.2.10</xom.version>
<reactor-core.version>3.4.23</reactor-core.version>

Expand Down Expand Up @@ -94,6 +94,12 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>${dom4j.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>io.projectreactor</groupId>
Expand Down

0 comments on commit 66cc660

Please sign in to comment.