Merge pull request #1164 from eclipse-passage/1163

Remove com.fasterxml.jackson.core bundles from LIC JSON feature #1163

bundles/org.eclipse.passage.lic.json/META-INF/MANIFEST.MF

@@ -2,14 +2,19 @@ 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.200.qualifier
+Bundle-Version: 1.1.300.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-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.passage.lic.net;bundle-version="0.0.0"
+Require-Bundle: org.eclipse.passage.lic.net;bundle-version="0.0.0"
 Export-Package: org.eclipse.passage.lic.internal.json;x-internal:=true
+Import-Package: com.fasterxml.jackson.annotation;version="0.0.0",
+ com.fasterxml.jackson.core;version="0.0.0",
+ com.fasterxml.jackson.databind;version="0.0.0",
+ com.fasterxml.jackson.databind.cfg;version="0.0.0",
+ com.fasterxml.jackson.databind.deser.std;version="0.0.0",
+ com.fasterxml.jackson.databind.introspect;version="0.0.0",
+ com.fasterxml.jackson.databind.module;version="0.0.0",
+ com.fasterxml.jackson.databind.ser.std;version="0.0.0"
 Bundle-ActivationPolicy: lazy

bundles/org.eclipse.passage.lic.json/OSGI-INF/l10n/bundle.properties

@@ -1,6 +1,6 @@
 #Properties file for org.eclipse.passage.lic.json
 ###############################################################################
-# Copyright (c) 2018, 2021 ArSysOp and others
+# Copyright (c) 2018, 2022 ArSysOp and others
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -14,7 +14,7 @@
 
 Bundle-Name = Passage LIC JSON
 Bundle-Vendor = Eclipse Passage
-Bundle-Copyright = Copyright (c) 2018, 2021 ArSysOp and others.\n\
+Bundle-Copyright = Copyright (c) 2018, 2022 ArSysOp and others.\n\
 \n\
 This program and the accompanying materials are made\n\
 available under the terms of the Eclipse Public License 2.0\n\

bundles/org.eclipse.passage.lic.json/about.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2020 ArSysOp and others
+# Copyright (c) 2020, 2022 ArSysOp and others
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -20,5 +20,5 @@ blurb=Passage Licensing Integration Components: JSON support\n\
 \n\
 Version: {featureVersion}\n\
 \n\
-Copyright (c) 2018, 2020 ArSysOp and others. All rights reserved.\n\
+Copyright (c) 2018, 2022 ArSysOp and others. All rights reserved.\n\
 Visit http://www.eclipse.org/passage

features/org.eclipse.passage.lic.json.feature/feature.xml

@@ -44,25 +44,4 @@
          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>

releng/org.eclipse.passage.ldc.repository/category.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2019, 2020 ArSysOp and others
+ Copyright (c) 2019, 2022 ArSysOp and others
  This program and the accompanying materials are made available under the
  terms of the Eclipse Public License 2.0 which is available at
  https://www.eclipse.org/legal/epl-2.0/.
@@ -35,8 +35,22 @@
 		id="org.eclipse.passage.ldc.feature.source">
 		<category name="org.eclipse.passage.ldc.category.source" />
 	</feature>
-	<bundle id="org.slf4j.api"/>
-	<bundle id="org.slf4j.api.source"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-annotations"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-annotations.source"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-core"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-core.source"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-databind"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-databind.source"/>
 	<bundle id="org.apache.logging.log4j"/>
 	<bundle id="org.apache.logging.log4j.source"/>
+	<bundle id="org.bouncycastle.bcpg" />
+	<bundle id="org.bouncycastle.bcpg.source" />
+	<bundle id="org.bouncycastle.bcpkix" />
+	<bundle id="org.bouncycastle.bcpkix.source" />
+	<bundle id="org.bouncycastle.bcprov" />
+	<bundle id="org.bouncycastle.bcprov.source" />
+	<bundle id="org.bouncycastle.bcutil" />
+	<bundle id="org.bouncycastle.bcutil.source" />
+	<bundle id="org.slf4j.api"/>
+	<bundle id="org.slf4j.api.source"/>
 </site>

releng/org.eclipse.passage.lic.repository/category.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2018, 2020 ArSysOp and others
+	Copyright (c) 2018, 2022 ArSysOp and others
 
 	This program and the accompanying materials are made available under the
 	terms of the Eclipse Public License 2.0 which is available at
@@ -69,6 +69,12 @@
 		id="org.eclipse.passage.lic.jetty.feature.source">
 		<category name="org.eclipse.passage.lic.category.source" />
 	</feature>
+	<bundle id="com.fasterxml.jackson.core.jackson-annotations"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-annotations.source"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-core"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-core.source"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-databind"/>
+	<bundle id="com.fasterxml.jackson.core.jackson-databind.source"/>
 	<bundle id="org.apache.logging.log4j"/>
 	<bundle id="org.apache.logging.log4j.source"/>
 	<bundle id="org.bouncycastle.bcpg" />