From c25a2cff97be2ef2972560eedfb29c303f7c35e2 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Wed, 2 Feb 2022 13:22:27 +0300 Subject: [PATCH 1/2] Switch to log4j 2.17.1 #1018 Use Orbit I20220131095416 Increase required version of log4j to 2.17.1 Add log4j to lic.equinox feature Signed-off-by: Alexander Fedorov --- bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF | 5 +++-- .../org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF | 8 ++++---- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.passage.lic.equinox.feature/feature.xml | 7 +++++++ releng/org.eclipse.passage.releng/passage.setup | 2 +- .../org.eclipse.passage.target.target | 6 +++--- 16 files changed, 29 insertions(+), 21 deletions(-) diff --git a/bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF index f914c5ecf..820ca40bd 100644 --- a/bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.osgi;bundle-version="0.0.0", org.eclipse.emf.ecore.xmi;bundle-version="0.0.0", org.eclipse.passage.lic.emf;bundle-version="0.0.0", org.eclipse.passage.lic.oshi;bundle-version="0.0.0", - org.apache.logging.log4j;bundle-version="2.17.0", + org.apache.logging.log4j;bundle-version="2.17.1", org.eclipse.passage.lic.equinox;bundle-version="0.0.0" Export-Package: org.eclipse.passage.lbc.internal.base;x-friends:="org.eclipse.passage.lbc.jetty,org.eclipse.passage.lbc.base.tests,org.eclipse.passage.lic.hc.tests", org.eclipse.passage.lbc.internal.base.acquire;x-friends:="org.eclipse.passage.lbc.base.tests,org.eclipse.passage.lic.hc.tests", diff --git a/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF index 8d038ff12..9711b52a4 100644 --- a/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.passage.lic.api;bundle-version="2.3.0";visibility:=reexport, - org.apache.logging.log4j;bundle-version="2.17.0" + org.apache.logging.log4j;bundle-version="2.17.1" Export-Package: org.eclipse.passage.lic.base, org.eclipse.passage.lic.base.access, org.eclipse.passage.lic.base.acquire, diff --git a/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF index 2b29e723d..cbd2f14fa 100644 --- a/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.osgi;bundle-version="0.0.0";visibility:=reexport, org.eclipse.core.runtime;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.api;bundle-version="2.3.0";visibility:=reexport, org.eclipse.passage.lic.base;bundle-version="2.3.0";visibility:=reexport, - org.apache.logging.log4j;bundle-version="2.17.0" + org.apache.logging.log4j;bundle-version="2.17.1" Export-Package: org.eclipse.passage.lic.equinox, org.eclipse.passage.lic.equinox.access;x-friends:="org.eclipse.passage.lic.jetty", org.eclipse.passage.lic.equinox.acquire, diff --git a/bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF index 1184a02a6..192af854e 100644 --- a/bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Require-Bundle: org.apache.logging.log4j;bundle-version="2.17.0", +Require-Bundle: org.apache.logging.log4j;bundle-version="2.17.1", org.eclipse.osgi.services;bundle-version="0.0.0", org.eclipse.passage.lic.api;bundle-version="2.3.0", org.eclipse.passage.lic.base;bundle-version="2.3.0", diff --git a/bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF index 38f9aadce..004f12922 100644 --- a/bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF @@ -8,13 +8,14 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: javax.servlet;bundle-version="0.0.0", + org.apache.logging.log4j;bundle-version="2.17.1", org.eclipse.core.runtime;bundle-version="0.0.0", org.eclipse.jetty.http;bundle-version="0.0.0", org.eclipse.jetty.server;bundle-version="0.0.0", org.eclipse.jetty.util;bundle-version="0.0.0", org.eclipse.osgi.services;bundle-version="0.0.0", - org.eclipse.passage.lic.net;bundle-version="0.0.0", - org.eclipse.passage.lic.equinox;bundle-version="0.0.0" + org.eclipse.passage.lic.equinox;bundle-version="0.0.0", + org.eclipse.passage.lic.net;bundle-version="0.0.0" Export-Package: org.eclipse.passage.lic.internal.jetty;x-friends:="org.eclipse.passage.lbc.base,org.eclipse.passage.lbc.jetty,org.eclipse.passage.lac.jetty", org.eclipse.passage.lic.internal.jetty.interaction;x-friends:="org.eclipse.passage.lbc.jetty" Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF index 1936bd06e..1858a9dbb 100644 --- a/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.osgi;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.api;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.base;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.equinox;bundle-version="0.0.0", - org.apache.logging.log4j;bundle-version="2.17.0" + org.apache.logging.log4j;bundle-version="2.17.1" Export-Package: org.eclipse.passage.lic.internal.jface.dialogs.licensing;x-friends:="org.eclipse.passage.lic.e4.ui,org.eclipse.passage.loc.dashboard.ui,org.eclipse.passage.loc.licenses.ui", org.eclipse.passage.lic.internal.jface.i18n;x-internal:=true, org.eclipse.passage.lic.jface;x-friends:="org.eclipse.passage.loc.workbench", diff --git a/bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF index c99246eb2..ed26ff903 100644 --- a/bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF @@ -7,11 +7,11 @@ Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="0.0.0", +Require-Bundle: org.apache.logging.log4j;bundle-version="2.17.1", + org.eclipse.emf.ecore.xmi;bundle-version="0.0.0", org.eclipse.passage.lic.base;bundle-version="2.3.0";visibility:=reexport, - org.apache.logging.log4j;bundle-version="2.17.0";visibility:=reexport, - org.eclipse.passage.lic.equinox;bundle-version="2.3.0", - org.eclipse.passage.lic.emf;bundle-version="2.3.0" + org.eclipse.passage.lic.emf;bundle-version="2.3.0", + org.eclipse.passage.lic.equinox;bundle-version="2.3.0" Export-Package: org.eclipse.passage.lic.internal.net; x-friends:="org.eclipse.passage.lbc.base, org.eclipse.passage.lic.hc, diff --git a/bundles/org.eclipse.passage.loc.licenses.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.licenses.core/META-INF/MANIFEST.MF index 5fdef8c74..3e04557f6 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.loc.licenses.core/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: org.apache.logging.log4j;bundle-version="2.17.0", +Require-Bundle: org.apache.logging.log4j;bundle-version="2.17.1", org.eclipse.osgi;bundle-version="0.0.0", org.eclipse.osgi.services;bundle-version="0.0.0", org.eclipse.passage.lic.base;bundle-version="0.0.0", diff --git a/bundles/org.eclipse.passage.loc.operator.seal/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.operator.seal/META-INF/MANIFEST.MF index 091b4ee1b..3a414a4de 100644 --- a/bundles/org.eclipse.passage.loc.operator.seal/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.loc.operator.seal/META-INF/MANIFEST.MF @@ -16,6 +16,6 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0", org.eclipse.passage.lic.execute;bundle-version="0.0.0", org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0", org.eclipse.passage.lic.oshi;bundle-version="0.0.0", - org.apache.logging.log4j;bundle-version="2.17.0" + org.apache.logging.log4j;bundle-version="2.17.1" Service-Component: OSGI-INF/*.xml diff --git a/bundles/org.eclipse.passage.loc.products.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.products.core/META-INF/MANIFEST.MF index 74a2dfc97..5f513156d 100644 --- a/bundles/org.eclipse.passage.loc.products.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.loc.products.core/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.e4.core.services;bundle-version="0.0.0", org.eclipse.passage.lic.products.model;bundle-version="0.0.0", org.eclipse.passage.loc.api;bundle-version="0.0.0", org.eclipse.passage.lic.keys.model;bundle-version="0.0.0", - org.apache.logging.log4j;bundle-version="2.17.0" + org.apache.logging.log4j;bundle-version="2.17.1" Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.passage.loc.internal.products; x-friends:="org.eclipse.passage.loc.products.emfforms, diff --git a/bundles/org.eclipse.passage.loc.products.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.products.ui/META-INF/MANIFEST.MF index ff9007928..71b381df1 100644 --- a/bundles/org.eclipse.passage.loc.products.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.loc.products.ui/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0", org.eclipse.passage.loc.products.core;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.loc.workbench;bundle-version="0.0.0", org.eclipse.passage.lic.keys.model;bundle-version="0.0.0", - org.apache.logging.log4j;bundle-version="2.17.0" + org.apache.logging.log4j;bundle-version="2.17.1" Import-Package: javax.inject;version="1.0.0" Export-Package: org.eclipse.passage.loc.internal.products.ui;x-friends:="org.eclipse.passage.loc.dashboard.ui", org.eclipse.passage.loc.internal.products.ui.i18n;x-internal:=true, diff --git a/bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF index 976e0b762..2092ee04a 100644 --- a/bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF @@ -35,7 +35,7 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0", org.eclipse.passage.loc.api;bundle-version="0.0.0", org.eclipse.passage.loc.workbench;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0", - org.apache.logging.log4j;bundle-version="2.17.0" + org.apache.logging.log4j;bundle-version="2.17.1" Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.passage.loc.internal.workbench.emfforms;x-internal:=true, org.eclipse.passage.loc.internal.workbench.emfforms.i18n;x-internal:=true, diff --git a/bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF index 4e0df5dc6..99247d95f 100644 --- a/bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF @@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0", org.eclipse.passage.lic.jface;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.products.model;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.loc.api;bundle-version="0.0.0", - org.apache.logging.log4j;bundle-version="2.17.0", + org.apache.logging.log4j;bundle-version="2.17.1", org.eclipse.passage.lic.e4.ui;bundle-version="0.0.0" Import-Package: javax.annotation;version="1.0.0";resolution:=optional, javax.inject;version="1.0.0" diff --git a/features/org.eclipse.passage.lic.equinox.feature/feature.xml b/features/org.eclipse.passage.lic.equinox.feature/feature.xml index e5bd51117..47310242e 100644 --- a/features/org.eclipse.passage.lic.equinox.feature/feature.xml +++ b/features/org.eclipse.passage.lic.equinox.feature/feature.xml @@ -53,4 +53,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/releng/org.eclipse.passage.releng/passage.setup b/releng/org.eclipse.passage.releng/passage.setup index 3f85fea15..37190aed1 100644 --- a/releng/org.eclipse.passage.releng/passage.setup +++ b/releng/org.eclipse.passage.releng/passage.setup @@ -353,7 +353,7 @@ + url="https://download.eclipse.org/tools/orbit/downloads/drops/I20220131095416/repository/"/> diff --git a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target index 80c7c504d..704d0a025 100644 --- a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target +++ b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target @@ -1,7 +1,7 @@ - + @@ -71,7 +71,7 @@ - + From 951ab7612e42de524734cebecf3cdd9d29bf1b6d Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Wed, 2 Feb 2022 13:50:20 +0300 Subject: [PATCH 2/2] Switch to log4j 2.17.1 #1018 Bump version for lic.jetty Signed-off-by: Alexander Fedorov --- bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF index 004f12922..3c5f8c003 100644 --- a/bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.jrtty Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.jetty -Bundle-Version: 0.1.100.qualifier +Bundle-Version: 0.1.200.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright