test javax.inject workaround

Signed-off-by: Christian Dietrich <christian.dietrich.opensource@gmail.com>
xtext · Nov 18, 2023 · 5107c33 · 5107c33
1 parent 02ad49d
commit 5107c33
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -154,19 +154,6 @@ jobs:
           java-version: 17
       - name: Build
         run: xvfb-run scripts/domainmodel-2.33.sh
-  build_domain_tycho_30_J17:
-    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: Build
-        env:
-          EXTRA_ARGS : "-Dtycho-version=3.0.5" 
-        run: xvfb-run scripts/domainmodel-2.33.sh
   build_domain_tycho_40_J17:
     runs-on: ubuntu-latest
     steps:

diff --git a/domainmodel/2.33.0/org.eclipse.xtext.example.domainmodel.releng/pom.xml b/domainmodel/2.33.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>2.7.5</tycho-version>
+		<tycho-version>3.0.5</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.33.0-J11/org.xtext.example.mydsl.parent/pom.xml b/greetings-tycho/2.33.0-J11/org.xtext.example.mydsl.parent/pom.xml
@@ -126,6 +126,11 @@
 								<id>org.eclipse.rcp</id>
 								<versionRange>0.0.0</versionRange>
 							</requirement>
+							<requirement>
+								<type>eclipse-plugin</type>
+								<id>javax.inject</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
 						</extraRequirements>
 					</dependency-resolution>
 				</configuration>

diff --git a/...ngs-tycho/2.33.0-J11/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target b/...ngs-tycho/2.33.0-J11/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target
@@ -42,5 +42,9 @@
 			<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
 			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
 		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
+		</location>
 	</locations>
 </target>