You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/01/21 13:40:53 UTC
[logging-log4j2] branch release-2.x updated: Simplify the `skip`s in POMs for `deploy` and `install`
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new b759178b9d Simplify the `skip`s in POMs for `deploy` and `install`
b759178b9d is described below
commit b759178b9df17d5200e661e0de27ada05cebd6ec
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Sat Jan 21 14:41:53 2023 +0100
Simplify the `skip`s in POMs for `deploy` and `install`
---
log4j-api-java9/pom.xml | 8 +-------
log4j-core-its/pom.xml | 9 ++-------
log4j-core-java9/pom.xml | 8 +-------
log4j-distribution/pom.xml | 12 +++++-------
log4j-perf/pom.xml | 10 +++-------
log4j-samples/log4j-samples-configuration/pom.xml | 7 -------
log4j-samples/log4j-samples-flume-common/pom.xml | 7 -------
log4j-samples/log4j-samples-flume-embedded/pom.xml | 14 --------------
log4j-samples/log4j-samples-flume-remote/pom.xml | 14 --------------
log4j-samples/log4j-samples-loggerProperties/pom.xml | 7 -------
log4j-samples/pom.xml | 12 ++----------
.../log4j-spring-cloud-config-sample-application/pom.xml | 8 --------
.../log4j-spring-cloud-config-sample-server/pom.xml | 8 --------
.../log4j-spring-cloud-config-samples/pom.xml | 12 ++----------
14 files changed, 16 insertions(+), 120 deletions(-)
diff --git a/log4j-api-java9/pom.xml b/log4j-api-java9/pom.xml
index 7dbb6cb8d9..60bc629913 100644
--- a/log4j-api-java9/pom.xml
+++ b/log4j-api-java9/pom.xml
@@ -30,6 +30,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>API Documentation</docLabel>
<projectDir>/api</projectDir>
+ <maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencies>
<dependency>
@@ -111,13 +112,6 @@
<proc>none</proc>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 77d0cd73ab..08c3140119 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -31,6 +31,8 @@
<docLabel>Core Documentation</docLabel>
<projectDir>/core</projectDir>
<revapi.skip>true</revapi.skip>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <maven.install.skip>true</maven.install.skip>
</properties>
<dependencies>
<dependency>
@@ -198,13 +200,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
diff --git a/log4j-core-java9/pom.xml b/log4j-core-java9/pom.xml
index 9ea44e8dda..00e163e298 100644
--- a/log4j-core-java9/pom.xml
+++ b/log4j-core-java9/pom.xml
@@ -30,6 +30,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j Implementation Documentation</docLabel>
<projectDir>/core</projectDir>
+ <maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencies>
<!-- Naturally, all implementations require the log4j-api JAR -->
@@ -111,13 +112,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml
index 4997026633..5d92b7351c 100644
--- a/log4j-distribution/pom.xml
+++ b/log4j-distribution/pom.xml
@@ -26,6 +26,11 @@
<packaging>pom</packaging>
<name>Log4j Distribution</name>
<description>The Apache Log4j distribution archives.</description>
+ <properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <maven.install.skip>true</maven.install.skip>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -662,13 +667,6 @@
</execution> -->
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index ffa91ce1ea..f8df4e5b12 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -35,6 +35,9 @@
<projectDir>/log4j-perf</projectDir>
<uberjar.name>benchmarks</uberjar.name>
<revapi.skip>true</revapi.skip>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <maven.install.skip>true</maven.install.skip>
+ <maven.test.skip>true</maven.test.skip>
<module.name>org.apache.logging.log4j.perf</module.name>
</properties>
@@ -156,13 +159,6 @@
<target>9</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
diff --git a/log4j-samples/log4j-samples-configuration/pom.xml b/log4j-samples/log4j-samples-configuration/pom.xml
index 2fa41558cb..5b59def385 100644
--- a/log4j-samples/log4j-samples-configuration/pom.xml
+++ b/log4j-samples/log4j-samples-configuration/pom.xml
@@ -52,13 +52,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/log4j-samples/log4j-samples-flume-common/pom.xml b/log4j-samples/log4j-samples-flume-common/pom.xml
index f35a9510f6..349a3f3a8c 100644
--- a/log4j-samples/log4j-samples-flume-common/pom.xml
+++ b/log4j-samples/log4j-samples-flume-common/pom.xml
@@ -73,13 +73,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/log4j-samples/log4j-samples-flume-embedded/pom.xml b/log4j-samples/log4j-samples-flume-embedded/pom.xml
index 0c1133c7d5..16b3952667 100644
--- a/log4j-samples/log4j-samples-flume-embedded/pom.xml
+++ b/log4j-samples/log4j-samples-flume-embedded/pom.xml
@@ -102,20 +102,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
diff --git a/log4j-samples/log4j-samples-flume-remote/pom.xml b/log4j-samples/log4j-samples-flume-remote/pom.xml
index e1c2891ecf..542d212e0b 100644
--- a/log4j-samples/log4j-samples-flume-remote/pom.xml
+++ b/log4j-samples/log4j-samples-flume-remote/pom.xml
@@ -94,20 +94,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
diff --git a/log4j-samples/log4j-samples-loggerProperties/pom.xml b/log4j-samples/log4j-samples-loggerProperties/pom.xml
index 4e5d8e744c..7823ad4c42 100644
--- a/log4j-samples/log4j-samples-loggerProperties/pom.xml
+++ b/log4j-samples/log4j-samples-loggerProperties/pom.xml
@@ -52,13 +52,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/log4j-samples/pom.xml b/log4j-samples/pom.xml
index 38f81b7047..f440b194e8 100644
--- a/log4j-samples/pom.xml
+++ b/log4j-samples/pom.xml
@@ -36,6 +36,8 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<revapi.skip>true</revapi.skip>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <maven.install.skip>true</maven.install.skip>
<maven-jetty-plugin.version>6.1.26</maven-jetty-plugin.version>
<spring-ws.version>4.0.0</spring-ws.version>
</properties>
@@ -80,16 +82,6 @@
<plugins>
- <!-- Samples aren't meant to be consumed as dependencies.
- Skip deploying their artifacts: -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
<!-- `enforce-upper-bound-deps` enforcer using `requireUpperBoundDeps` directive has been of no help so far.
It is a source of compilation errors that have nothing much to do with Log4j.
Hence, disabling it for samples: -->
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml
index 91b6bd5ce6..97d9c7303b 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml
@@ -169,14 +169,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
index b981a5890d..312d5ef917 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
@@ -115,14 +115,6 @@
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
index 0471e7127b..8bcaa29836 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
@@ -30,7 +30,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<revapi.skip>true</revapi.skip>
<log4jParentDir>${basedir}/../..</log4jParentDir>
-
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <maven.install.skip>true</maven.install.skip>
<spring-ws.version>4.0.0</spring-ws.version>
</properties>
<dependencyManagement>
@@ -63,14 +64,5 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>