[MAINTENANCE] Update pax-logging to the highest possible 1.x and stop using pax-logging-service

alien11689 · alien11689 · commit 96640bb1b978 · 2025-03-31T22:24:46.000+02:00
diff --git a/application/application-itests/pom.xml b/application/application-itests/pom.xml
@@ -69,7 +69,7 @@
         <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
         <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
         <pax-exam.version>4.13.5</pax-exam.version>
-        <pax-logging.version>2.2.9</pax-logging.version>
+        <pax-logging.version>1.12.12</pax-logging.version>
         <pax-url.version>2.6.16</pax-url.version>
     </properties>
 
@@ -96,7 +96,7 @@
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
+            <artifactId>pax-logging-log4j2</artifactId>
             <version>${pax-logging.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/application/application-resolve-transform-cm-itests/pom.xml b/application/application-resolve-transform-cm-itests/pom.xml
@@ -62,6 +62,7 @@
         <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
         <osgi.core.version>4.3.1</osgi.core.version>
         <pax-exam.version>4.13.5</pax-exam.version>
+        <pax-logging.version>1.12.12</pax-logging.version>
         <pax-swissbox.version>1.8.3</pax-swissbox.version>
         <pax-url.version>2.6.16</pax-url.version>
     </properties>
@@ -150,11 +151,13 @@
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
+            <version>${pax-logging.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
+            <artifactId>pax-logging-log4j2</artifactId>
+            <version>${pax-logging.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/application/application-tooling-repository-generator/pom.xml b/application/application-tooling-repository-generator/pom.xml
@@ -69,6 +69,7 @@
         <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
         <org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version>
         <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
+        <pax-logging.version>1.12.12</pax-logging.version>
         <services.version>3.1.200-v20070605</services.version>
     </properties>
 
@@ -94,11 +95,13 @@
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
+            <version>${pax-logging.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
+            <artifactId>pax-logging-log4j2</artifactId>
+            <version>${pax-logging.version}</version>
         </dependency>
 
         <dependency>
diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
@@ -65,7 +65,7 @@ public Option baseOptions() {
         return composite(
                 junitBundles(),
                 setPaxExamLogLevel("INFO"),
-                addPaxLoggingV2Bundles(),
+                addPaxLoggingBundles(),
                 addAsmBundles(),
                 configurePaxUrlLocalMavenRepoIfNeeded(),
                 systemProperty("pax.exam.osgi.unresolved.fail").value("true")
diff --git a/jmx/jmx-whiteboard/pom.xml b/jmx/jmx-whiteboard/pom.xml
@@ -80,14 +80,17 @@
             javax.management.MBeanServer
         </aries.osgi.import.service>
 
+        <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
         <javax.inject.version>1</javax.inject.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
         <mockito-core.version>4.11.0</mockito-core.version>
         <org.apache.aries.jmx.core.version>1.1.8</org.apache.aries.jmx.core.version>
+        <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
         <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
         <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
         <osgi.core.version>4.3.1</osgi.core.version>
         <pax-exam.version>4.13.5</pax-exam.version>
+        <pax-logging.version>1.12.12</pax-logging.version>
         <pax-tinybundles.version>2.1.1</pax-tinybundles.version>
         <pax-url.version>2.6.16</pax-url.version>
     </properties>
@@ -128,6 +131,20 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>depends-maven-plugin</artifactId>
+                <!-- TODO ARIES-2165: remove configuration when the newest parent pom is used -->
+                <version>${depends-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-depends-file</id>
+                        <goals>
+                            <goal>generate-depends-file</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -214,11 +231,38 @@
             <version>${pax-tinybundles.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <version>${pax-logging.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-log4j2</artifactId>
+            <version>${pax-logging.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
             <version>${javax.inject.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.configadmin</artifactId>
+            <version>${org.apache.felix.configadmin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.compendium</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java
@@ -86,10 +86,10 @@ public static Option[] configuration() {
                 junitBundles(),
 
                 bundle(bundleFile.toURI().toString()),
-                mavenBundle("org.ops4j.pax.tinybundles", "tinybundles", "2.0.0"),
-                mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.9.26"),
-                mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"),
-                mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.7.2"));
+                mavenBundle("org.ops4j.pax.tinybundles", "tinybundles").versionAsInProject(),
+                mavenBundle("org.apache.felix", "org.apache.felix.configadmin").versionAsInProject(),
+                mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
+                mavenBundle("org.ops4j.pax.logging", "pax-logging-log4j2").versionAsInProject());
 
         return options;
     }
diff --git a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
@@ -132,7 +132,7 @@ private String getTestServletResponse() throws IOException {
     public Option baseOptions() {
         return composite(
                 junitBundles(),
-                addPaxLoggingV2Bundles(),
+                addPaxLoggingBundles(),
                 setPaxExamLogLevel("INFO"),
                 configurePaxUrlLocalMavenRepoIfNeeded()
         );
diff --git a/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java b/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
@@ -290,7 +290,7 @@ private void assertCalled(TestListener listener, boolean pre, boolean post, bool
   protected Option proxyOptions() {
       return composite(
               junitBundles(),
-              addPaxLoggingV2Bundles(),
+              addPaxLoggingBundles(),
               setPaxExamLogLevel("INFO"),
               configurePaxUrlLocalMavenRepoIfNeeded(),
               addAsmBundles(),
diff --git a/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java b/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
@@ -281,7 +281,7 @@ public Option baseOptions() {
         return composite(
                 junitBundles(),
                 setPaxExamLogLevel("INFO"),
-                addPaxLoggingV2Bundles(),
+                addPaxLoggingBundles(),
                 configurePaxUrlLocalMavenRepoIfNeeded(),
                 setupRemoteDebugging()
         );
diff --git a/samples/ariestrader/assemblies/equinox-test-harness/pom.xml b/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
@@ -60,7 +60,7 @@
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
+            <artifactId>pax-logging-log4j2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
diff --git a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
@@ -23,7 +23,7 @@ asm-commons-${asm.version}.jar@start,\
 asm-tree-${asm.version}.jar@start,\
 asm-analysis-${asm.version}.jar@start,\
 pax-logging-api-${pax-logging.version}.jar@start,\
-pax-logging-service-${pax-logging.version}.jar@start,\
+pax-logging-log4j2-${pax-logging.version}.jar@start,\
 derby-${derby.version}.jar@start,\
 commons-collections-${commons-collections.version}.jar@start,\
 commons-lang-${commons-lang.version}.jar@start,\
diff --git a/samples/blog/blog-assembly/pom.xml b/samples/blog/blog-assembly/pom.xml
@@ -60,7 +60,7 @@
 
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
+            <artifactId>pax-logging-log4j2</artifactId>
         </dependency>
 
         <dependency>
diff --git a/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini b/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
@@ -23,7 +23,7 @@ asm-commons-${asm.version}.jar@start,\
 asm-tree-${asm.version}.jar@start,\
 asm-analysis-${asm.version}.jar@start,\
 pax-logging-api-${pax-logging.version}.jar@start,\
-pax-logging-service-${pax-logging.version}.jar@start,\
+pax-logging-log4j2-${pax-logging.version}.jar@start,\
 derby-${derby.version}.jar@start,\
 pax-web-jetty-bundle-${pax-web.version}.jar@start,\
 pax-web-extender-war-${pax-web.version}.jar@start,\
diff --git a/samples/blog/blog-itests/pom.xml b/samples/blog/blog-itests/pom.xml
@@ -33,7 +33,6 @@
     <properties>
         <cm.version>3.2.0-v20070116</cm.version>
         <commons-dbcp.version>1.4</commons-dbcp.version>
-        <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
         <java.source.version>8</java.source.version>
         <javax.inject.version>1</javax.inject.version>
         <logback.version>1.5.18</logback.version>
@@ -46,6 +45,8 @@
         <pax-web.version>4.4.2</pax-web.version>
         <services.version>3.1.200-v20070605</services.version>
         <pax-exam.version>4.13.5</pax-exam.version>
+        <!-- pax-logging 1.11.x does not support runtime 1.6 - eclipse upgrade needed -->
+        <pax-logging.version>1.10.10</pax-logging.version>
         <pax-swissbox.version>1.7.0</pax-swissbox.version>
         <pax-tinybundles.version>2.0.0</pax-tinybundles.version>
         <pax-url.version>2.6.16</pax-url.version>
@@ -479,6 +480,18 @@
             <artifactId>commons-dbcp</artifactId>
             <version>${commons-dbcp.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <version>${pax-logging.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-log4j2</artifactId>
+            <version>${pax-logging.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java
@@ -157,8 +157,8 @@ protected Option baseOptions() {
 		}
 		return composite(
 				junitBundles(),
-				mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"),
-				mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.7.2"),
+				mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
+				mavenBundle("org.ops4j.pax.logging", "pax-logging-log4j2").versionAsInProject(),
 //				mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
 				// this is how you set the default log level when using pax
 				// logging (logProfile)
@@ -175,7 +175,7 @@ public Option[] configuration() {
 				.value("javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.callback,javax.security.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax.xml.namespace,javax.xml.parsers,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage,org.omg.PortableServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers"),
 				// Log
 				//mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
-				//mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
+				//mavenBundle("org.ops4j.pax.logging", "pax-logging-log4j2").versionAsInProject(),
 				// Felix mvn url handler - do we need this?
 				//mavenBundle("org.ops4j.pax.url", "pax-url-aether").versionAsInProject(),
 
diff --git a/samples/blueprint/helloworld/helloworld-assembly/pom.xml b/samples/blueprint/helloworld/helloworld-assembly/pom.xml
@@ -61,7 +61,7 @@
 
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
+            <artifactId>pax-logging-log4j2</artifactId>
         </dependency>
 
         <dependency>
diff --git a/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini b/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
@@ -19,7 +19,7 @@ osgi.bundles=\
 cm-${cm.version}@start,\
 services-${services.version}@start,\
 pax-logging-api-${pax-logging.version}.jar@start,\
-pax-logging-service-${pax-logging.version}.jar@start,\
+pax-logging-log4j2-${pax-logging.version}.jar@start,\
 asm-${asm.version}.jar@start,\
 asm-commons-${asm.version}.jar@start,\
 asm-tree-${asm.version}.jar@start,\
diff --git a/samples/blueprint/helloworld/helloworld-itests/pom.xml b/samples/blueprint/helloworld/helloworld-itests/pom.xml
@@ -37,7 +37,7 @@
         <org.apache.aries.proxy.version>1.0.0</org.apache.aries.proxy.version>
         <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
         <pax-exam.version>4.13.5</pax-exam.version>
-        <pax-logging.version>1.7.2</pax-logging.version>
+        <pax-logging.version>1.12.12</pax-logging.version>
         <pax-url.version>2.6.16</pax-url.version>
         <services.version>3.1.200-v20070605</services.version>
     </properties>
@@ -150,7 +150,7 @@
 
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
+            <artifactId>pax-logging-log4j2</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java b/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java
@@ -164,7 +164,7 @@ public static Option[] configuration() {
                 
                 // Log
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
-                mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
+                mavenBundle("org.ops4j.pax.logging", "pax-logging-log4j2"),
 
                 mavenBundle("org.ops4j.pax.url", "pax-url-aether"),
 
diff --git a/samples/blueprint/idverifier/idverifier-assembly/pom.xml b/samples/blueprint/idverifier/idverifier-assembly/pom.xml
@@ -95,7 +95,7 @@
 
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
+            <artifactId>pax-logging-log4j2</artifactId>
         </dependency>
 
         <dependency>
diff --git a/samples/blueprint/idverifier/idverifier-assembly/src/main/filtered-resources/conf/config.properties b/samples/blueprint/idverifier/idverifier-assembly/src/main/filtered-resources/conf/config.properties
@@ -42,7 +42,7 @@ felix.auto.start.1=\
 felix.auto.start.2=\
 "file:bundles/org.apache.felix.bundlerepository-${org.apache.felix.bundlerepository.version}.jar" \
 "file:bundles/pax-logging-api-${pax-logging.version}.jar" \
-"file:bundles/pax-logging-service-${pax-logging.version}.jar" \
+"file:bundles/pax-logging-log4j2-${pax-logging.version}.jar" \
 "file:bundles/org.apache.felix.eventadmin-${org.apache.felix.eventadmin.version}.jar" \
 "file:bundles/org.apache.felix.configadmin-${org.apache.felix.configadmin.version}.jar" \
 "file:bundles/org.apache.aries.util-${org.apache.aries.util.version}.jar"
diff --git a/samples/pom.xml b/samples/pom.xml
@@ -138,7 +138,7 @@
         <javax.transaction-api.version>1.2</javax.transaction-api.version>
         <osgi.core.version>8.0.0</osgi.core.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <pax-logging.version>2.2.9</pax-logging.version>
+        <pax-logging.version>1.12.12</pax-logging.version>
 
         <!-- Aries dependencies -->
         <blueprint-maven-plugin-annotation.version>1.3.0</blueprint-maven-plugin-annotation.version>
@@ -246,7 +246,7 @@
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.logging</groupId>
-                <artifactId>pax-logging-service</artifactId>
+                <artifactId>pax-logging-log4j2</artifactId>
                 <version>${pax-logging.version}</version>
             </dependency>
             <dependency>
diff --git a/samples/twitter/twitter-itests/pom.xml b/samples/twitter/twitter-itests/pom.xml
@@ -41,6 +41,7 @@
         <org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version>
         <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
         <pax-exam.version>4.13.5</pax-exam.version>
+        <pax-logging.version>1.12.12</pax-logging.version>
         <pax-tinybundles.version>2.1.1</pax-tinybundles.version>
         <pax-url.version>2.6.16</pax-url.version>
     </properties>
@@ -251,6 +252,18 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <version>${pax-logging.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-log4j2</artifactId>
+            <version>${pax-logging.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
diff --git a/subsystem/subsystem-itests/pom.xml b/subsystem/subsystem-itests/pom.xml
diff --git a/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java b/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java
diff --git a/transaction/transaction-itests/pom.xml b/transaction/transaction-itests/pom.xml
diff --git a/tutorials/blueprint/tutorial-assembly/pom.xml b/tutorials/blueprint/tutorial-assembly/pom.xml
diff --git a/tutorials/blueprint/tutorial-assembly/src/main/filtered-resources/configuration/config.ini b/tutorials/blueprint/tutorial-assembly/src/main/filtered-resources/configuration/config.ini
diff --git a/tutorials/pom.xml b/tutorials/pom.xml
diff --git a/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java b/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java
