Skip to content

Commit 1604181

Browse files
committed
releng: Build with tracecompass-e4.35 target by default
Change JDK version to Java 21 in main pom.xml. Change JDK version to Java 21 in ci-base.yml github workflow. Signed-off-by: Patrick Tasse <[email protected]>
1 parent f943596 commit 1604181

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/ci-base.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
- uses: actions/checkout@v3
2424
with:
2525
fetch-depth: 0
26-
- name: Set up JDK 17
26+
- name: Set up JDK 21
2727
uses: actions/setup-java@v3
2828
with:
29-
java-version: '17'
29+
java-version: '21'
3030
distribution: 'temurin'
3131
cache: maven
3232
- name: Set up Maven
@@ -38,8 +38,8 @@ jobs:
3838
with:
3939
run: >-
4040
mvn -B -Pctf-grammar -Pbuild-rcp ${{ inputs.maven-opts }}
41-
-Djdk.version=17
42-
-Djdk.release=17
41+
-Djdk.version=21
42+
-Djdk.release=21
4343
${{ inputs.maven-goals }}
4444
- name: Upload logs
4545
uses: actions/upload-artifact@v3

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4646
<testArgLine></testArgLine>
4747

48-
<jdk.version>17</jdk.version>
49-
<jdk.release>17</jdk.release>
48+
<jdk.version>21</jdk.version>
49+
<jdk.release>21</jdk.release>
5050

5151
<skip-tc-core-tests>false</skip-tc-core-tests>
5252
<skip-short-tc-ui-tests>false</skip-short-tc-ui-tests>
@@ -57,7 +57,7 @@
5757
<tycho-use-project-settings>true</tycho-use-project-settings>
5858
<tycho.scmUrl>scm:git:https://github.com/eclipse-tracecompass/org.eclipse.tracecompass</tycho.scmUrl>
5959
<cbi-plugins.version>1.4.2</cbi-plugins.version>
60-
<target-platform>tracecompass-e4.34</target-platform>
60+
<target-platform>tracecompass-e4.35</target-platform>
6161
<help-docs-eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.23</help-docs-eclipserun-repo>
6262

6363
<rcptt-version>2.5.4</rcptt-version>

0 commit comments

Comments
 (0)