Skip to content

Commit

Permalink
Switch to log4j 2.17.1 #1018
Browse files Browse the repository at this point in the history 
Use Orbit I20220131095416
Increase required version of log4j to 2.17.1
Add log4j to lic.equinox feature

Signed-off-by: Alexander Fedorov <[email protected]>
  • Loading branch information
@ruspl-afed
ruspl-afed committed Feb 2, 2022
1 parent 182322a commit c25a2cf
Show file tree
Hide file tree
Showing 16 changed files with 29 additions and 21 deletions.
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.loc.licenses.core/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.loc.operator.seal/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.loc.products.core/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.loc.products.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 7 additions & 0 deletions features/org.eclipse.passage.lic.equinox.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion releng/org.eclipse.passage.releng/passage.setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
6 changes: 3 additions & 3 deletions releng/org.eclipse.passage.target/org.eclipse.passage.target.target
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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/"/>
Expand Down Expand Up @@ -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"/>
Expand Down

0 comments on commit c25a2cf

Please sign in to comment.