From fd70ede6ce49fd9aee1388983e2b09a2b7f94925 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sun, 27 Nov 2022 19:34:26 +0300 Subject: [PATCH] Remove com.fasterxml.jackson.core bundles from LIC JSON feature #1163 Move com.fasterxml.jackson.core bundles from feature to category.xml Switch from Require-Bundle to Import-Package for com.fasterxml.jackson.core bundles Signed-off-by: Alexander Fedorov --- .../META-INF/MANIFEST.MF | 13 ++++++++---- .../OSGI-INF/l10n/bundle.properties | 4 ++-- .../about.properties | 4 ++-- .../feature.xml | 21 ------------------- .../category.xml | 20 +++++++++++++++--- .../category.xml | 8 ++++++- 6 files changed, 37 insertions(+), 33 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 index ce06e8c9e..dff539a76 100644 --- a/bundles/org.eclipse.passage.lic.json/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.json/META-INF/MANIFEST.MF @@ -7,9 +7,14 @@ 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 diff --git a/bundles/org.eclipse.passage.lic.json/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.json/OSGI-INF/l10n/bundle.properties index 72e236976..c63108ad4 100644 --- a/bundles/org.eclipse.passage.lic.json/OSGI-INF/l10n/bundle.properties +++ b/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\ diff --git a/bundles/org.eclipse.passage.lic.json/about.properties b/bundles/org.eclipse.passage.lic.json/about.properties index 5d1208725..6e03ae064 100644 --- a/bundles/org.eclipse.passage.lic.json/about.properties +++ b/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 diff --git a/features/org.eclipse.passage.lic.json.feature/feature.xml b/features/org.eclipse.passage.lic.json.feature/feature.xml index c8a265b1f..346a1a83e 100644 --- a/features/org.eclipse.passage.lic.json.feature/feature.xml +++ b/features/org.eclipse.passage.lic.json.feature/feature.xml @@ -44,25 +44,4 @@ version="0.0.0" unpack="false"/> - - - - - - diff --git a/releng/org.eclipse.passage.ldc.repository/category.xml b/releng/org.eclipse.passage.ldc.repository/category.xml index a1e38622e..63d0667e9 100644 --- a/releng/org.eclipse.passage.ldc.repository/category.xml +++ b/releng/org.eclipse.passage.ldc.repository/category.xml @@ -1,6 +1,6 @@