Merge pull request #410 from xtext/lb_tycho4

Tycho 4.0.6
xtext · Mar 7, 2024 · c928b7e · c928b7e
2 parents d058ab2 + 2a95f8a
commit c928b7e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -83,6 +83,10 @@ jobs:
         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/greetings-tycho-2.35.sh
   build_tycho_J11:
@@ -96,23 +100,6 @@ jobs:
           java-version: 11
       - name: Build
         run: xvfb-run scripts/greetings-tycho-2.35-J11.sh
-  build_tycho_J17_tycho_40:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        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
-        env:
-          EXTRA_ARGS : "-Dtycho-version=4.0.5" 
-        run: xvfb-run scripts/greetings-tycho-2.35.sh
   build_tycho_J17_tycho_50:
     runs-on: ubuntu-latest
     steps:

diff --git a/domainmodel/2.35.0/org.eclipse.xtext.example.domainmodel.releng/pom.xml b/domainmodel/2.35.0/org.eclipse.xtext.example.domainmodel.releng/pom.xml
@@ -24,7 +24,7 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		<!-- Tycho settings -->
-		<tycho-version>4.0.4</tycho-version>
+		<tycho-version>4.0.6</tycho-version>
 		<targetplatform.groupId>${project.groupId}</targetplatform.groupId>
 		<targetplatform.artifactId>${project.groupId}.tp</targetplatform.artifactId>
 		<targetplatform.version>${project.version}</targetplatform.version>

diff --git a/greetings-tycho/2.35.0/org.xtext.example.mydsl.parent/pom.xml b/greetings-tycho/2.35.0/org.xtext.example.mydsl.parent/pom.xml
@@ -13,7 +13,7 @@
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
 		<!-- Tycho settings -->
-		<tycho-version>3.0.5</tycho-version>
+		<tycho-version>4.0.6</tycho-version>
 		<!-- Define overridable properties for tycho-surefire-plugin -->
 		<platformSystemProperties></platformSystemProperties>
 		<moduleProperties></moduleProperties>