Skip to content

Commit

Permalink
releng: Build with tracecompass-e4.35 target by default
Browse files Browse the repository at this point in the history
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 <patrick.tasse@gmail.com>
  • Loading branch information
PatrickTasse committed Jan 20, 2025
1 parent f943596 commit 1604181
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
cache: maven
- name: Set up Maven
Expand All @@ -38,8 +38,8 @@ jobs:
with:
run: >-
mvn -B -Pctf-grammar -Pbuild-rcp ${{ inputs.maven-opts }}
-Djdk.version=17
-Djdk.release=17
-Djdk.version=21
-Djdk.release=21
${{ inputs.maven-goals }}
- name: Upload logs
uses: actions/upload-artifact@v3
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<testArgLine></testArgLine>

<jdk.version>17</jdk.version>
<jdk.release>17</jdk.release>
<jdk.version>21</jdk.version>
<jdk.release>21</jdk.release>

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

<rcptt-version>2.5.4</rcptt-version>
Expand Down

0 comments on commit 1604181

Please # to comment.