Skip to content

Commit a168387

Browse files
committed
fix(deps): bump tycho-version from 4.0.13 to 5.0.0
1 parent 0d6e3ab commit a168387

4 files changed

Lines changed: 59 additions & 11 deletions

File tree

.github/workflows/build.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,18 @@ jobs:
129129
sudo apt-get install --no-install-recommends -y xdg-utils
130130
131131
132-
- name: "Set Java Version"
133-
run: echo "JAVA_VERSION=$([[ '${{ matrix.target-platform }}' == 'oldest' ]] && echo 17 || echo 21)" >> $GITHUB_ENV
132+
- name: "Install: JDK 17 for Compilation ☕"
133+
uses: actions/setup-java@v5 # https://github.com/actions/setup-java
134+
with:
135+
distribution: temurin
136+
java-version: 17
134137

135138

136-
- name: "Install: JDK ${{ env.JAVA_VERSION }}"
139+
- name: "Install: JDK 21 for Maven/Tycho"
137140
uses: actions/setup-java@v5 # https://github.com/actions/setup-java
138141
with:
139142
distribution: temurin
140-
java-version: ${{ env.JAVA_VERSION }}
143+
java-version: 21
141144

142145

143146
- name: "Cache: Local Maven Repository"

.github/workflows/licensecheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ defaults:
2323

2424

2525
env:
26-
JAVA_VERSION: 17
26+
JAVA_VERSION: 21
2727

2828

2929
jobs:

Jenkinsfile

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pipeline {
99
}
1010

1111
tools {
12-
jdk 'temurin-jdk17-latest'
12+
jdk 'temurin-jdk21-latest'
1313
}
1414

1515
stages {
@@ -26,20 +26,49 @@ pipeline {
2626
}
2727
}
2828

29+
stage('Setup Maven Toolchains') {
30+
steps {
31+
script { try {
32+
def jdk17 = tool name: 'temurin-jdk17-latest', type: 'jdk'
33+
34+
// Generate toolchains.xml for Maven Toolchains plugin
35+
writeFile file: "/tmp/toolchains.xml", text: """
36+
<toolchains>
37+
<toolchain>
38+
<type>jdk</type>
39+
<provides>
40+
<version>17</version>
41+
<vendor>temurin</vendor>
42+
</provides>
43+
<configuration>
44+
<jdkHome>${jdk17}</jdkHome>
45+
</configuration>
46+
</toolchain>
47+
</toolchains>
48+
""".trim()
49+
} catch (e) {
50+
echo "Failed to setup toolchains: ${e}"
51+
error("Toolchain setup failed.")
52+
} }
53+
}
54+
}
55+
2956
stage('Build') {
3057
steps {
3158
wrap([$class: 'Xvnc', useXauthority: true]) {
3259
script {
3360
if (env.BRANCH_NAME == 'main') {
3461
withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) {
3562
sh '''./mvnw clean deploy -B \
63+
-t /tmp/toolchains.xml \
3664
-Dmaven.test.failure.ignore=true \
3765
-Dsurefire.rerunFailingTestsCount=3 \
3866
-Psign -Dgpg.passphrase="${KEYRING_PASSPHRASE}"
3967
'''
4068
}
4169
} else {
4270
sh '''./mvnw clean verify -B \
71+
-t /tmp/toolchains.xml \
4372
-Dmaven.test.failure.ignore=true \
4473
-Dsurefire.rerunFailingTestsCount=3
4574
'''

pom.xml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<maven.minimum.version>3.9.5</maven.minimum.version>
14-
<tycho-version>4.0.13</tycho-version>
14+
<maven.compiler.release>17</maven.compiler.release>
15+
<tycho-version>5.0.0</tycho-version>
1516
<sonar.jacoco.reportPath>../target/jacoco.exec</sonar.jacoco.reportPath>
1617
<tycho.scmUrl>scm:git:https://github.com/eclipse-tm4e/tm4e.git</tycho.scmUrl>
1718
<tycho-surefire-plugin.vmargs></tycho-surefire-plugin.vmargs>
@@ -163,12 +164,27 @@
163164
</plugin>
164165
<plugin>
165166
<groupId>org.apache.maven.plugins</groupId>
166-
<artifactId>maven-compiler-plugin</artifactId>
167-
<version>3.14.0</version>
167+
<artifactId>maven-toolchains-plugin</artifactId>
168+
<version>3.2.0</version>
169+
<executions>
170+
<execution>
171+
<goals>
172+
<goal>toolchain</goal>
173+
</goals>
174+
</execution>
175+
</executions>
168176
<configuration>
169-
<source>17</source>
170-
<target>17</target>
177+
<toolchains>
178+
<jdk>
179+
<version>${maven.compiler.release}</version>
180+
</jdk>
181+
</toolchains>
171182
</configuration>
183+
</plugin>
184+
<plugin>
185+
<groupId>org.apache.maven.plugins</groupId>
186+
<artifactId>maven-compiler-plugin</artifactId>
187+
<version>3.14.0</version>
172188
<executions>
173189
<execution>
174190
<id>compiletests</id>

0 commit comments

Comments
 (0)