update to orbit 2024-06

.github/workflows/build-integtests-wizard.yml

@@ -11,12 +11,16 @@ jobs:
   build_integ_wizard:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
+      - name: Set up Maven 3.9.1
+        uses: stCarolas/setup-maven@v4.5
+        with:
+          maven-version: 3.9.1
       - name: Build
         run: xvfb-run scripts/integrationtests-wizard.sh
       - name: Archive UI Tests Screenshots

.github/workflows/build-integtests-xtend.yml

@@ -11,11 +11,15 @@ jobs:
   build_integ_xtend:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
+      - name: Set up Maven 3.9.1
+        uses: stCarolas/setup-maven@v4.5
+        with:
+          maven-version: 3.9.1
       - name: Build
         run: xvfb-run scripts/integrationtests-xtend-examples.sh

.github/workflows/build-integtests-xtext.yml

@@ -11,11 +11,21 @@ jobs:
   build_integ_xtext:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
+      - name: Set up Maven 3.9.1
+        uses: stCarolas/setup-maven@v4.5
+        with:
+          maven-version: 3.9.1
       - name: Build
         run: xvfb-run scripts/integrationtests-xtext-examples.sh
+      - name: Archive UI Tests Screenshots
+        uses: actions/upload-artifact@v2
+        if: ${{ failure() || cancelled() }}
+        with:
+          name: screenshots-${{ runner.os }}
+          path: '**/screenshots'

.github/workflows/build.yml

@@ -11,9 +11,9 @@ jobs:
   build_Gralde_J17:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
@@ -22,9 +22,9 @@ jobs:
   build_Gralde_J11:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 11
@@ -33,9 +33,9 @@ jobs:
   build_Gralde_J11_on_J17:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
@@ -44,9 +44,9 @@ jobs:
   build_Maven_J17:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
@@ -55,9 +55,9 @@ jobs:
   build_Maven_J11:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 11
@@ -66,9 +66,9 @@ jobs:
   build_Maven_J11_on_J17:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
@@ -77,9 +77,9 @@ jobs:
   build_tycho_J17:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
@@ -92,9 +92,9 @@ jobs:
   build_tycho_J11:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 11
@@ -103,9 +103,9 @@ jobs:
   build_tycho_J17_tycho_50:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
@@ -120,9 +120,9 @@ jobs:
   build_domain:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
@@ -135,9 +135,9 @@ jobs:
   build_domain_tycho_50_J17:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17

domainmodel/2.35.0/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target

@@ -23,7 +23,7 @@
         Just mention the p2 repo so that additional requirements with ranges specified in
         features and bundles are taken from Orbit (e.g., objectweb.asm)
       -->
-      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
     </location>
   </locations>
 </target>

greetings-tycho/2.35.0-J11/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target

@@ -40,8 +40,8 @@
 			<unit id="junit-vintage-engine" version="0.0.0"/>
 			<unit id="org.opentest4j" version="0.0.0"/>
 			<unit id="org.objectweb.asm" version="9.6.0"/>
-			<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
-			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
+			<unit id="io.github.classgraph.classgraph" version="4.8.168"/>
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
 		</location>
 	</locations>
 </target>

greetings-tycho/2.35.0/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target

@@ -40,8 +40,8 @@
 			<unit id="junit-vintage-engine" version="0.0.0"/>
 			<unit id="org.opentest4j" version="0.0.0"/>
 			<unit id="org.objectweb.asm" version="9.6.0"/>
-			<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
-			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
+			<unit id="io.github.classgraph.classgraph" version="4.8.168"/>
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
 		</location>
 	</locations>
 </target>

integrationtests/org.eclipse.xtext.integrationtests.target/org.eclipse.xtext.integrationtests.target.target

@@ -56,7 +56,7 @@
 		<unit id="org.objectweb.asm.tree.source" version="9.6.0"/>
 		<unit id="slf4j.api" version="0.0.0" />
 		<unit id="slf4j.simple" version="0.0.0" />
-		<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
+		<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 		<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
@@ -65,7 +65,7 @@
 		<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
 		<unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
 		<unit id="org.eclipse.buildship.feature.group" version="0.0.0"/>
-		<repository location="https://download.eclipse.org/releases/2023-12"/>
+		<repository location="https://download.eclipse.org/releases/2024-03"/>
 	</location>
 
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

integrationtests/org.eclipse.xtext.swtbot.testing/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

integrationtests/org.eclipse.xtext.swtbot.testing/.settings/org.eclipse.jdt.core.prefs

@@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -123,7 +123,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

integrationtests/org.eclipse.xtext.swtbot.testing/.settings/org.eclipse.jdt.ui.prefs

@@ -54,7 +54,7 @@ cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_'Xtext'
-formatter_settings_version=11
+formatter_settings_version=17
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.ignorelowercasenames=true

integrationtests/org.eclipse.xtext.swtbot.testing/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: Xtext SWTBot Testing
 Bundle-SymbolicName: org.eclipse.xtext.swtbot.testing
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.eclipse.ui.swtbot.testing
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.junit;version="4.13.2",
  org.junit.rules;version="4.13.2",
  org.junit.runner;version="4.13.2",

integrationtests/org.eclipse.xtext.swtbot.tests/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>

integrationtests/org.eclipse.xtext.swtbot.tests/.settings/org.eclipse.jdt.core.prefs

@@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -123,7 +123,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

integrationtests/org.eclipse.xtext.swtbot.tests/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: Xtext SWTBot Tests
 Bundle-SymbolicName: org.eclipse.xtext.swtbot.tests
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.eclipse.xtext.ui.swtbot.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.junit;version="4.13.2",
  org.junit.rules;version="4.13.2",
  org.junit.runner;version="4.13.2",

integrationtests/pom.xml

@@ -16,12 +16,12 @@
 		<surefire-jvmargs></surefire-jvmargs>
 		<xtend-maven-plugin-version>2.19.0</xtend-maven-plugin-version>
 		<JENKINS_URL>https://ci.eclipse.org/xtext/</JENKINS_URL>
-		<tycho-version>2.7.5</tycho-version>
+		<tycho-version>4.0.6</tycho-version>
 
 		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>ISO-8859-1</project.reporting.outputEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
 		<sign.skip>true</sign.skip>
 	</properties>