Merge pull request #1021 from eclipse-passage/1020

Re-enable Eclipse Passage in SimRel #1020
eclipse-passage · Feb 2, 2022 · 632c58c · 632c58c
2 parents d81d19e + 273e717
commit 632c58c
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 8 deletions.
diff --git a/bundles/org.eclipse.passage.lic.json/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.json/META-INF/MANIFEST.MF
@@ -2,18 +2,14 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.lic.json
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.lic.json
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.apache.httpcomponents.httpcore;bundle-version="0.0.0",
- org.apache.httpcomponents.httpclient;bundle-version="0.0.0",
- com.fasterxml.jackson.core.jackson-annotations;bundle-version="0.0.0",
+Require-Bundle: com.fasterxml.jackson.core.jackson-annotations;bundle-version="0.0.0",
  com.fasterxml.jackson.core.jackson-core;bundle-version="0.0.0",
  com.fasterxml.jackson.core.jackson-databind;bundle-version="0.0.0",
- org.eclipse.osgi.services;bundle-version="0.0.0",
- org.eclipse.passage.lic.base;bundle-version="0.0.0",
  org.eclipse.passage.lic.net;bundle-version="0.0.0"
 Export-Package: org.eclipse.passage.lic.internal.json;x-internal:=true
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.mail/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.mail/META-INF/MANIFEST.MF
@@ -2,14 +2,13 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.lic.mail
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.lic.mail
-Bundle-Version: 0.2.100.qualifier
+Bundle-Version: 0.2.200.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: javax.activation;bundle-version="0.0.0",
  javax.mail;bundle-version="0.0.0",
- org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.osgi.services;bundle-version="0.0.0",
  org.eclipse.passage.lic.email;bundle-version="0.0.0";visibility:=reexport
 Export-Package: org.eclipse.passage.lic.internal.mail;x-internal=true

diff --git a/features/org.eclipse.passage.lic.bc.feature/feature.xml b/features/org.eclipse.passage.lic.bc.feature/feature.xml
@@ -57,6 +57,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.bouncycastle.bcutil"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.passage.lic.bc"
          download-size="0"

diff --git a/features/org.eclipse.passage.lic.json.feature/feature.xml b/features/org.eclipse.passage.lic.json.feature/feature.xml
@@ -44,4 +44,25 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.fasterxml.jackson.core.jackson-annotations"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.core.jackson-core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.core.jackson-databind"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.eclipse.passage.lic.mail.feature/feature.xml b/features/org.eclipse.passage.lic.mail.feature/feature.xml
@@ -42,4 +42,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="javax.activation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.mail"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/releng/org.eclipse.passage.parent/pom.xml b/releng/org.eclipse.passage.parent/pom.xml
@@ -594,6 +594,7 @@
 						</goals>
 						<configuration>
 							<excludes>
+								<plugin id="javax.mail" />
 								<plugin id="org.eclipse.passage.loc.operator" />
 								<plugin id="org.eclipse.passage.lbc.server" />
 								<plugin id="org.eclipse.passage.ldc" />