Skip to content

Commit

Permalink
Merge pull request #60 from retailnext/update-to-java-17
Browse files Browse the repository at this point in the history
Update to java 17
  • Loading branch information
dineshudayakumar authored Jul 7, 2023
2 parents 6d10494 + d172d16 commit bcbf7a5
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 19 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ jobs:
packages: write
steps:
- uses: actions/checkout@v3
- name: Set up Zulu 8
- name: Set up Maven
uses: stCarolas/[email protected]
with:
maven-version: 3.9.3
- name: Set up Zulu 17
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '17'
distribution: 'zulu'
cache: 'maven'
- name: Build with Maven
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Zulu 8
- name: Set up Maven
uses: stCarolas/[email protected]
with:
maven-version: 3.9.3
- name: Set up Zulu 17
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '17'
distribution: 'zulu'
cache: 'maven'
- name: Build with Maven
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ jobs:
if: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
steps:
- uses: actions/checkout@v3
- name: Set up Zulu 8
- name: Set up Maven
uses: stCarolas/[email protected]
with:
maven-version: 3.9.3
- name: Set up Zulu 17
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '17'
distribution: 'zulu'
- name: Deploy Release with Maven
run: >
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ buildNumber.properties
.project
# JDT-specific (Eclipse Java Development Tools)
.classpath
# IntelliJ
.idea
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
</repository>
</distributionManagement>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</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>
<revision>1.0.0-SNAPSHOT</revision>
<revision>2.0.0-SNAPSHOT</revision>
<tag>HEAD</tag>
<tree>main</tree>
</properties>
Expand Down Expand Up @@ -167,7 +167,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.51.v20230217</version>
<version>11.0.15</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
10 changes: 1 addition & 9 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
{
"extends": [
"config:base"
],
"packageRules": [
{
"matchPackageNames": [
"org.eclipse.jetty:jetty-maven-plugin"
],
"allowedVersions": "<10"
}
]
}
}

0 comments on commit bcbf7a5

Please sign in to comment.