Skip to content

Commit

Permalink
GLSP-1127: Fix publish build (#218)
Browse files Browse the repository at this point in the history
The tycho-ant-run task for creating the composite update site seems to break with Java17.
Since this task is just creating the update site the Java version is not really relevant so for now we switch back to 11.
Update jenkins file to trigger Java21 compatibility when on master merges.
  • Loading branch information
tortmayr authored Oct 11, 2023
1 parent 15fb8f4 commit 9e11a0b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ pipeline {
}
}
}
stage('Trigger Java11 build') {
stage('Trigger Java21 build') {
steps {
build wait: false, job: 'glsp-server-java11'
build wait: false, job: 'glsp-server-java21'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.glsp.repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<executionEnvironment>JavaSE-17</executionEnvironment>
<executionEnvironment>JavaSE-11</executionEnvironment>
<!-- IMPORTANT: DO NOT split the arg line -->
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2composite.ant p2.composite.add -Dsite.label=${p2.site.label} -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier} -Dsoftware.download.area=${rsync.local.dir}</appArgLine>
<repositories>
Expand Down

0 comments on commit 9e11a0b

Please sign in to comment.