Degrade apache log4j to 1.2.19.v20220208-1728

bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF

@@ -19,7 +19,7 @@ Export-Package: org.eclipse.passage.lbc.internal.base;x-friends:="org.eclipse.pa
  org.eclipse.passage.lbc.internal.base.api;x-internal:=true,
  org.eclipse.passage.lbc.internal.base.interaction;x-friends:="org.eclipse.passage.lbc.jetty",
  org.eclipse.passage.lbc.internal.base.mine;x-friends:="org.eclipse.passage.lbc.base.tests,org.eclipse.passage.lic.hc.tests"
-Import-Package: org.apache.logging.log4j;version="2.17.1"
+Import-Package: org.apache.log4j;version="1.2.19"
 Bundle-ActivationPolicy: lazy
 Provide-Capability: licensing.feature;licensing.feature="org.eclipse.passage.lbc.acquire.concurrent";version="2.6.1";name="FLS: Concurrent access to a feature grant for several users";level="info";provider="Eclipse Passage",
  licensing.feature;licensing.feature="org.eclipse.passage.lbc.acquire.concurrent.full";version="2.6.1";name="FLS: Concurrent access to a feature grant for any amount of users";level="error";provider="Eclipse Passage"

bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/acquire/Acquisition.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2022 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -16,8 +16,8 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.passage.lbc.internal.base.DecodedRequest;
 import org.eclipse.passage.lbc.internal.base.EncodedResponse;

bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/acquire/DefaultGrantsStorage.java

@@ -21,8 +21,8 @@
 import java.util.UUID;
 import java.util.function.Consumer;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.passage.lic.api.LicensedProduct;
 import org.eclipse.passage.lic.licenses.model.api.FeatureGrant;
 import org.eclipse.passage.lic.licenses.model.api.GrantAcqisition;

bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/acquire/FeatureGrants.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2022 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -19,8 +19,8 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.passage.lbc.internal.base.api.FlsGear;
 import org.eclipse.passage.lbc.internal.base.api.FlsGearAwre;
 import org.eclipse.passage.lic.api.LicensedProduct;

bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/acquire/LicensePacks.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2022 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -19,8 +19,8 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.passage.lic.api.LicensedProduct;
 import org.eclipse.passage.lic.api.LicensingException;
 import org.eclipse.passage.lic.api.io.KeyKeeper;

bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/acquire/ProtectedGrantCapacity.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 ArSysOp
+ * Copyright (c) 2021, 2022 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -14,8 +14,8 @@
 
 import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.passage.lic.equinox.EquinoxPassage;
 import org.eclipse.passage.lic.licenses.model.api.FeatureGrant;
 

bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/Conditions.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2022 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -16,8 +16,8 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.passage.lbc.internal.base.EncodedResponse;
 import org.eclipse.passage.lbc.internal.base.api.RawRequest;

bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/ReassemblingMiningTool.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2022 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -18,8 +18,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.passage.lbc.internal.base.i18n.BaseMessages;
 import org.eclipse.passage.lic.api.LicensedProduct;
 import org.eclipse.passage.lic.api.LicensingException;

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

@@ -30,4 +30,4 @@ Export-Package: org.eclipse.passage.lic.base,
  org.eclipse.passage.lic.internal.base.observatory;x-internal:=true,
  org.eclipse.passage.lic.internal.base.requirements;x-internal:=true,
  org.eclipse.passage.lic.internal.base.time;x-friends:="org.eclipse.passage.lic.base.tests"
-Import-Package: org.apache.logging.log4j;version="2.17.1"
+Import-Package: org.apache.log4j;version="1.2.19"

bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/access/Residence.java

@@ -24,8 +24,8 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.passage.lic.api.acquire.GrantAcquisition;
 
 final class Residence {

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

@@ -24,7 +24,7 @@ Export-Package: org.eclipse.passage.lic.equinox,
    org.eclipse.passage.loc.licenses.core,
    org.eclipse.passage.loc.users.core",
  org.eclipse.passage.lic.internal.equinox.i18n;x-internal:=true
-Import-Package: org.apache.logging.log4j;version="2.17.1",
+Import-Package: org.apache.log4j;version="1.2.19",
  org.osgi.service.component.runtime;version="1.0.0",
  org.osgi.service.component.runtime.dto;version="1.0.0",
  org.osgi.service.event;version="1.0.0"

bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/GearAware.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 ArSysOp
+ * Copyright (c) 2021, 2022 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -16,8 +16,8 @@
 import java.util.Collections;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.passage.lic.api.Gear;
 import org.eclipse.passage.lic.api.GearSupplier;
 import org.eclipse.passage.lic.api.LicensingException;

bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/LicenseProtection.java

@@ -15,8 +15,8 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.passage.lic.api.LicensedProduct;
 import org.eclipse.passage.lic.api.ServiceInvocationResult;
 import org.eclipse.passage.lic.api.access.GrantLockAttempt;

bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/ServiceExtensions.java

@@ -19,8 +19,8 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;

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

@@ -18,5 +18,4 @@ Require-Bundle: org.eclipse.passage.lic.api;bundle-version="0.0.0",
  org.eclipse.passage.lic.oshi;bundle-version="0.0.0"
 Export-Package: org.eclipse.passage.lic.execute,
  org.eclipse.passage.lic.internal.execute;x-internal:=true
-Import-Package: org.apache.logging.log4j;version="2.17.1",
- org.apache.logging.log4j.core.config;version="2.17.1"
+Import-Package: org.apache.log4j;version="1.2.19"

bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/DefaultFramework.java

@@ -15,8 +15,8 @@
 import java.io.InputStream;
 import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.passage.lic.api.AccessCycleConfiguration;
 import org.eclipse.passage.lic.api.LicensedProduct;
 import org.eclipse.passage.lic.api.LicensingException;

bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/internal/execute/Logging.java

@@ -14,8 +14,7 @@
 
 import java.io.InputStream;
 
-import org.apache.logging.log4j.core.config.ConfigurationSource;
-import org.apache.logging.log4j.core.config.Configurator;
+import org.apache.log4j.PropertyConfigurator;
 
 public final class Logging {
 
@@ -28,9 +27,7 @@ public Logging(ConfigSupplier config) {
 	@SuppressWarnings("resource")
 	public void configure() {
 		try (InputStream configuration = config.get()) {
-			System.setProperty("org.apache.logging.log4j.simplelog.StatusLogger.level", "ERROR"); //$NON-NLS-1$//$NON-NLS-2$
-			ConfigurationSource source = new ConfigurationSource(configuration);
-			Configurator.initialize(getClass().getClassLoader().getParent(), source);
+			PropertyConfigurator.configure(config.get());
 		} catch (Exception e) {
 			System.err.println("Failed to configure logging"); //$NON-NLS-1$
 			e.printStackTrace();

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;singleton:=true
-Bundle-Version: 0.1.400.qualifier
+Bundle-Version: 0.1.401.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
@@ -17,5 +17,5 @@ Export-Package: org.eclipse.passage.lic.internal.jetty;x-friends:="org.eclipse.p
  org.eclipse.passage.lic.internal.jetty.interaction;x-friends:="org.eclipse.passage.lbc.jetty"
 Import-Package: javax.servlet,
  javax.servlet.http,
- org.apache.logging.log4j;version="2.17.1"
+ org.apache.log4j;version="1.2.19"
 Bundle-ActivationPolicy: lazy

bundles/org.eclipse.passage.lic.jetty/src/org/eclipse/passage/lic/internal/jetty/JettyServer.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 ArSysOp
+ * Copyright (c) 2021, 2022 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -17,12 +17,12 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.passage.lic.internal.jetty.i18n.Messages;
-import org.eclipse.passage.lic.internal.net.connect.Port;
 import org.eclipse.passage.lic.internal.net.connect.BindAddress;
+import org.eclipse.passage.lic.internal.net.connect.Port;
 
 public final class JettyServer {
 
@@ -37,8 +37,7 @@ public JettyServer(Supplier<JettyHandler> handler) {
 
 	public void launch(BindAddress listen, Port port) throws JettyException {
 		try {
-			InetSocketAddress address = InetSocketAddress.createUnresolved(listen.get().get(),
-					port.get().get());
+			InetSocketAddress address = InetSocketAddress.createUnresolved(listen.get().get(), port.get().get());
 			server = Optional.of(new Server(address));
 			server.get().setHandler(handler.get());
 			server.get().start();

bundles/org.eclipse.passage.lic.jetty/src/org/eclipse/passage/lic/internal/jetty/interaction/ServerHandles.java

@@ -15,8 +15,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.passage.lic.equinox.access.LicenseProtection;
 import org.eclipse.passage.lic.internal.jetty.JettyException;
 import org.eclipse.passage.lic.internal.jetty.JettyServer;

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

@@ -32,5 +32,5 @@ Export-Package: org.eclipse.passage.lic.internal.jface.dialogs.licensing;x-frien
    org.eclipse.passage.loc.edit.ui,
    org.eclipse.passage.lic.agreements.e4.ui",
  org.eclipse.passage.lic.jface.widgets;x-friends:="org.eclipse.passage.loc.workbench"
-Import-Package: org.apache.logging.log4j;version="2.17.1"
+Import-Package: org.apache.log4j;version="1.2.19"
 Bundle-ActivationPolicy: lazy

bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/AgreementsWizard.java

@@ -15,8 +15,8 @@
 import java.util.Collection;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.passage.lic.api.Framework;

bundles/org.eclipse.passage.lic.net/.settings/.api_filters

@@ -7,6 +7,12 @@
                 <message_argument value="2.2.1"/>
             </message_arguments>
         </filter>
+        <filter id="923795461">
+            <message_arguments>
+                <message_argument value="2.6.1"/>
+                <message_argument value="2.5.0"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="META-INF/MANIFEST.MF" type="META-INF.versions.9.org.apache.logging.log4j.core.util.SystemClock">
         <filter comment="apache logging should not be re-exported" id="305422471">
@@ -48,4 +54,36 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="src/org/eclipse/passage/lic/internal/net/connect/BindAddress.java" type="org.eclipse.passage.lic.internal.net.connect.BindAddress">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.internal.net.connect.BindAddress"/>
+                <message_argument value="org.eclipse.passage.lic.net_2.6.1"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/passage/lic/internal/net/connect/CliParameter.java" type="org.eclipse.passage.lic.internal.net.connect.CliParameter">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.internal.net.connect.CliParameter"/>
+                <message_argument value="org.eclipse.passage.lic.net_2.6.1"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/passage/lic/internal/net/connect/Port.java" type="org.eclipse.passage.lic.internal.net.connect.Port">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.internal.net.connect.Port"/>
+                <message_argument value="org.eclipse.passage.lic.net_2.6.1"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/passage/lic/internal/net/connect/Storage.java" type="org.eclipse.passage.lic.internal.net.connect.Storage">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.internal.net.connect.Storage"/>
+                <message_argument value="org.eclipse.passage.lic.net_2.6.1"/>
+            </message_arguments>
+        </filter>
+    </resource>
 </component>

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

@@ -26,7 +26,7 @@ Export-Package: org.eclipse.passage.lic.internal.net;
    org.eclipse.passage.lbc.base.tests,
    org.eclipse.passage.lbc.jetty,
    org.eclipse.passage.lic.jetty",
- org.eclipse.passage.lic.internal.net.connect,
+ org.eclipse.passage.lic.internal.net.connect;x-internal:=true,
  org.eclipse.passage.lic.internal.net.handle;
   x-friends:="org.eclipse.passage.lac,
    org.eclipse.passage.lac.gear,
@@ -35,5 +35,5 @@ Export-Package: org.eclipse.passage.lic.internal.net;
    org.eclipse.passage.lbc.jetty,
    org.eclipse.passage.lic.jetty",
  org.eclipse.passage.lic.internal.net.io;x-friends:="org.eclipse.passage.lbc.base,org.eclipse.passage.lic.hc"
-Import-Package: org.apache.logging.log4j;version="2.17.1"
+Import-Package: org.apache.log4j;version="1.2.19"
 Bundle-ActivationPolicy: lazy

bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/connect/CliParameter.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2022 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -15,8 +15,8 @@
 import java.util.Arrays;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.passage.lic.base.NamedData;