Skip to content

Commit

Permalink
Merge pull request #54 from entando-k8s/ENG-5347
Browse files Browse the repository at this point in the history
ENG-5347: Upgrade java version to 17 (7.3.x)
  • Loading branch information
eugeniosant authored Jan 30, 2024
2 parents 837ca4c + c9b83bb commit 38b4fdb
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ga-publication.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: "Configure GA Repository"
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
server-id: maven-central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ jobs:
--token "$ENTANDO_BOT_TOKEN" \
;
#~ JDK
- name: "Set up JDK 11"
- name: "Set up JDK 17"
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
#~ MAVEN CACHE
- name: "Cache Maven packages"
uses: actions/cache@v2
Expand Down Expand Up @@ -119,10 +119,10 @@ jobs:
${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
~/ppl-run checkout-branch pr --lcd "$LOCAL_CLONE_DIR"
#~ JDK
- name: "Set up JDK 11"
- name: "Set up JDK 17"
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
#~ MAVEN CACHE
- name: "Cache Maven packages"
id: maven-cache
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/publication.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ jobs:
.. pr-preflight-checks --only flags --lcd "$LOCAL_CLONE_DIR" \
;
#~ JDK
- name: "Set up JDK 11"
- name: "Set up JDK 17"
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
#~ MAVEN CACHE
- name: "Cache Maven packages"
uses: actions/cache@v2
Expand All @@ -65,7 +65,7 @@ jobs:
- name: "Configure Entando Nexus Repository"
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
server-id: internal-nexus
server-username: NEXUS_USERNAME
server-password: NEXUS_PASSWORD
Expand Down Expand Up @@ -117,10 +117,10 @@ jobs:
.. pr-preflight-checks --only flags --lcd "$LOCAL_CLONE_DIR" \
;
#~ JDK
- name: "Set up JDK 11"
- name: "Set up JDK 17"
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
#~ MAVEN CACHE
- name: "Cache Maven packages"
uses: actions/cache@v2
Expand Down Expand Up @@ -155,10 +155,10 @@ jobs:
.. pr-preflight-checks --only flags --lcd "$LOCAL_CLONE_DIR" \
;
#~ JDK
- name: "Set up JDK 11"
- name: "Set up JDK 17"
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
#~ MAVEN CACHE
- name: "Cache Maven packages"
uses: actions/cache@v2
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>entando-maven-root</artifactId>
<version>7.2.0</version>
<version>7.3.1-ENG-5347-PR-22</version>
<relativePath/>
</parent>
<groupId>org.entando</groupId>
<artifactId>entando-quarkus-parent</artifactId>
<version>7.3.0</version>
<version>7.3.1</version>
<packaging>pom</packaging>

<name>Entando Quarkus Parent POM</name>
Expand Down Expand Up @@ -60,9 +60,9 @@
<github.organization>entando-k8s</github.organization>
<preDeploymentTestGroups></preDeploymentTestGroups>
<postDeploymentTestGroups></postDeploymentTestGroups>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.javadoc.source>11</maven.javadoc.source>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.javadoc.source>17</maven.javadoc.source>
<skipLicenseDownload>false</skipLicenseDownload>
<checkstyleConfigLocation>
https://raw.githubusercontent.com/entando-k8s/entando-quarkus-parent/ACTIVE-CHECKSTYLE/checkstyle.xml
Expand Down Expand Up @@ -528,7 +528,7 @@
<configuration>
<skip>true</skip>
<doclint>none</doclint>
<source>11</source>
<source>17</source>
<detectJavaApiLink>false</detectJavaApiLink>
<quiet>true</quiet>
</configuration>
Expand Down

0 comments on commit 38b4fdb

Please sign in to comment.