Merge pull request #1019 from eclipse-passage/1018

Switch to log4j 2.17.1 #1018
eclipse-passage · Feb 2, 2022 · d81d19e · d81d19e
2 parents 182322a + 951ab76
commit d81d19e
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 22 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,19 +2,20 @@ 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
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -53,4 +53,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.logging.log4j"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/releng/org.eclipse.passage.releng/passage.setup b/releng/org.eclipse.passage.releng/passage.setup
@@ -353,7 +353,7 @@
           <repository
               url="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952/"/>
           <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/drops/I20211220095033/repository/"/>
+              url="https://download.eclipse.org/tools/orbit/downloads/drops/I20220131095416/repository/"/>
         </repositoryList>
         <repositoryList
             name="2021-09">

diff --git 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
 <!--
-	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
@@ -12,7 +12,7 @@
 	Contributors:
 		ArSysOp - initial API and implementation
 -->
-<target name="org.eclipse.passage.target" sequenceNumber="101">
+<target name="org.eclipse.passage.target" sequenceNumber="102">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/cbi/updates/license/"/>
@@ -71,7 +71,7 @@
 			<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20211220095033/repository/"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20220131095416/repository/"/>
 			<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
 			<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
 			<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>