adjust required items

eclipse-mylyn · Mar 15, 2023 · 6997b22 · 6997b22
1 parent f5e1363
commit 6997b22
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 20 deletions.
diff --git a/mylyn.builds/org.eclipse.mylyn.builds.sdk-feature/feature.xml b/mylyn.builds/org.eclipse.mylyn.builds.sdk-feature/feature.xml
@@ -83,13 +83,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="javax.activation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.sun.xml.bind"
          download-size="0"

diff --git a/mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml b/mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
@@ -35,12 +35,9 @@
 
    <requires>
       <import plugin="com.google.gson" version="2.1.0" match="compatible"/>
-      <!-- Java 11 compatibility -->
       <import plugin="com.sun.xml.bind" version="2.3.3" match="equivalent"/>
       <import plugin="jakarta.xml.bind" version="2.3.3" match="equivalent"/>
-      <import plugin="javax.activation" version="2.0.0" match="equivalent"/>
       <import plugin="javax.xml.stream" version="1.0.1" match="equivalent"/>
-
       <import feature="org.eclipse.mylyn.builds" version="3.26.0" match="compatible"/>
       <import feature="org.eclipse.mylyn.commons.repositories.http" version="3.26.0" match="compatible"/>
    </requires>

diff --git a/mylyn.commons/org.eclipse.mylyn.commons.notifications-feature/feature.xml b/mylyn.commons/org.eclipse.mylyn.commons.notifications-feature/feature.xml
@@ -34,7 +34,6 @@
    </license>
 
    <requires>
-      <import plugin="jakarta.activation" version="1.2.2" match="greaterOrEqual"/>
       <import plugin="jakarta.xml.bind" version="2.3.3" match="equivalent"/>
       <import plugin="com.sun.xml.bind" version="2.3.3" match="equivalent"/>
       <import plugin="javax.xml.stream" version="1.0.1" match="equivalent"/>

diff --git a/mylyn.commons/org.eclipse.mylyn.commons.notifications.tests/META-INF/MANIFEST.MF b/mylyn.commons/org.eclipse.mylyn.commons.notifications.tests/META-INF/MANIFEST.MF
@@ -14,5 +14,4 @@ Require-Bundle: com.sun.xml.bind;bundle-version="2.3.3",
 Export-Package: org.eclipse.mylyn.commons.notifications.tests;x-internal:=true,
  org.eclipse.mylyn.commons.notifications.tests.core;x-internal:=true,
  org.eclipse.mylyn.commons.notifications.tests.feed;x-internal:=true
-Import-Package: javax.activation;version="1.2.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/feature.xml b/mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/feature.xml
@@ -298,16 +298,9 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
-   <plugin
-         id="jakarta.xml.bind"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
    <plugin
-         id="javax.activation"
+         id="jakarta.xml.bind"
          download-size="0"
          install-size="0"
          version="0.0.0"