[#2787] remove javax.inject dependency

Signed-off-by: Christian Dietrich <christian.dietrich.opensource@gmail.com>
eclipse · Aug 28, 2023 · 541119f · 541119f
1 parent bc5f99e
commit 541119f
Show file tree

Hide file tree

Showing 24 changed files with 3 additions and 78 deletions.
diff --git a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF
@@ -26,8 +26,7 @@ Require-Bundle: org.eclipse.xtend.core,
  org.eclipse.jdt.core;bundle-version="3.29.0",
  org.eclipse.xtext.builder.standalone,
  org.eclipse.xtext.java
-Import-Package: javax.inject;version="1.0.0",
- jakarta.inject;version="2.0.1",
+Import-Package: jakarta.inject;version="2.0.1",
  org.apache.log4j;version="1.2.24",
  org.apache.log4j.spi;version="1.2.24",
  org.junit;version="4.13.2",

diff --git a/org.eclipse.xtend.ide.tests/batch-compiler-data/ant/test.ant b/org.eclipse.xtend.ide.tests/batch-compiler-data/ant/test.ant
@@ -39,7 +39,6 @@
 			<include name="com.google.inject*.jar" />
 			<include name="guice*.jar" />
 			<include name="*failureaccess*jar" />
-			<include name="javax.injec*.jar" />
 			<include name="jakarta.inject-api*jar" />
 			<include name="org.eclipse.equinox.common*.jar" />
 			<include name="org.eclipse.jdt.core*.jar" />

diff --git a/org.eclipse.xtext.p2repository/category.xml b/org.eclipse.xtext.p2repository/category.xml
@@ -26,8 +26,6 @@
    <bundle id="com.google.guava.failureaccess.source" version="1.0.1.qualifier"/>
    <bundle id="com.google.inject" version="7.0.0.qualifier"/>
    <bundle id="com.google.inject.source" version="7.0.0.qualifier"/>
-   <bundle id="javax.inject" version="1.0.0.qualifier"/>
-   <bundle id="javax.inject.source" version="1.0.0.qualifier"/>
    <bundle id="jakarta.inject.jakarta.inject-api" version="2.0.1.qualifier"/>
    <bundle id="jakarta.inject.jakarta.inject-api.source" version="2.0.1.qualifier"/>
    <bundle id="org.antlr.runtime" version="3.2.0.qualifier"/>

diff --git a/org.eclipse.xtext.redist.feature/feature.xml b/org.eclipse.xtext.redist.feature/feature.xml
@@ -32,7 +32,6 @@ SPDX-License-Identifier: EPL-2.0
       <import plugin="com.google.inject" version="7.0.0" match="compatible"/>
       <import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
       <import plugin="org.objectweb.asm" version="9.5.0" match="compatible"/>
-      <import plugin="javax.inject" version="1.0.0" match="compatible"/>
       <import plugin="io.github.classgraph" version="4.8.149" match="compatible"/>
    </requires>
 

diff --git a/org.eclipse.xtext.runtime.feature/feature.xml b/org.eclipse.xtext.runtime.feature/feature.xml
@@ -25,7 +25,6 @@ SPDX-License-Identifier: EPL-2.0
    </license>
    <requires>
       <import plugin="com.google.guava" version="32.1.2" match="compatible"/>
-      <import plugin="javax.inject" version="1.0.0" match="compatible"/>
       <import plugin="com.google.inject" version="7.0.0" match="compatible"/>
       <import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
       <import plugin="org.objectweb.asm" version="9.5.0" match="compatible"/>

diff --git a/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF
@@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.xtend.lib,
  org.eclipse.xtext.testing,
  com.google.inject;bundle-version="7.0.0";visibility:=reexport
-Import-Package: javax.inject;version="1.0.0",
- jakarta.inject;version="2.0.1",
+Import-Package: jakarta.inject;version="2.0.1",
  org.apache.log4j;version="1.2.24",
  org.apache.log4j.spi;version="1.2.24",
  org.junit.jupiter.api;version="[5.1.0,6.0.0)",

diff --git a/....xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target b/....xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
@@ -18,10 +18,6 @@
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="com.google.gson" version="2.10.1"/>
 			<unit id="com.google.inject" version="7.0.0"/>

diff --git a/...MavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target b/...MavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
@@ -18,10 +18,6 @@
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="com.google.gson" version="2.10.1"/>
 			<unit id="com.google.inject" version="7.0.0"/>

diff --git a/...tjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target b/...tjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
@@ -18,10 +18,6 @@
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="com.google.gson" version="2.10.1"/>
 			<unit id="com.google.inject" version="7.0.0"/>

diff --git a/...zard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target b/...zard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
@@ -18,10 +18,6 @@
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="com.google.gson" version="2.10.1"/>
 			<unit id="com.google.inject" version="7.0.0"/>

diff --git a/...tions/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target b/...tions/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target
@@ -18,10 +18,6 @@
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="com.google.gson" version="2.10.1"/>
 			<unit id="com.google.inject" version="7.0.0"/>

diff --git a/...ectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target b/...ectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
@@ -18,10 +18,6 @@
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="com.google.gson" version="2.10.1"/>
 			<unit id="com.google.inject" version="7.0.0"/>

diff --git a/...venTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target b/...venTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target
@@ -18,10 +18,6 @@
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="com.google.gson" version="2.10.1"/>
 			<unit id="com.google.inject" version="7.0.0"/>

diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF
@@ -51,7 +51,6 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0",
  com.google.guava;bundle-version="[32.1.2,33.0.0)";visibility:=reexport,
  com.google.inject;bundle-version="7.0.0";visibility:=reexport,
  com.google.guava.failureaccess;bundle-version="1.0.1";visibility:=reexport,
- javax.inject;bundle-version="1.0.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
  jakarta.inject.jakarta.inject-api;bundle-version="2.0.1";resolution:=optional;visibility:=reexport;x-installation:=greedy,
  org.eclipse.xtend.lib
 Import-Package: org.apache.log4j;version="1.2.24"

diff --git a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF
@@ -21,8 +21,7 @@ Require-Bundle: org.eclipse.xtext.xbase,
 Bundle-Vendor: Eclipse Xtext
 Export-Package: org.eclipse.xtext.xbase.tests,
  org.eclipse.xtext.xbase.tests.interpreter
-Import-Package: javax.inject;version="1.0.0",
- jakarta.inject;version="2.0.0",
+Import-Package: jakarta.inject;version="2.0.0",
  org.apache.log4j;version="1.2.24",
  org.junit;version="4.13.2",
  org.junit.rules;version="4.13.2",

diff --git a/...eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/...eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
@@ -85,10 +85,6 @@ class TargetPlatformProject extends ProjectDescriptor {
 						<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/«config.xtextVersion»/"/>
 					«ENDIF»
 				</location>
-				<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-					<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-					<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-				</location>
 				<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 					<unit id="com.google.gson" version="2.10.1"/>
 					<unit id="com.google.inject" version="7.0.0"/>

diff --git a/...se.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/...se.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
@@ -185,18 +185,6 @@ public CharSequence target() {
     _builder.append("<location includeAllPlatforms=\"false\" includeConfigurePhase=\"false\" includeMode=\"planner\" includeSource=\"true\" type=\"InstallableUnit\">");
     _builder.newLine();
     _builder.append("\t\t\t");
-    _builder.append("<repository location=\"https://download.eclipse.org/oomph/simrel-orbit/2023-06\"/>");
-    _builder.newLine();
-    _builder.append("\t\t\t");
-    _builder.append("<unit id=\"javax.inject\" version=\"1.0.0.v20220405-0441\"/>");
-    _builder.newLine();
-    _builder.append("\t\t");
-    _builder.append("</location>");
-    _builder.newLine();
-    _builder.append("\t\t");
-    _builder.append("<location includeAllPlatforms=\"false\" includeConfigurePhase=\"false\" includeMode=\"planner\" includeSource=\"true\" type=\"InstallableUnit\">");
-    _builder.newLine();
-    _builder.append("\t\t\t");
     _builder.append("<unit id=\"com.google.gson\" version=\"2.10.1\"/>");
     _builder.newLine();
     _builder.append("\t\t\t");

diff --git a/xtext-latest.target b/xtext-latest.target
@@ -47,10 +47,6 @@
 			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/technology/swtbot/releases/4.0.0/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>

diff --git a/xtext-r202203.target b/xtext-r202203.target
@@ -72,7 +72,6 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
 			<unit id="org.apiguardian" version="0.0.0"/>
 			<unit id="org.junit.jupiter.api" version="0.0.0"/>
 			<unit id="org.junit.jupiter.engine" version="0.0.0"/>

diff --git a/xtext-r202206.target b/xtext-r202206.target
@@ -71,7 +71,6 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
 			<unit id="org.apiguardian" version="0.0.0"/>
 			<unit id="org.junit.jupiter.api" version="0.0.0"/>
 			<unit id="org.junit.jupiter.engine" version="0.0.0"/>

diff --git a/xtext-r202209.target b/xtext-r202209.target
@@ -49,10 +49,6 @@
 			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/technology/swtbot/releases/2.6.0/" />
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>

diff --git a/xtext-r202212.target b/xtext-r202212.target
@@ -49,10 +49,6 @@
 			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/technology/swtbot/releases/2.6.0/" />
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>

diff --git a/xtext-r202303.target b/xtext-r202303.target
@@ -49,10 +49,6 @@
 			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/technology/swtbot/releases/4.0.0/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>

diff --git a/xtext-r202306.target b/xtext-r202306.target
@@ -49,10 +49,6 @@
 			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/technology/swtbot/releases/4.0.0/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
-			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>