Merge pull request #337 from eclipse/cd_classgraph

first attempt to fix classpgraph issue
eclipse · Oct 30, 2023 · 0343856 · 0343856
2 parents 09e3848 + 6b2d7ab
commit 0343856
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/org.eclipse.xpect.releng/p2-repository/category.xml b/org.eclipse.xpect.releng/p2-repository/category.xml
@@ -14,8 +14,10 @@ Contributors:
 		version="0.3.0.qualifier">
 		<category name="Xpect 0.3.0" />
 	</feature>
+	<!--
 	<bundle id="io.github.classgraph" version="0.0.0"/>
 	<bundle id="io.github.classgraph.source" version="0.0.0"/>
+	-->
 	<bundle id="org.hamcrest.core" version="0.0.0"/>
 	<bundle id="org.hamcrest.core.source" version="0.0.0"/>
 	<bundle id="org.junit" version="0.0.0"/>

diff --git a/org.eclipse.xpect.xtext.lib.feature/feature.xml b/org.eclipse.xpect.xtext.lib.feature/feature.xml
@@ -33,7 +33,6 @@ Contributors:
       %license
    </license>
    <requires>
-      <import plugin="io.github.classgraph" version="4.8.35" match="compatible"/>
       <import plugin="org.junit" version="4.11.0" match="compatible"/>
    </requires>
    <plugin

diff --git a/org.eclipse.xpect/META-INF/MANIFEST.MF b/org.eclipse.xpect/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.emf.common,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.apache.log4j;bundle-version="1.2.24",
- io.github.classgraph;bundle-version="4.8.35";visibility:=reexport,
  org.junit;bundle-version="4.11.0";visibility:=reexport,
  org.eclipse.xtext.common.types;visibility:=reexport,
  org.apache.log4j;bundle-version="1.2.0";visibility:=reexport,
@@ -48,4 +47,5 @@ Export-Package: org.eclipse.xpect,
  org.eclipse.xpect.text,
  org.eclipse.xpect.util,
  org.eclipse.xpect.validation
-Import-Package: org.apache.log4j
+Import-Package: io.github.classgraph;version="4.8.149",
+ org.apache.log4j