You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2022/05/02 02:34:04 UTC

[logging-log4j2] branch master updated (0eac511bdc -> bbf0027d96)

This is an automated email from the ASF dual-hosted git repository.

mattsicker pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


    from 0eac511bdc Revert "Enable parallel builds in CI"
     new a99a01c5cb Simplify pom files
     new bbf0027d96 Rearrange module listing

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 log4j-plugins-test/pom.xml | 34 ++----------------
 log4j-plugins/pom.xml      | 15 +++-----
 log4j-script/pom.xml       | 46 ------------------------
 pom.xml                    | 88 ++++++++++++++++++++++++++++++++++------------
 4 files changed, 73 insertions(+), 110 deletions(-)


[logging-log4j2] 01/02: Simplify pom files

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit a99a01c5cb3cb393ad43e98c0c9efc4413d13ed9
Author: Matt Sicker <ma...@apache.org>
AuthorDate: Sun May 1 21:33:31 2022 -0500

    Simplify pom files
    
    Redundant entries removed.
    
    Signed-off-by: Matt Sicker <ma...@apache.org>
---
 log4j-plugins-test/pom.xml | 34 +++-------------------------------
 log4j-plugins/pom.xml      | 15 ++++-----------
 log4j-script/pom.xml       | 46 ----------------------------------------------
 3 files changed, 7 insertions(+), 88 deletions(-)

diff --git a/log4j-plugins-test/pom.xml b/log4j-plugins-test/pom.xml
index 84a4e02c5f..4f1182f942 100644
--- a/log4j-plugins-test/pom.xml
+++ b/log4j-plugins-test/pom.xml
@@ -151,9 +151,9 @@
           <execution>
             <id>default-testCompile</id>
             <configuration>
-              <compilerArgs>
-                <arg>-ApluginPackage=org.apache.logging.log4j.plugins.convert.test</arg>
-              </compilerArgs>
+              <compilerArguments>
+                <ApluginPackage>org.apache.logging.log4j.plugins.convert.test</ApluginPackage>
+              </compilerArguments>
             </configuration>
           </execution>
         </executions>
@@ -162,12 +162,6 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <useModulePath>false</useModulePath>
-          <excludedGroups>
-            org.apache.logging.log4j.categories.PerformanceTests
-          </excludedGroups>
-          <systemPropertyVariables>
-            <org.apache.activemq.SERIALIZABLE_PACKAGES>*</org.apache.activemq.SERIALIZABLE_PACKAGES>
-          </systemPropertyVariables>
           <argLine>--add-opens java.base/java.net=ALL-UNNAMED</argLine>
         </configuration>
       </plugin>
@@ -250,28 +244,6 @@
             <link>http://www.osgi.org/javadoc/r4v43/core/</link>
             <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
           </links>
-          <groups>
-            <group>
-              <title>Core API</title>
-              <packages>org.apache.logging.log4j.core</packages>
-            </group>
-            <group>
-              <title>Configuration</title>
-              <packages>org.apache.logging.log4j.core.config*:org.apache.logging.log4j.core.selector</packages>
-            </group>
-            <group>
-              <title>Core Plugins</title>
-              <packages>org.apache.logging.log4j.core.appender*:org.apache.logging.log4j.core.filter:org.apache.logging.log4j.core.layout:org.apache.logging.log4j.core.lookup:org.apache.logging.log4j.core.pattern:org.apache.logging.log4j.core.script</packages>
-            </group>
-            <group>
-              <title>Tools</title>
-              <packages>org.apache.logging.log4j.core.net*:org.apache.logging.log4j.core.tools</packages>
-            </group>
-            <group>
-              <title>Internals</title>
-              <packages>org.apache.logging.log4j.core.async:org.apache.logging.log4j.core.impl:org.apache.logging.log4j.core.util*:org.apache.logging.log4j.core.osgi:org.apache.logging.log4j.core.jackson:org.apache.logging.log4j.core.jmx</packages>
-            </group>
-          </groups>
         </configuration>
         <reportSets>
           <reportSet>
diff --git a/log4j-plugins/pom.xml b/log4j-plugins/pom.xml
index 0a3dc9a030..9b276023b1 100644
--- a/log4j-plugins/pom.xml
+++ b/log4j-plugins/pom.xml
@@ -126,22 +126,14 @@
           <execution>
             <id>default-compile</id>
           </execution>
-          <execution>
-            <id>default-testCompile</id>
-          </execution>
         </executions>
       </plugin>
+
+      <!-- tests are in log4j-plugins-test module -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <useModulePath>false</useModulePath>
-          <excludedGroups>
-            org.apache.logging.log4j.categories.PerformanceTests
-          </excludedGroups>
-          <systemPropertyVariables>
-            <org.apache.activemq.SERIALIZABLE_PACKAGES>*</org.apache.activemq.SERIALIZABLE_PACKAGES>
-          </systemPropertyVariables>
-          <argLine>--add-opens java.base/java.net=ALL-UNNAMED</argLine>
+          <skipTests>true</skipTests>
         </configuration>
       </plugin>
       <plugin>
@@ -151,6 +143,7 @@
           <skipTests>true</skipTests>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
diff --git a/log4j-script/pom.xml b/log4j-script/pom.xml
index 179ea71ca4..42f1f582f9 100644
--- a/log4j-script/pom.xml
+++ b/log4j-script/pom.xml
@@ -128,52 +128,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${surefire.plugin.version}</version>
-          <configuration>
-              <systemPropertyVariables>
-                  <java.awt.headless>true</java.awt.headless>
-              </systemPropertyVariables>
-              <argLine>-Xms256m -Xmx1024m</argLine>
-              <forkCount>1</forkCount>
-              <reuseForks>false</reuseForks>
-          </configuration>
-          <executions>
-              <execution>
-                  <id>default-test</id>
-                  <phase>test</phase>
-                  <goals>
-                      <goal>test</goal>
-                  </goals>
-                  <configuration>
-                      <excludes>
-                          <exclude>${log4j.skip.test1}</exclude>
-                          <exclude>${log4j.skip.test2}</exclude>
-                          <exclude>Log4jBridgeHandlerTest.java</exclude>
-                      </excludes>
-                  </configuration>
-              </execution>
-              <execution>
-                  <!-- this test needs some special configuration, thus its own run -->
-                  <id>bridgeHandler-test</id>
-                  <phase>test</phase>
-                  <goals>
-                      <goal>test</goal>
-                  </goals>
-                  <configuration>
-                      <includes>
-                          <include>Log4jBridgeHandlerTest.java</include>
-                      </includes>
-                      <systemPropertyVariables>
-                          <java.util.logging.config.file>src/test/resources/logging-test.properties</java.util.logging.config.file>
-                          <log4j2.configurationFile>log4j2-julBridge-test.xml</log4j2.configurationFile>
-                      </systemPropertyVariables>
-                  </configuration>
-              </execution>
-          </executions>
-      </plugin>
     </plugins>
   </build>
   <reporting>


[logging-log4j2] 02/02: Rearrange module listing

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit bbf0027d96fa5aaaa54b2a5c7a559d22f677d7d9
Author: Matt Sicker <ma...@apache.org>
AuthorDate: Sun May 1 21:33:53 2022 -0500

    Rearrange module listing
    
    Signed-off-by: Matt Sicker <ma...@apache.org>
---
 pom.xml | 88 ++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 66 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5f166e3497..ac10595a40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1743,34 +1743,43 @@
     </site>
   </distributionManagement>
   <modules>
+    <!-- Log4j Bill of Materials -->
+    <module>log4j-bom</module>
+
+    <!-- Logging API -->
     <module>log4j-api</module>
     <module>log4j-api-test</module>
+
+    <!-- Plugin API -->
     <module>log4j-plugins</module>
     <module>log4j-plugin-processor</module>
     <module>log4j-plugins-test</module>
+
+    <!-- Core Provider SDK -->
     <module>log4j-core</module>
     <module>log4j-core-test</module>
-    <module>log4j-gctests</module>
+
+    <!-- Extensions -->
+    <module>log4j-iostreams</module>
+    <module>log4j-jmx-gui</module>
+
+    <!-- Core Plugins -->
+    <module>log4j-script</module>
+    <!-- Layouts -->
     <module>log4j-layout-jackson</module>
     <module>log4j-layout-jackson-json</module>
     <module>log4j-layout-jackson-xml</module>
     <module>log4j-layout-jackson-yaml</module>
     <module>log4j-layout-template-json</module>
-    <module>log4j-core-its</module>
-    <module>log4j-1.2-api</module>
-    <module>log4j-slf4j-impl</module>
-    <module>log4j-slf4j18-impl</module>
-    <module>log4j-to-slf4j</module>
-    <module>log4j-to-jul</module>
-    <module>log4j-jcl</module>
+    <module>log4j-csv</module>
+    <!-- Lookups -->
     <module>log4j-jndi</module>
     <module>log4j-jndi-test</module>
-    <module>log4j-csv</module>
+    <module>log4j-docker</module>
+    <module>log4j-kubernetes</module>
+    <module>log4j-spring-cloud-config</module>
+    <!-- Appenders -->
     <module>log4j-flume-ng</module>
-    <module>log4j-taglib</module>
-    <module>log4j-jmx-gui</module>
-    <module>log4j-samples</module>
-    <module>log4j-bom</module>
     <module>log4j-jdbc</module>
     <module>log4j-jdbc-dbcp2</module>
     <module>log4j-jpa</module>
@@ -1782,21 +1791,32 @@
     <module>log4j-mongodb3</module>
     <module>log4j-mongodb4</module>
     <module>log4j-cassandra</module>
-    <module>log4j-web</module>
-    <module>log4j-jakarta-web</module>
+    <module>log4j-smtp</module>
+
+    <!-- Other Core Tests -->
+    <module>log4j-samples</module>
+    <module>log4j-core-its</module>
+    <module>log4j-gctests</module>
+    <module>log4j-osgi</module>
     <module>log4j-perf</module>
-    <module>log4j-iostreams</module>
+
+    <!-- Logging Library Integrations -->
+    <module>log4j-1.2-api</module>
+    <module>log4j-slf4j-impl</module>
+    <module>log4j-slf4j18-impl</module>
+    <module>log4j-to-slf4j</module>
+    <module>log4j-to-jul</module>
+    <module>log4j-jcl</module>
     <module>log4j-jul</module>
     <module>log4j-jpl</module>
     <module>log4j-liquibase</module>
+
+    <!-- Runtime Integrations -->
+    <module>log4j-web</module>
+    <module>log4j-jakarta-web</module>
+    <module>log4j-taglib</module>
     <module>log4j-appserver</module>
-    <module>log4j-script</module>
-    <module>log4j-smtp</module>
-    <module>log4j-osgi</module>
-    <module>log4j-docker</module>
-    <module>log4j-kubernetes</module>
     <module>log4j-spring-boot</module>
-    <module>log4j-spring-cloud-config</module>
   </modules>
   <profiles>
     <profile>
@@ -1992,5 +2012,29 @@
         <javadoc.opts>-Xdoclint:none</javadoc.opts>
       </properties>
     </profile>
+    <profile>
+      <id>enable-plugin-annotation-processor</id>
+      <activation>
+        <property>
+          <name>log4j.compilePlugins</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <annotationProcessorPaths combine.children="append">
+                <path>
+                  <groupId>org.apache.logging.log4j</groupId>
+                  <artifactId>log4j-plugin-processor</artifactId>
+                  <version>${project.version}</version>
+                </path>
+              </annotationProcessorPaths>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>