Skip to content

Commit

Permalink
Require a minimum of Java 17.
Browse files Browse the repository at this point in the history
Signed-off-by: James R. Perkins <jperkins@redhat.com>
  • Loading branch information
jamezp committed Aug 10, 2023
1 parent fc127fe commit 95846dd
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/manual-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
javaVersion:
description: "Java Version"
required: true
default: "11"
default: "17"
type: string

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-wildfly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
javaVersion:
description: "Java Version"
required: true
default: "11"
default: "17"
type: string
wildfly-branch:
description: "WildFly Branch"
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest ]
java: ['11', '17']
java: ['17']
wildfly-version: ['28.0.1.Final', '29.0.0.Final']

steps:
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ['11']
java: ['17']
wildfly-version: ['28.0.1.Final', '29.0.0.Final']
profile:
- '-Dsecurity.manager'
Expand Down Expand Up @@ -121,13 +121,13 @@ jobs:
timeout-minutes: 20
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: 'maven'
- name: Build Java Docs with Java 11
- name: Build Java Docs with Java 17
run: |
mvn clean install -B -DskipTests
mvn clean site -B -DskipTests
Expand All @@ -138,10 +138,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: 'maven'
- name: Validate Formatting
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/shared-resteasy-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
# - name: Set up JDK ${{ inputs.javaVersion }}
# uses: actions/setup-java@v3
# with:
# java-version: 11
# java-version: 17
# distribution: 'temurin'
# cache: 'maven'
# - name: Build on Linux with Java 11 using RESTEasy ${{ needs.resteasy-build.outputs.resteasy-version }}
# - name: Build on Linux with Java 178 using RESTEasy ${{ needs.resteasy-build.outputs.resteasy-version }}
# run: mvn clean verify '-Dversion.dev.resteasy=${{ needs.resteasy-build.outputs.resteasy-version }}'

name: Build RESTEasy Upstream
Expand Down Expand Up @@ -70,10 +70,10 @@ jobs:
with:
repository: ${{ inputs.resteasy-repo }}
ref: ${{ inputs.resteasy-branch }}
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: 'maven'
- name: Build RESTEasy
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wildfly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
java: ['11', '17', '21-ea']
java: ['17', '21-ea']

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ['11', '21-ea']
java: ['17', '21-ea']
profile:
- '-Dsecurity.manager'
- '-Dprovision.preview'
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- Require a minimum of Java 17 and make Java 17 the target -->
<jdk.min.version>17</jdk.min.version>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>

<!-- Dependency versions -->
<dep.arquillian-bom.version>1.7.0.Final</dep.arquillian-bom.version>
<version.org.jboss.arquillian.container.arquillian-weld-embedded>3.0.2.Final</version.org.jboss.arquillian.container.arquillian-weld-embedded>
Expand Down

0 comments on commit 95846dd

Please sign in to comment.