You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/09/27 21:46:00 UTC
[logging-log4j2] branch bnd updated (83f2ce88a6 -> b6fdda9c20)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
omit 83f2ce88a6 Add multi-release to API and Core manifests
omit 3b0009ab00 Fix Error Prone errors
omit 27dbe64082 Add OSGi annotation dependencies
omit e46bff1576 Replace explicit versions with property
omit cb9571dd7e Temporarily disable Spotbugs
omit 272d7f14cf Bump parent version to 10.1.0-SNAPSHOT
omit 1e4c18dc95 Remove references to `maven-bundle-plugin`
add ee375d5251 Give TestConfigurator its own config file
add 5794ff9aff Modernize AsyncLoggersWithAsyncAppenderTest
add 6be65a74d6 Spotless
new a3bcfbb911 Remove references to `maven-bundle-plugin`
new 4acbc8f632 Remove usages of `maven-jar-plugin`
new df2bc9cd92 Bump parent version to 10.1.0-SNAPSHOT
new f0c0473428 Temporarily disable Spotbugs
new 873f468f78 Replace explicit versions with property
new 44988a4cf2 Add OSGi annotation dependencies
new ea7e6a9789 Fix Error Prone errors
new cd3bc3e7f8 Add multi-release to API and Core manifests
new 517c9a37d4 Fix annotation processors
new b6fdda9c20 Cleanup plugin configurations
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (83f2ce88a6)
\
N -- N -- N refs/heads/bnd (b6fdda9c20)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 10 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-1.2-api/pom.xml | 2 -
log4j-api-java9/pom.xml | 11 +-
log4j-api-test/pom.xml | 33 ---
log4j-api/pom.xml | 55 +---
log4j-bom/pom.xml | 6 +-
log4j-core-its/pom.xml | 12 -
log4j-core-java9/pom.xml | 10 +
log4j-core-test/pom.xml | 109 +------
.../log4j/core/test/appender/ListAppender.java | 6 +-
.../async/AsyncLoggersWithAsyncAppenderTest.java | 44 +--
.../log4j/core/config/TestConfigurator.java | 36 +--
.../src/test/resources/log4j2-TestConfigurator.xml | 13 +-
.../async}/AsyncLoggersWithAsyncAppenderTest.xml | 2 +-
log4j-core/pom.xml | 57 +---
log4j-flume-ng/pom.xml | 28 --
log4j-iostreams/pom.xml | 2 -
log4j-jul/pom.xml | 2 -
log4j-layout-template-json/pom.xml | 29 --
log4j-osgi/pom.xml | 11 -
log4j-perf/pom.xml | 2 -
log4j-taglib/pom.xml | 11 -
pom.xml | 327 +--------------------
22 files changed, 106 insertions(+), 702 deletions(-)
copy log4j-layout-template-json-test/src/test/resources/messageFallbackKeyUsingJsonTemplateLayout.xml => log4j-core-test/src/test/resources/log4j2-TestConfigurator.xml (83%)
rename log4j-core-test/src/test/resources/{ => org/apache/logging/log4j/core/async}/AsyncLoggersWithAsyncAppenderTest.xml (97%)
[logging-log4j2] 02/10: Remove usages of `maven-jar-plugin`
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 4acbc8f632145d3c523f3a126ab0a07a2374bc9f
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Wed Sep 27 22:58:21 2023 +0200
Remove usages of `maven-jar-plugin`
---
log4j-api-test/pom.xml | 30 -------------------
log4j-api/pom.xml | 29 -------------------
log4j-core-test/pom.xml | 30 -------------------
log4j-core/pom.xml | 30 -------------------
log4j-layout-template-json-test/pom.xml | 51 ---------------------------------
log4j-layout-template-json/pom.xml | 29 -------------------
log4j-osgi/pom.xml | 11 -------
log4j-slf4j-impl/pom.xml | 51 ---------------------------------
pom.xml | 30 -------------------
9 files changed, 291 deletions(-)
diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml
index f436a9629c..ab9160fc35 100644
--- a/log4j-api-test/pom.xml
+++ b/log4j-api-test/pom.xml
@@ -107,36 +107,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration combine.self="override">
- <archive>
- <manifestFile>${manifestfile}</manifestFile>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- <Multi-Release>true</Multi-Release>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index b0f5f347c7..d6b0619000 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -106,35 +106,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration combine.self="override">
- <archive>
- <manifestFile>${manifestfile}</manifestFile>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- <Multi-Release>true</Multi-Release>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index 70f614f5a1..31f6dd5f32 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -385,36 +385,6 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration combine.self="override">
- <archive>
- <manifestFile>${manifestfile}</manifestFile>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- <Automatic-Module-Name>org.apache.logging.log4j.core</Automatic-Module-Name>
- <Multi-Release>true</Multi-Release>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index b9f5fc08b0..e1632f6e0e 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -242,36 +242,6 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration combine.self="override">
- <archive>
- <manifestFile>${manifestfile}</manifestFile>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- <Automatic-Module-Name>org.apache.logging.log4j.core</Automatic-Module-Name>
- <Multi-Release>true</Multi-Release>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/log4j-layout-template-json-test/pom.xml b/log4j-layout-template-json-test/pom.xml
index 11f9930d7e..8d6267f35d 100644
--- a/log4j-layout-template-json-test/pom.xml
+++ b/log4j-layout-template-json-test/pom.xml
@@ -120,57 +120,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration combine.self="override">
- <archive>
- <manifestFile>${manifestfile}</manifestFile>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- <Multi-Release>true</Multi-Release>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>default</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${manifestfile}</manifestFile>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml
index 0c221d608e..a9002bb12d 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -66,35 +66,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration combine.self="override">
- <archive>
- <manifestFile>${manifestfile}</manifestFile>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- <Multi-Release>true</Multi-Release>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml
index 5adee36078..920d7da133 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi/pom.xml
@@ -143,17 +143,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index 4124fdfab2..815e4c0e07 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -104,57 +104,6 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration combine.self="override">
- <archive>
- <manifestFile>${manifestfile}</manifestFile>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- <Automatic-Module-Name>${module.name}</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>default</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${manifestfile}</manifestFile>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 04834608e3..4ee9256fe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1389,36 +1389,6 @@
<version>${maven-enforcer-plugin.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${manifestfile}</manifestFile>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- <Automatic-Module-Name>${module.name}</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
[logging-log4j2] 07/10: Fix Error Prone errors
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit ea7e6a97898ce67be4463440d7ea04936ce6cae0
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Tue Sep 26 14:59:22 2023 +0200
Fix Error Prone errors
---
.../logging/log4j/message/MapMessageTest.java | 23 +++++++++++-----------
.../logging/log4j/message/ObjectMessageTest.java | 1 +
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java
index d7344c30d4..70e1c258da 100644
--- a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java
+++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import com.google.common.base.Strings;
import org.apache.logging.log4j.util.StringBuilderFormattable;
@@ -116,6 +117,16 @@ public class MapMessageTest {
@Test
public void testJsonFormatterNestedObjectSupport() {
+ final Map<String, Object> map = new LinkedHashMap<>();
+ map.put("chars", new char[]{'a', 'b', 'c'});
+ map.put("booleans", new boolean[]{true, false});
+ map.put("bytes", new byte[]{1, 2});
+ map.put("shorts", new short[]{3, 4});
+ map.put("ints", new int[]{256, 257});
+ map.put("longs", new long[]{2147483648L, 2147483649L});
+ map.put("floats", new float[]{1.0F, 1.1F});
+ map.put("doubles", new double[]{2.0D, 2.1D});
+ map.put("objects", new Object[]{"foo", "bar"});
final String actualJson = new ObjectMapMessage()
.with("key1", "val1")
.with("key2", Collections.singletonMap("key2.1", "val2.1"))
@@ -127,17 +138,7 @@ public class MapMessageTest {
Arrays.asList(true, false),
new BigDecimal(30),
Collections.singletonMap("key3.3", "val3.3")))
- .with("key4", new LinkedHashMap<String, Object>() {{
- put("chars", new char[]{'a', 'b', 'c'});
- put("booleans", new boolean[]{true, false});
- put("bytes", new byte[]{1, 2});
- put("shorts", new short[]{3, 4});
- put("ints", new int[]{256, 257});
- put("longs", new long[]{2147483648L, 2147483649L});
- put("floats", new float[]{1.0F, 1.1F});
- put("doubles", new double[]{2.0D, 2.1D});
- put("objects", new Object[]{"foo", "bar"});
- }})
+ .with("key4", map)
.getFormattedMessage(new String[]{"JSON"});
final String expectedJson = ("{" +
"'key1':'val1'," +
diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java
index ba93e4563c..15f0660f75 100644
--- a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java
+++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java
@@ -78,6 +78,7 @@ public class ObjectMessageTest {
@Test
public void testDeserializeNonSerializableParamEqualIfToStringSame() {
+ @SuppressWarnings("EqualsHashCode")
class NonSerializable {
@Override
public boolean equals(final Object other) {
[logging-log4j2] 04/10: Temporarily disable Spotbugs
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit f0c0473428708ea61bae573f8d3e15ec988be473
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Mon Sep 25 20:18:29 2023 +0200
Temporarily disable Spotbugs
---
pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pom.xml b/pom.xml
index c368150a33..e591be519b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -313,6 +313,8 @@
<docLabel>Site Documentation</docLabel>
<projectDir />
<module.name />
+ <!-- TODO: fix errors and reenable SpotBugs -->
+ <spotbugs.skip>true</spotbugs.skip>
<!-- ========================
Site-specific properties
[logging-log4j2] 01/10: Remove references to `maven-bundle-plugin`
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a3bcfbb9112bab160f350728e4846bb5e69b4c67
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Mon Sep 25 10:57:24 2023 +0200
Remove references to `maven-bundle-plugin`
---
log4j-1.2-api/pom.xml | 20 --------------------
log4j-api-test/pom.xml | 12 ------------
log4j-api/pom.xml | 17 -----------------
log4j-appserver/pom.xml | 17 -----------------
log4j-cassandra/pom.xml | 14 --------------
log4j-core-its/pom.xml | 4 ----
log4j-core-test/pom.xml | 19 -------------------
log4j-core/pom.xml | 20 --------------------
log4j-couchdb/pom.xml | 14 --------------
log4j-docker/pom.xml | 8 --------
log4j-flume-ng/pom.xml | 11 -----------
log4j-iostreams/pom.xml | 14 +-------------
log4j-jakarta-smtp/pom.xml | 14 --------------
log4j-jakarta-web/pom.xml | 16 ----------------
log4j-jcl/pom.xml | 16 +---------------
log4j-jdbc-dbcp2/pom.xml | 14 --------------
log4j-jpa/pom.xml | 14 --------------
log4j-jpl/pom.xml | 17 -----------------
log4j-jul/pom.xml | 10 ----------
log4j-kubernetes/pom.xml | 9 ---------
log4j-layout-template-json-test/pom.xml | 11 -----------
log4j-layout-template-json/pom.xml | 11 -----------
log4j-mongodb3/pom.xml | 10 ----------
log4j-mongodb4/pom.xml | 10 ----------
log4j-osgi/pom.xml | 10 ----------
log4j-perf/pom.xml | 10 ----------
log4j-slf4j-impl/pom.xml | 11 -----------
log4j-slf4j2-impl/pom.xml | 13 -------------
log4j-spring-boot/pom.xml | 15 ---------------
.../log4j-spring-cloud-config-client/pom.xml | 15 ---------------
log4j-taglib/pom.xml | 4 ----
log4j-to-jul/pom.xml | 15 +--------------
log4j-to-slf4j/pom.xml | 16 +---------------
log4j-web/pom.xml | 18 ------------------
pom.xml | 19 +------------------
35 files changed, 5 insertions(+), 463 deletions(-)
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index bb5caf8fa7..10d62defce 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -124,24 +124,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Export-Package>org.apache.log4j.*</Export-Package>
- <Import-Package>
- javax.jms;version="[1.1,3)";resolution:=optional,
- <!-- used by org.apache.log4j.jmx.Agent -->
- com.sun.jdmk.comm;resolution:=optional,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml
index 477c84a944..f436a9629c 100644
--- a/log4j-api-test/pom.xml
+++ b/log4j-api-test/pom.xml
@@ -107,18 +107,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.api</Fragment-Host>
- <Export-Package>org.apache.logging.log4j.*</Export-Package>
- <Import-Package />
- </instructions>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 6fa8f7abf6..b0f5f347c7 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -59,23 +59,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>*.internal</Private-Package>
- <Export-Package>!*.internal,
- org.apache.logging.log4j.*</Export-Package>
- <Import-Package>!*.internal,
- sun.reflect;resolution:=optional,
- *</Import-Package>
- <Bundle-Activator>org.apache.logging.log4j.util.Activator</Bundle-Activator>
- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
- <_fixupmessages>"Classes found in the wrong directory";is:=warning</_fixupmessages>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
index fb253852e4..b17706fb4f 100644
--- a/log4j-appserver/pom.xml
+++ b/log4j-appserver/pom.xml
@@ -54,21 +54,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <!-- we compile against 3.0, but require 2.5 minimum -->
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Import-Package>javax.servlet;version="[2.5,4)",*</Import-Package>
- <Export-Package>org.apache.logging.log4j.web</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/log4j-cassandra/pom.xml b/log4j-cassandra/pom.xml
index f69a812c44..8e777fed2a 100644
--- a/log4j-cassandra/pom.xml
+++ b/log4j-cassandra/pom.xml
@@ -112,18 +112,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Export-Package>*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 4a959ab958..3222cb4d37 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -183,10 +183,6 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index aa10147fc9..70f614f5a1 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -349,25 +349,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.logging.log4j.core</Bundle-SymbolicName>
- <!-- TODO: exclude internal classes from export -->
- <Export-Package>org.apache.logging.log4j.core.*</Export-Package>
- <Import-Package>javax.activation;version="[1.2,2)";resolution:=optional,
- javax.jms;version="[1.1,3)";resolution:=optional,
- javax.mail;version="[1.6,2)";resolution:=optional,
- javax.mail.internet;version="[1.6,2)";resolution:=optional,
- javax.mail.util;version="[1.6,2)";resolution:=optional,
- sun.reflect;resolution:=optional,
- *</Import-Package>
- <Bundle-Activator>org.apache.logging.log4j.core.osgi.Activator</Bundle-Activator>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index ccdc60678a..b9f5fc08b0 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -177,26 +177,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.logging.log4j.core</Bundle-SymbolicName>
- <!-- TODO: exclude internal classes from export -->
- <Export-Package>org.apache.logging.log4j.core.*</Export-Package>
- <Import-Package>javax.activation;version="[1.2,2)";resolution:=optional,
- javax.jms;version="[1.1,3)";resolution:=optional,
- javax.mail;version="[1.6,2)";resolution:=optional,
- javax.mail.internet;version="[1.6,2)";resolution:=optional,
- javax.mail.util;version="[1.6,2)";resolution:=optional,
- sun.reflect;resolution:=optional,
- *</Import-Package>
- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
- <Bundle-Activator>org.apache.logging.log4j.core.osgi.Activator</Bundle-Activator>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
diff --git a/log4j-couchdb/pom.xml b/log4j-couchdb/pom.xml
index b76b9ac63a..e5d7c95b09 100644
--- a/log4j-couchdb/pom.xml
+++ b/log4j-couchdb/pom.xml
@@ -75,18 +75,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Export-Package>*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/log4j-docker/pom.xml b/log4j-docker/pom.xml
index e89a2afb79..3356f2ea9e 100644
--- a/log4j-docker/pom.xml
+++ b/log4j-docker/pom.xml
@@ -60,13 +60,5 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml
index 598993638c..0a7b150799 100644
--- a/log4j-flume-ng/pom.xml
+++ b/log4j-flume-ng/pom.xml
@@ -107,17 +107,6 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Bundle-SymbolicName>org.apache.logging.log4j.flume</Bundle-SymbolicName>
- <Export-Package>org.apache.logging.log4j.flume.appender</Export-Package>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml
index e0297990fb..12fd34bf83 100644
--- a/log4j-iostreams/pom.xml
+++ b/log4j-iostreams/pom.xml
@@ -75,17 +75,5 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.apache.logging.log4j.io.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
</project>
diff --git a/log4j-jakarta-smtp/pom.xml b/log4j-jakarta-smtp/pom.xml
index 4d7cce24e4..82fe96b9b0 100644
--- a/log4j-jakarta-smtp/pom.xml
+++ b/log4j-jakarta-smtp/pom.xml
@@ -91,18 +91,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core.appender.mom.jeromq</Fragment-Host>
- <Export-Package>*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/log4j-jakarta-web/pom.xml b/log4j-jakarta-web/pom.xml
index 299c5ec620..a212374ca2 100644
--- a/log4j-jakarta-web/pom.xml
+++ b/log4j-jakarta-web/pom.xml
@@ -81,20 +81,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <!-- we require 5.0 minimum -->
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Import-Package>jakarta.servlet;version="[5.0,4)",*</Import-Package>
- <Export-Package>org.apache.logging.log4j.web</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml
index 93e3d28d10..3bfcb09f90 100644
--- a/log4j-jcl/pom.xml
+++ b/log4j-jcl/pom.xml
@@ -67,19 +67,5 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.apache.logging.log4j.jcl</Export-Package>
- <Require-Capability>osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
- <Provide-Capability>osgi.serviceloader;osgi.serviceloader=org.apache.commons.logging.LogFactory</Provide-Capability>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
</project>
diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml
index ac0c9aa9b4..43cb4fe9ea 100644
--- a/log4j-jdbc-dbcp2/pom.xml
+++ b/log4j-jdbc-dbcp2/pom.xml
@@ -70,18 +70,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Export-Package>*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/log4j-jpa/pom.xml b/log4j-jpa/pom.xml
index 2e4ed7e356..68c7f3177d 100644
--- a/log4j-jpa/pom.xml
+++ b/log4j-jpa/pom.xml
@@ -91,18 +91,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Export-Package>*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/log4j-jpl/pom.xml b/log4j-jpl/pom.xml
index 6b61b84b4e..bf857aac59 100644
--- a/log4j-jpl/pom.xml
+++ b/log4j-jpl/pom.xml
@@ -65,23 +65,6 @@
</dependency>
</dependencies>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Export-Package>org.apache.logging.log4j.jpl</Export-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
<profiles>
<profile>
<id>java8-tests</id>
diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml
index 1c1cc9fd9a..dfbd46fd85 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -72,16 +72,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Export-Package>org.apache.logging.log4j.jul</Export-Package>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/log4j-kubernetes/pom.xml b/log4j-kubernetes/pom.xml
index 0243eb9832..1a78cb1d38 100644
--- a/log4j-kubernetes/pom.xml
+++ b/log4j-kubernetes/pom.xml
@@ -57,14 +57,5 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
-
- </plugins>
- </build>
</project>
diff --git a/log4j-layout-template-json-test/pom.xml b/log4j-layout-template-json-test/pom.xml
index bfb779f245..11f9930d7e 100644
--- a/log4j-layout-template-json-test/pom.xml
+++ b/log4j-layout-template-json-test/pom.xml
@@ -104,17 +104,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Bundle-SymbolicName>org.apache.logging.log4j.layout.template.json</Bundle-SymbolicName>
- <Export-Package>org.apache.logging.log4j.layout.template.json.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
<!-- Disable ITs, which are Docker-dependent, by default. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml
index 85c3b5a069..0c221d608e 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -50,17 +50,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Bundle-SymbolicName>org.apache.logging.log4j.layout.template.json</Bundle-SymbolicName>
- <Export-Package>org.apache.logging.log4j.layout.template.json.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
<!-- Disable ITs, which are Docker-dependent, by default. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/log4j-mongodb3/pom.xml b/log4j-mongodb3/pom.xml
index d49cbcc7ef..033c8b37bd 100644
--- a/log4j-mongodb3/pom.xml
+++ b/log4j-mongodb3/pom.xml
@@ -112,16 +112,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Export-Package>*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml
index 5e573b7181..ea3a8e7609 100644
--- a/log4j-mongodb4/pom.xml
+++ b/log4j-mongodb4/pom.xml
@@ -105,16 +105,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Export-Package>*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml
index 077defaac2..5adee36078 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi/pom.xml
@@ -143,16 +143,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.logging.log4j.osgi</Bundle-SymbolicName>
- <Import-Package>*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index d6683d3a26..35f75106b4 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -142,16 +142,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.apache.logging.log4j.perf.jmh*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index dbb3a2f133..4124fdfab2 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -104,17 +104,6 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.apache.logging.slf4j,
- org.slf4j.impl</Export-Package>
- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/log4j-slf4j2-impl/pom.xml b/log4j-slf4j2-impl/pom.xml
index 4e2a9e57cd..8aba7f0ef4 100644
--- a/log4j-slf4j2-impl/pom.xml
+++ b/log4j-slf4j2-impl/pom.xml
@@ -101,19 +101,6 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.apache.logging.slf4j,
- org.slf4j.impl</Export-Package>
- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
- <Require-Capability>osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
- <Provide-Capability>osgi.serviceloader;osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider</Provide-Capability>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/log4j-spring-boot/pom.xml b/log4j-spring-boot/pom.xml
index 827c29251b..1169e72002 100644
--- a/log4j-spring-boot/pom.xml
+++ b/log4j-spring-boot/pom.xml
@@ -114,20 +114,5 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Export-Package>org.apache.logging.log4j.spring.cloud.config.controller</Export-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
</project>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
index 4b4e6a026d..3169d492ea 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
@@ -87,20 +87,5 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Export-Package>org.apache.logging.log4j.spring.cloud.config.controller</Export-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
</project>
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index ec4522b662..1ec4c93b4b 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -80,10 +80,6 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
diff --git a/log4j-to-jul/pom.xml b/log4j-to-jul/pom.xml
index 8737200d04..69afcd27a1 100644
--- a/log4j-to-jul/pom.xml
+++ b/log4j-to-jul/pom.xml
@@ -64,18 +64,5 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-Activator>org.apache.logging.log4j.tojul.Activator</Bundle-Activator>
- <Export-Package>org.apache.logging.log4j.tojul</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
</project>
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index d60459981d..fdb6f76de2 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -89,19 +89,5 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-Activator>org.apache.logging.slf4j.Activator</Bundle-Activator>
- <Export-Package>org.apache.logging.slf4j</Export-Package>
- <Import-Package>org.slf4j*;version="${range;[==,${slf4j.support.bound})}",*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
</project>
diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml
index b8ae505138..5ea959a0a1 100644
--- a/log4j-web/pom.xml
+++ b/log4j-web/pom.xml
@@ -82,22 +82,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <!-- we compile against 3.0, but require 2.5 minimum -->
- <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Import-Package>javax.servlet;version="[2.5,5)",
- javax.servlet.http;version="[2.5,5)",
- *</Import-Package>
- <Export-Package>org.apache.logging.log4j.web</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/pom.xml b/pom.xml
index 06b9f38615..04834608e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
- <version>9</version>
+ <version>10.1.0-SNAPSHOT</version>
<relativePath />
</parent>
@@ -353,7 +353,6 @@
<findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
<log4j-tools.version>0.3.0</log4j-tools.version>
<maven-artifact-plugin.version>3.4.0</maven-artifact-plugin.version>
- <maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
<maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
<maven-scm-plugin.version>1.13.0</maven-scm-plugin.version>
@@ -1359,22 +1358,6 @@
<version>${maven-artifact-plugin.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle-plugin.version}</version>
- <extensions>true</extensions>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>manifest</goal>
- </goals>
- <phase>process-classes</phase>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
[logging-log4j2] 09/10: Fix annotation processors
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 517c9a37d405a3603fbecaac7db23483334ebce2
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Wed Sep 27 22:47:27 2023 +0200
Fix annotation processors
---
log4j-api-java9/pom.xml | 9 ++++++++-
log4j-api/pom.xml | 20 ++++++++++----------
log4j-bom/pom.xml | 1 +
log4j-core-java9/pom.xml | 10 ++++++++++
log4j-core/pom.xml | 18 +++++++++++-------
pom.xml | 34 +++++++++++++++-------------------
6 files changed, 55 insertions(+), 37 deletions(-)
diff --git a/log4j-api-java9/pom.xml b/log4j-api-java9/pom.xml
index cfd02630aa..d010419126 100644
--- a/log4j-api-java9/pom.xml
+++ b/log4j-api-java9/pom.xml
@@ -71,7 +71,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <proc>none</proc>
+ <!-- TODO: copy/paste from `logging-parent` to override this module's parent -->
+ <annotationProcessorPaths combine.self="override">
+ <path>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <version>${error-prone.version}</version>
+ </path>
+ </annotationProcessorPaths>
</configuration>
<executions>
<execution>
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 11669b7080..1ac6fd4fe6 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -67,16 +67,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile</id>
- <!-- recompile everything for target VM except the module-info.java -->
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <!-- TODO: copy/paste from `logging-parent` to override this module's parent -->
+ <annotationProcessorPaths combine.self="override">
+ <path>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <version>${error-prone.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml
index 725989476e..1cd7392dc7 100644
--- a/log4j-bom/pom.xml
+++ b/log4j-bom/pom.xml
@@ -40,6 +40,7 @@
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
<!-- JDK version of the main Maven process (used in ASF parent POM) -->
<minimalJavaBuildVersion>[11, )</minimalJavaBuildVersion>
+ <revision>2.21.0-SNAPSHOT</revision>
</properties>
<dependencyManagement>
diff --git a/log4j-core-java9/pom.xml b/log4j-core-java9/pom.xml
index 25a15e29b0..4dee800e41 100644
--- a/log4j-core-java9/pom.xml
+++ b/log4j-core-java9/pom.xml
@@ -78,6 +78,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- TODO: copy/paste from `logging-parent` to override this module's parent -->
+ <annotationProcessorPaths combine.self="override">
+ <path>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <version>${error-prone.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
<executions>
<execution>
<id>default-compile</id>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index a4bcecf24b..b084361c82 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -184,15 +184,21 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <annotationProcessorPaths combine.self="override" />
+ </configuration>
<executions>
<execution>
<!-- disable annotation processing for first pass -->
<id>default-compile</id>
<configuration>
- <excludes>
- <exclude>module-info.java</exclude>
- </excludes>
- <proc>none</proc>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <version>${error-prone.version}</version>
+ </path>
+ </annotationProcessorPaths>
</configuration>
</execution>
<execution>
@@ -203,9 +209,7 @@
</goals>
<phase>process-classes</phase>
<configuration>
- <excludes>
- <exclude>module-info.java</exclude>
- </excludes>
+ <compilerArgs combine.self="override" />
<proc>only</proc>
</configuration>
</execution>
diff --git a/pom.xml b/pom.xml
index cb24b8d7c3..ffde0bb927 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1398,25 +1398,6 @@
<version>${maven-artifact-plugin.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <release>${maven.compiler.release}</release>
- <parameters>true</parameters>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <encoding>UTF-8</encoding>
- <fork>true</fork>
- <meminitial>256</meminitial>
- <maxmem>1024</maxmem>
- <compilerArguments>
- <Xmaxwarns>10000</Xmaxwarns>
- <Xlint />
- </compilerArguments>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -1527,6 +1508,21 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- TODO: this only applies to `log4j-core` dependents -->
+ <annotationProcessorPaths combine.children="append">
+ <path>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${project.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+
<!-- Ensure that version for each dependency resolved during a build, is equal to or higher than all transitive dependency declarations.
A failure here requires adding the dependency to the dependency management. -->
<plugin>
[logging-log4j2] 03/10: Bump parent version to 10.1.0-SNAPSHOT
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit df2bc9cd929c735ec4c61dc5430260c4a6298e41
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Mon Sep 25 20:17:51 2023 +0200
Bump parent version to 10.1.0-SNAPSHOT
---
log4j-bom/pom.xml | 20 +++++++++++++++++++-
pom.xml | 14 ++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml
index 381d286f59..7f0469d8c2 100644
--- a/log4j-bom/pom.xml
+++ b/log4j-bom/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
- <version>9</version>
+ <version>10.1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
@@ -37,6 +37,9 @@
<maven.site.skip>true</maven.site.skip>
<maven.site.deploy.skip>true</maven.site.deploy.skip>
<project.build.outputTimestamp>1676697577</project.build.outputTimestamp>
+ <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+ <!-- JDK version of the main Maven process (used in ASF parent POM) -->
+ <minimalJavaBuildVersion>[11, )</minimalJavaBuildVersion>
</properties>
<dependencyManagement>
@@ -231,6 +234,21 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>apache.snapshots.https</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ </repository>
+ </repositories>
+
<build>
<plugins>
<!-- RAT report -->
diff --git a/pom.xml b/pom.xml
index 4ee9256fe7..c368150a33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1313,6 +1313,20 @@
</dependencies>
</dependencyManagement>
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>apache.snapshots.https</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ </repository>
+ </repositories>
+
<build>
<defaultGoal>clean verify</defaultGoal>
[logging-log4j2] 05/10: Replace explicit versions with property
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 873f468f787cd75ea35e30dfb5d587c147b7d618
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Tue Sep 26 09:03:51 2023 +0200
Replace explicit versions with property
---
log4j-1.2-api/pom.xml | 2 +-
log4j-api-java9/pom.xml | 2 +-
log4j-api-test/pom.xml | 2 +-
log4j-api/pom.xml | 2 +-
log4j-appserver/pom.xml | 2 +-
log4j-bom/pom.xml | 2 +-
log4j-cassandra/pom.xml | 2 +-
log4j-core-its/pom.xml | 2 +-
log4j-core-java9/pom.xml | 2 +-
log4j-core-test/pom.xml | 2 +-
log4j-core/pom.xml | 2 +-
log4j-couchdb/pom.xml | 2 +-
log4j-distribution/pom.xml | 2 +-
log4j-docker/pom.xml | 2 +-
log4j-flume-ng/pom.xml | 2 +-
log4j-iostreams/pom.xml | 2 +-
log4j-jakarta-smtp/pom.xml | 2 +-
log4j-jakarta-web/pom.xml | 2 +-
log4j-jcl/pom.xml | 2 +-
log4j-jdbc-dbcp2/pom.xml | 2 +-
log4j-jpa/pom.xml | 2 +-
log4j-jpl/pom.xml | 2 +-
log4j-jul/pom.xml | 2 +-
log4j-kubernetes/pom.xml | 2 +-
log4j-layout-template-json-test/pom.xml | 2 +-
log4j-layout-template-json/pom.xml | 2 +-
log4j-mongodb3/pom.xml | 2 +-
log4j-mongodb4/pom.xml | 2 +-
log4j-osgi/pom.xml | 2 +-
log4j-perf/pom.xml | 2 +-
log4j-slf4j-impl/pom.xml | 2 +-
log4j-slf4j2-impl/pom.xml | 2 +-
log4j-spring-boot/pom.xml | 2 +-
log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml | 2 +-
log4j-spring-cloud-config/pom.xml | 2 +-
log4j-taglib/pom.xml | 2 +-
log4j-to-jul/pom.xml | 2 +-
log4j-to-slf4j/pom.xml | 2 +-
log4j-web/pom.xml | 2 +-
pom.xml | 3 ++-
40 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 10d62defce..31b0a70fdd 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-1.2-api</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-api-java9/pom.xml b/log4j-api-java9/pom.xml
index 5533e3d401..cfd02630aa 100644
--- a/log4j-api-java9/pom.xml
+++ b/log4j-api-java9/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-api-java9</artifactId>
<packaging>pom</packaging>
diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml
index ab9160fc35..d4da0aea65 100644
--- a/log4j-api-test/pom.xml
+++ b/log4j-api-test/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-api-test</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index d6b0619000..e27cf7520b 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-api</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
index b17706fb4f..bb7cf2da0e 100644
--- a/log4j-appserver/pom.xml
+++ b/log4j-appserver/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-appserver</artifactId>
diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml
index 7f0469d8c2..725989476e 100644
--- a/log4j-bom/pom.xml
+++ b/log4j-bom/pom.xml
@@ -24,7 +24,7 @@
</parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
<packaging>pom</packaging>
<name>Apache Log4j BOM</name>
<description>Apache Log4j Bill of Materials</description>
diff --git a/log4j-cassandra/pom.xml b/log4j-cassandra/pom.xml
index 8e777fed2a..605a59b12c 100644
--- a/log4j-cassandra/pom.xml
+++ b/log4j-cassandra/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-cassandra</artifactId>
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 3222cb4d37..7f9df6fb75 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-core-its</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-core-java9/pom.xml b/log4j-core-java9/pom.xml
index 5d7b1b398d..25a15e29b0 100644
--- a/log4j-core-java9/pom.xml
+++ b/log4j-core-java9/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-core-java9</artifactId>
<packaging>pom</packaging>
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index 31f6dd5f32..41259663ec 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-core-test</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index e1632f6e0e..757224e876 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-core</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-couchdb/pom.xml b/log4j-couchdb/pom.xml
index e5d7c95b09..b8d786b473 100644
--- a/log4j-couchdb/pom.xml
+++ b/log4j-couchdb/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-couchdb</artifactId>
diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml
index 06ec954257..d50b7b3a64 100644
--- a/log4j-distribution/pom.xml
+++ b/log4j-distribution/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-distribution</artifactId>
<packaging>pom</packaging>
diff --git a/log4j-docker/pom.xml b/log4j-docker/pom.xml
index 3356f2ea9e..769b27ac1e 100644
--- a/log4j-docker/pom.xml
+++ b/log4j-docker/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-docker</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml
index 0a7b150799..7154b61641 100644
--- a/log4j-flume-ng/pom.xml
+++ b/log4j-flume-ng/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-flume-ng</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml
index 12fd34bf83..0650cb593b 100644
--- a/log4j-iostreams/pom.xml
+++ b/log4j-iostreams/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-iostreams</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-jakarta-smtp/pom.xml b/log4j-jakarta-smtp/pom.xml
index 82fe96b9b0..1450a8fa78 100644
--- a/log4j-jakarta-smtp/pom.xml
+++ b/log4j-jakarta-smtp/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-jakarta-smtp</artifactId>
diff --git a/log4j-jakarta-web/pom.xml b/log4j-jakarta-web/pom.xml
index a212374ca2..a9896151be 100644
--- a/log4j-jakarta-web/pom.xml
+++ b/log4j-jakarta-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-jakarta-web</artifactId>
diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml
index 3bfcb09f90..267b7ec0dd 100644
--- a/log4j-jcl/pom.xml
+++ b/log4j-jcl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-jcl</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml
index 43cb4fe9ea..7f0ee1e6e5 100644
--- a/log4j-jdbc-dbcp2/pom.xml
+++ b/log4j-jdbc-dbcp2/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-jdbc-dbcp2</artifactId>
diff --git a/log4j-jpa/pom.xml b/log4j-jpa/pom.xml
index 68c7f3177d..20db243c94 100644
--- a/log4j-jpa/pom.xml
+++ b/log4j-jpa/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-jpa</artifactId>
diff --git a/log4j-jpl/pom.xml b/log4j-jpl/pom.xml
index bf857aac59..cbad363f2d 100644
--- a/log4j-jpl/pom.xml
+++ b/log4j-jpl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-jpl</artifactId>
diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml
index dfbd46fd85..9ceb7dc08f 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-jul</artifactId>
diff --git a/log4j-kubernetes/pom.xml b/log4j-kubernetes/pom.xml
index 1a78cb1d38..f028fd82db 100644
--- a/log4j-kubernetes/pom.xml
+++ b/log4j-kubernetes/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-kubernetes</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-layout-template-json-test/pom.xml b/log4j-layout-template-json-test/pom.xml
index 8d6267f35d..8217e6b029 100644
--- a/log4j-layout-template-json-test/pom.xml
+++ b/log4j-layout-template-json-test/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-layout-template-json-test</artifactId>
diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml
index a9002bb12d..8e22f39c8c 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-layout-template-json</artifactId>
diff --git a/log4j-mongodb3/pom.xml b/log4j-mongodb3/pom.xml
index 033c8b37bd..b17651c7b9 100644
--- a/log4j-mongodb3/pom.xml
+++ b/log4j-mongodb3/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-mongodb3</artifactId>
diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml
index ea3a8e7609..40252bc02e 100644
--- a/log4j-mongodb4/pom.xml
+++ b/log4j-mongodb4/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-mongodb4</artifactId>
diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml
index 920d7da133..7d3a0360be 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-osgi</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index 35f75106b4..37398419a1 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-perf</artifactId>
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index 815e4c0e07..b7f056da3c 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-slf4j-impl</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-slf4j2-impl/pom.xml b/log4j-slf4j2-impl/pom.xml
index 8aba7f0ef4..0db98142f2 100644
--- a/log4j-slf4j2-impl/pom.xml
+++ b/log4j-slf4j2-impl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-slf4j2-impl</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-spring-boot/pom.xml b/log4j-spring-boot/pom.xml
index 1169e72002..73b14efa67 100644
--- a/log4j-spring-boot/pom.xml
+++ b/log4j-spring-boot/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-spring-boot</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
index 3169d492ea..e4caa5173b 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-spring-cloud-config</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-spring-cloud-config-client</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml
index 040f6ec6c8..3394572cf0 100644
--- a/log4j-spring-cloud-config/pom.xml
+++ b/log4j-spring-cloud-config/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-spring-cloud-config</artifactId>
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index 1ec4c93b4b..f9392feda0 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-taglib</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-to-jul/pom.xml b/log4j-to-jul/pom.xml
index 69afcd27a1..cd1bdc5a8d 100644
--- a/log4j-to-jul/pom.xml
+++ b/log4j-to-jul/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-to-jul</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index fdb6f76de2..beca3ae91e 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-to-slf4j</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml
index 5ea959a0a1..7f601912b1 100644
--- a/log4j-web/pom.xml
+++ b/log4j-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>log4j-web</artifactId>
diff --git a/pom.xml b/pom.xml
index e591be519b..1215c2d64e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.21.0-SNAPSHOT</version>
+ <version>${revision}</version>
<packaging>pom</packaging>
<name>Apache Log4j 2</name>
@@ -298,6 +298,7 @@
<log4jReleaseManager>Ralph Goers</log4jReleaseManager>
<log4jReleaseKey>B3D8E1BA</log4jReleaseKey>
<log4jSigningUserName>rgoers@apache.org</log4jSigningUserName>
+ <revision>2.21.0-SNAPSHOT</revision>
<!-- =================
Common properties
[logging-log4j2] 08/10: Add multi-release to API and Core manifests
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit cd3bc3e7f8a650e63b932f3bc5cbebbfc20af035
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Wed Sep 27 14:25:58 2023 +0200
Add multi-release to API and Core manifests
---
log4j-api/pom.xml | 5 +++++
log4j-core/pom.xml | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index e27cf7520b..11669b7080 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -31,6 +31,11 @@
<docLabel>API Documentation</docLabel>
<projectDir>/api</projectDir>
<javadoc.skip>false</javadoc.skip>
+
+ <!--
+ ~ OSGi and JPMS options
+ -->
+ <bnd-multi-release>true</bnd-multi-release>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 757224e876..a4bcecf24b 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -31,6 +31,11 @@
<docLabel>Core Documentation</docLabel>
<projectDir>/core</projectDir>
<javadoc.skip>false</javadoc.skip>
+
+ <!--
+ ~ OSGi and JPMS options
+ -->
+ <bnd-multi-release>true</bnd-multi-release>
</properties>
<dependencies>
<dependency>
[logging-log4j2] 10/10: Cleanup plugin configurations
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b6fdda9c20f57b0fef105ee484426ed2a05da405
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Wed Sep 27 23:18:58 2023 +0200
Cleanup plugin configurations
---
log4j-api-test/pom.xml | 1 -
log4j-api/pom.xml | 4 -
log4j-bom/pom.xml | 5 -
log4j-core-its/pom.xml | 12 ---
log4j-core-test/pom.xml | 68 ------------
log4j-core/pom.xml | 7 --
log4j-flume-ng/pom.xml | 26 -----
log4j-taglib/pom.xml | 11 --
pom.xml | 273 +-----------------------------------------------
9 files changed, 3 insertions(+), 404 deletions(-)
diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml
index d4da0aea65..e99998956b 100644
--- a/log4j-api-test/pom.xml
+++ b/log4j-api-test/pom.xml
@@ -111,7 +111,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
<excludedGroups>performance,smoke</excludedGroups>
</configuration>
</plugin>
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 1ac6fd4fe6..3af826c5f8 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -107,10 +107,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml
index 1cd7392dc7..0972d9f467 100644
--- a/log4j-bom/pom.xml
+++ b/log4j-bom/pom.xml
@@ -252,11 +252,6 @@
<build>
<plugins>
- <!-- RAT report -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 7f9df6fb75..04b6083366 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -183,18 +183,6 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>test-compile</id>
- <goals>
- <goal>testCompile</goal>
- </goals>
- <phase>test-compile</phase>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index 41259663ec..9419d2a025 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -329,72 +329,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <goals>
- <goal>add-source</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <sources>
- <source>${project.build.directory}/log4j-core-java9</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <!-- disable annotation processing for first pass -->
- <id>default-compile</id>
- <configuration>
- <excludes>
- <exclude>module-info.java</exclude>
- </excludes>
- <proc>none</proc>
- </configuration>
- </execution>
- <execution>
- <!-- then do a processing-only pass to generate plugins .dat file -->
- <id>process-plugins</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <phase>process-classes</phase>
- <configuration>
- <excludes>
- <exclude>module-info.java</exclude>
- </excludes>
- <proc>only</proc>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludedGroups>org.apache.logging.log4j.categories.PerformanceTests</excludedGroups>
- <systemPropertyVariables>
- <org.apache.activemq.SERIALIZABLE_PACKAGES>*</org.apache.activemq.SERIALIZABLE_PACKAGES>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index b084361c82..cc36f84940 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -244,13 +244,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml
index 7154b61641..00e995da92 100644
--- a/log4j-flume-ng/pom.xml
+++ b/log4j-flume-ng/pom.xml
@@ -105,30 +105,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Xms256m -Xmx1024m -XX:MaxPermSize=512m</argLine>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- </configuration>
- </plugin>
- -->
- </plugins>
- </build>
</project>
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index f9392feda0..0a5788e992 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -78,15 +78,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/pom.xml b/pom.xml
index ffde0bb927..49d2ec9f44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,26 +349,11 @@
Plugin version properties (in alphabetical order)
================================================= -->
<asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
- <build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
- <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
<docker-maven-plugin.version>0.43.4</docker-maven-plugin.version>
<exam-maven-plugin.version>4.13.5</exam-maven-plugin.version>
- <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
- <log4j-tools.version>0.3.0</log4j-tools.version>
- <maven-artifact-plugin.version>3.4.0</maven-artifact-plugin.version>
- <maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
- <maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
- <maven-scm-plugin.version>1.13.0</maven-scm-plugin.version>
- <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-taglib-plugin.version>2.4</maven-taglib-plugin.version>
- <maven-toolchains-plugin.version>3.1.0</maven-toolchains-plugin.version>
- <spotbugs-maven-plugin.version>4.7.3.5</spotbugs-maven-plugin.version>
<!-- `surefire.version` property used in `apache.org:apache`: -->
<surefire.version>3.1.2</surefire.version>
- <!-- Maven site depends on Velocity and the escaping rules are different in newer versions. -->
- <!-- See https://maven.apache.org/plugins/maven-site-plugin/migrate.html -->
- <velocity.plugin.version>1.5</velocity.plugin.version>
- <xml-maven-plugin.version>1.1.0</xml-maven-plugin.version>
<!-- =====================================================
Direct dependency version properties (in alphabetical order)
@@ -1360,19 +1345,6 @@
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin.version}</version>
- </plugin>
-
- <!-- used by `log4j-distribution` module which is enabled via `apache-release` profile: -->
- <plugin>
- <groupId>net.nicoulaj.maven.plugins</groupId>
- <artifactId>checksum-maven-plugin</artifactId>
- <version>${checksum-maven-plugin.version}</version>
- </plugin>
-
<!-- used by `docker` profile in `log4j-layout-template-json-test`: -->
<plugin>
<groupId>io.fabric8</groupId>
@@ -1380,71 +1352,20 @@
<version>${docker-maven-plugin.version}</version>
</plugin>
+ <!-- used by OSGi tests -->
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>exam-maven-plugin</artifactId>
<version>${exam-maven-plugin.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-changelog-maven-plugin</artifactId>
- <version>${log4j-tools.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-artifact-plugin</artifactId>
- <version>${maven-artifact-plugin.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>${maven-dependency-plugin.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>${maven-enforcer-plugin.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>${maven-scm-plugin.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>${maven-source-plugin.version}</version>
- </plugin>
-
+ <!-- used to generate taglib documentation -->
<plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
<version>${maven-taglib-plugin.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>${maven-toolchains-plugin.version}</version>
- </plugin>
-
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>${spotbugs-maven-plugin.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <version>${xml-maven-plugin.version}</version>
- </plugin>
</plugins>
</pluginManagement>
@@ -1458,18 +1379,12 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<consoleOutput>true</consoleOutput>
- <excludes>
- <exclude>**/target/**/*</exclude>
+ <excludes combine.children="append">
<!-- Matches other RAT configurations in this POM -->
<exclude>src/main/resources/META-INF/services/**/*</exclude>
- <!-- IntelliJ files -->
- <exclude>.idea/**/*</exclude>
- <exclude>**/*.iml</exclude>
<exclude>src/test/resources/**/*</exclude>
<!-- IDE settings imports -->
<exclude>src/ide/**</exclude>
- <!-- does it even make sense to apply a license to a GPG signature? -->
- <exclude>**/*.asc</exclude>
<!-- jQuery is MIT-licensed, but RAT can't figure it out -->
<exclude>src/site/resources/js/jquery.js</exclude>
<exclude>src/site/resources/js/jquery.min.js</exclude>
@@ -1483,7 +1398,6 @@
<exclude>felix-cache/**</exclude>
<exclude>**/README.md</exclude>
<exclude>SECURITY.md</exclude>
- <exclude>.java-version</exclude>
<exclude>**/*.yml</exclude>
<exclude>**/*.yaml</exclude>
<exclude>**/*.json</exclude>
@@ -1492,20 +1406,8 @@
<exclude>**/rabbitmq.config</exclude>
<exclude>**/MANIFEST.MF</exclude>
<exclude>.surefire-*</exclude>
- <exclude>.mvn/jvm.config</exclude>
- <!-- License headers in GitHub templates pollute the prompt displayed to the user: -->
- <exclude>.github/ISSUE_TEMPLATE/*.md</exclude>
- <exclude>.github/pull_request_template.md</exclude>
</excludes>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>validate</phase>
- </execution>
- </executions>
</plugin>
<plugin>
@@ -1523,58 +1425,6 @@
</configuration>
</plugin>
- <!-- Ensure that version for each dependency resolved during a build, is equal to or higher than all transitive dependency declarations.
- A failure here requires adding the dependency to the dependency management. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-upper-bound-deps</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireUpperBoundDeps />
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- <goal>test-jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <configuration>
- <plugins>
- <plugin>
- <groupId>com.h3xstream.findsecbugs</groupId>
- <artifactId>findsecbugs-plugin</artifactId>
- <version>${findsecbugs-plugin.version}</version>
- </plugin>
- </plugins>
- <excludeFilterFile>${log4jParentDir}/findbugs-exclude-filter.xml</excludeFilterFile>
- <fork>true</fork>
- <effort>Default</effort>
- <threshold>Normal</threshold>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -1588,31 +1438,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <validationSets>
- <validationSet>
- <dir>src/changelog</dir>
- <includes>**/*.xml</includes>
- <publicId>http://logging.apache.org/log4j/changelog</publicId>
- <systemId>https://logging.apache.org/log4j/changelog-0.1.1.xsd</systemId>
- <validating>true</validating>
- </validationSet>
- </validationSets>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>validate</goal>
- </goals>
- <phase>validate</phase>
- </execution>
- </executions>
- </plugin>
-
<!-- ███████ ████████ █████ ██████ ████████ ███████ ██ ████████ ███████
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
███████ ██ ███████ ██████ ██ ███████ ██ ██ █████
@@ -1799,58 +1624,6 @@
<profiles>
- <!-- Shortcut to populate `src/changelog/<releaseVersion>` from `src/changelog/.<releaseVersionMajor>.x.x` -->
- <profile>
- <id>changelog-release</id>
- <build>
- <defaultGoal>validate</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-changelog-maven-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <releaseVersion>${log4jReleaseVersion}</releaseVersion>
- </configuration>
- <executions>
- <execution>
- <id>changelog-release</id>
- <goals>
- <goal>release</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- Shortcut to enable `log4j-distribution` module creating the release distribution containing artifacts, sources, etc. -->
- <profile>
- <id>apache-release</id>
- <modules>
- <module>log4j-distribution</module>
- </modules>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
<profile>
<id>java8-doclint-disabled</id>
<activation>
@@ -1893,46 +1666,6 @@
</build>
</profile>
- <profile>
- <id>rewrite</id>
- <properties>
- <rewrite-java.version>8.2.0</rewrite-java.version>
- <rewrite-maven-plugin.version>5.4.1</rewrite-maven-plugin.version>
- <rewrite-static-analysis.version>1.0.5</rewrite-static-analysis.version>
- <rewrite-testing.version>2.0.9</rewrite-testing.version>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.openrewrite.maven</groupId>
- <artifactId>rewrite-maven-plugin</artifactId>
- <version>${rewrite-maven-plugin.version}</version>
- <configuration>
- <activeRecipes>
- <recipe>org.apache.logging.log4j.rewrite.FinalizeAll</recipe>
- </activeRecipes>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.openrewrite</groupId>
- <artifactId>rewrite-java</artifactId>
- <version>${rewrite-java.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openrewrite.recipe</groupId>
- <artifactId>rewrite-static-analysis</artifactId>
- <version>${rewrite-static-analysis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openrewrite.recipe</groupId>
- <artifactId>rewrite-testing-frameworks</artifactId>
- <version>${rewrite-testing.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
[logging-log4j2] 06/10: Add OSGi annotation dependencies
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 44988a4cf24ef255265d59f04b74f9e60b356d95
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Tue Sep 26 09:29:24 2023 +0200
Add OSGi annotation dependencies
---
pom.xml | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/pom.xml b/pom.xml
index 1215c2d64e..cb24b8d7c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1316,6 +1316,29 @@
</dependencies>
</dependencyManagement>
+ <!-- Common annotations used in all the modules -->
+ <dependencies>
+
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bnd.annotation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.bundle</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
<repositories>
<repository>
<releases>