Skip to content

Commit

Permalink
Bump java target to 17; Update jenkins core to 2.426.3 for Java 21 su…
Browse files Browse the repository at this point in the history
…pport (#696)
  • Loading branch information
ErikRehmTT authored May 29, 2024
1 parent fa330ba commit 7ab408f
Show file tree
Hide file tree
Showing 39 changed files with 651 additions and 556 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ on:

jobs:
validate-sbom:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout Code
uses: actions/checkout@v4
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: adopt
- name: Generate json bom
run: mvn clean cyclonedx:makeAggregateBom -f pom.xml
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ jobs:
build:
name: Build on JDK ${{ matrix.java }} and ${{ matrix.os }}
runs-on: ${{ matrix.os }}
continue-on-error: true
strategy:
matrix:
java: [11, 17]
java: [17, 21]
os: [ubuntu-latest, windows-latest]
steps:
- name: Checkout
Expand Down
8 changes: 5 additions & 3 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/**
* SPDX-FileCopyrightText: 2015-2023 tracetronic GmbH <info@tracetronic.de>
* SPDX-FileCopyrightText: 2015-2024 tracetronic GmbH <info@tracetronic.de>
*
* SPDX-License-Identifier: BSD-3-Clause
*/

buildPlugin(
useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
configurations: [
[platform: 'linux', jdk: 11],
[platform: 'windows', jdk: 11],
[platform: 'linux', jdk: 17],
[platform: 'windows', jdk: 17]
[platform: 'windows', jdk: 17],
[platform: 'linux', jdk: 21],
[platform: 'windows', jdk: 21]
],
useArtifactCachingProxy: false // Use plugins.jenkins.io directly
)
6 changes: 3 additions & 3 deletions Jenkinsfile.internal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* SPDX-FileCopyrightText: 2015-2023 tracetronic GmbH <info@tracetronic.de>
* SPDX-FileCopyrightText: 2015-2024 tracetronic GmbH <info@tracetronic.de>
*
* SPDX-License-Identifier: BSD-3-Clause
*/
Expand All @@ -9,7 +9,7 @@
Prerequisites
=============
* Maven tool installation configured as M3
* JDK tool installation configured as JDK11
* JDK tool installation configured as JDK17
* Global environment variable EMAIL_RECIPIENTS set
* Jenkins plugins installed:
- https://plugins.jenkins.io/jacoco
Expand Down Expand Up @@ -86,7 +86,7 @@ pipeline {

def mvn(def args) {
def mvnHome = tool 'M3'
def javaHome = tool 'JDK11'
def javaHome = tool 'JDK17'
withEnv(["JAVA_HOME=${javaHome}", "PATH+MAVEN=${mvnHome}/bin:${env.JAVA_HOME}/bin"]) {
if (isUnix()) {
sh "${mvnHome}/bin/mvn ${args} -B -V -U -e"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ can be found in the [tracetronic Knowledge Base](https://kb.tracetronic.com/disp
## Compatibility

- Jenkins LTS 2.319.3 or higher
- Java SE Runtime Environment 11 or higher
- Java SE Runtime Environment 17 or higher
<details>
<summary><a href="https://www.tracetronic.com/products/ecu-test">ecu.test</a> 2023.1 or higher </summary>

Expand Down
Loading

0 comments on commit 7ab408f

Please sign in to comment.