Merge pull request #362 from mehmet-karaman/xpect_apache_commons_logg…

…in_dep_prob #361 fix xpect apache commons logging dependency problem
eclipse · Sep 30, 2024 · 526ec3a · 526ec3a
2 parents a34c190 + bc16164
commit 526ec3a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/...eclipse_2023_03-xtext_2_31_0/org.eclipse.xpect.target.eclipse_2023_03-xtext_2_31_0.target b/...eclipse_2023_03-xtext_2_31_0/org.eclipse.xpect.target.eclipse_2023_03-xtext_2_31_0.target
@@ -44,5 +44,10 @@
 			<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
 			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
 		</location>
+
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12"/>
+		</location>
 	</locations>
 </target>
diff --git a/...lipse_2024_06-xtext_nightly/org.eclipse.xpect.target.eclipse_2023_09-xtext_nightly.target b/...lipse_2024_06-xtext_nightly/org.eclipse.xpect.target.eclipse_2023_09-xtext_nightly.target
@@ -36,5 +36,10 @@
 <unit id="io.github.classgraph" version="0.0.0"/>
 <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
 </location>
+
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12"/>
+</location>
 </locations>
 </target>
diff --git a/...clipse.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics/build.properties b/...clipse.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics/build.properties
@@ -12,5 +12,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.eclipse.emf.mwe2.launch,\
                      org.eclipse.emf.mwe2.lib,\
                      org.objectweb.asm,\
-                     org.apache.commons.logging,\
+                     org.apache.commons.commons-logging,\
                      org.apache.log4j
diff --git a/...clipse.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel/build.properties b/...clipse.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel/build.properties
@@ -15,5 +15,5 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.eclipse.emf.mwe2.launch,\
                      org.eclipse.emf.mwe2.lib,\
                      org.objectweb.asm,\
-                     org.apache.commons.logging,\
+                     org.apache.commons.commons-logging,\
                      org.apache.log4j
diff --git a/org.eclipse.xpect/build.properties b/org.eclipse.xpect/build.properties
@@ -15,5 +15,5 @@ additional.bundles = org.eclipse.xpect.mwe2,\
                      org.eclipse.emf.mwe2.launch,\
                      org.eclipse.emf.mwe2.lib,\
                      org.objectweb.asm,\
-                     org.apache.commons.logging,\
+                     org.apache.commons.commons-logging,\
                      org.apache.log4j