Skip to content

Commit

Permalink
Merge pull request #1757 from ArcadeData/improvement/1756-migrate-to-…
Browse files Browse the repository at this point in the history
…java-17

#1756 migrate build and runtime in docker file to java 17
  • Loading branch information
mergify[bot] authored Oct 20, 2024
2 parents 04dec10 + b94da2d commit b73ae4d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/mvn-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 11
java-version: 17
cache: "maven"
server-id: ossrh
server-username: MAVEN_USERNAME
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mvn-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 11
java-version: 17
cache: "maven"
server-id: ossrh
server-username: MAVEN_USERNAME
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mvn-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 11
java-version: 17
cache: "maven"

- name: Install jars
Expand Down
2 changes: 1 addition & 1 deletion package/src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#


FROM eclipse-temurin:11
FROM eclipse-temurin:17

LABEL maintainer="Arcade Data LTD ([email protected])"

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</licenses>

<properties>
<maven-compiler-plugin.release>11</maven-compiler-plugin.release>
<maven-compiler-plugin.release>17</maven-compiler-plugin.release>
<exclude.tests></exclude.tests>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Expand Down
1 change: 1 addition & 0 deletions studio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<groupId>com.arcadedb</groupId>
<artifactId>arcadedb-parent</artifactId>
<version>24.11.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>arcadedb-studio</artifactId>
Expand Down

0 comments on commit b73ae4d

Please sign in to comment.