You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2020/11/03 19:40:03 UTC
[logging-log4j2] branch release-2.x updated: Only generate doap
file in parent project
This is an automated email from the ASF dual-hosted git repository.
rgoers 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 2fc2e1f Only generate doap file in parent project
2fc2e1f is described below
commit 2fc2e1f4978dce23a00a9110d0f882ad95aadaa9
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Tue Nov 3 12:39:43 2020 -0700
Only generate doap file in parent project
---
log4j-1.2-api/pom.xml | 1 +
log4j-api-java9/pom.xml | 9 +++++++++
log4j-api/pom.xml | 1 +
log4j-appserver/pom.xml | 1 +
log4j-cassandra/pom.xml | 1 +
log4j-core-java9/pom.xml | 9 +++++++++
log4j-core/pom.xml | 1 +
log4j-couchdb/pom.xml | 1 +
log4j-docker/pom.xml | 1 +
log4j-flume-ng/pom.xml | 1 +
log4j-iostreams/pom.xml | 1 +
log4j-jcl/pom.xml | 1 +
log4j-jdbc-dbcp2/pom.xml | 1 +
log4j-jmx-gui/pom.xml | 1 +
log4j-jpa/pom.xml | 1 +
log4j-jpl/pom.xml | 1 +
log4j-jul/pom.xml | 1 +
log4j-kubernetes/pom.xml | 1 +
log4j-layout-template-json/pom.xml | 1 +
log4j-liquibase/pom.xml | 1 +
log4j-mongodb3/pom.xml | 1 +
log4j-mongodb4/pom.xml | 1 +
log4j-osgi/pom.xml | 1 +
log4j-perf/pom.xml | 1 +
log4j-slf4j-impl/pom.xml | 1 +
log4j-slf4j18-impl/pom.xml | 1 +
log4j-spring-boot/pom.xml | 1 +
log4j-spring-cloud-config/pom.xml | 1 +
log4j-taglib/pom.xml | 1 +
log4j-to-slf4j/pom.xml | 1 +
log4j-web/pom.xml | 1 +
pom.xml | 2 ++
32 files changed, 49 insertions(+)
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 2ab9186..c230dbc 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -32,6 +32,7 @@
<docLabel>Log4j 1.2 Documentation</docLabel>
<projectDir>/log4j12-api</projectDir>
<module.name>org.apache.log4j</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-api-java9/pom.xml b/log4j-api-java9/pom.xml
index ae176e7..6c97020 100644
--- a/log4j-api-java9/pom.xml
+++ b/log4j-api-java9/pom.xml
@@ -144,6 +144,15 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${site.plugin.version}</version>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index da579ce..8ee0aeb 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -31,6 +31,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>API Documentation</docLabel>
<projectDir>/api</projectDir>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
index f1b49ad..d6ee40d 100644
--- a/log4j-appserver/pom.xml
+++ b/log4j-appserver/pom.xml
@@ -36,6 +36,7 @@
<tomcat.version>8.5.20</tomcat.version>
<jetty.version>8.2.0.v20160908</jetty.version> <!-- Jetty 9 requires Java 8 -->
<module.name>org.apache.logging.log4j.appserver</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
diff --git a/log4j-cassandra/pom.xml b/log4j-cassandra/pom.xml
index 0a852ef..186150b 100644
--- a/log4j-cassandra/pom.xml
+++ b/log4j-cassandra/pom.xml
@@ -34,6 +34,7 @@
<docLabel>Cassandra Documentation</docLabel>
<projectDir>/log4j-cassandra</projectDir>
<module.name>org.apache.logging.log4j.cassandra</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
diff --git a/log4j-core-java9/pom.xml b/log4j-core-java9/pom.xml
index 5634b5d..ef3dc0b 100644
--- a/log4j-core-java9/pom.xml
+++ b/log4j-core-java9/pom.xml
@@ -144,6 +144,15 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${site.plugin.version}</version>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 522f47b..77904be 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -31,6 +31,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Core Documentation</docLabel>
<projectDir>/core</projectDir>
+ <maven.doap.skip>true</maven.doap.skip>
<!--<revapi.skip>true</revapi.skip>-->
</properties>
<dependencies>
diff --git a/log4j-couchdb/pom.xml b/log4j-couchdb/pom.xml
index 32a7312..68e94ed 100644
--- a/log4j-couchdb/pom.xml
+++ b/log4j-couchdb/pom.xml
@@ -34,6 +34,7 @@
<docLabel>CouchDB Documentation</docLabel>
<projectDir>/log4j-couchdb</projectDir>
<module.name>org.apache.logging.log4j.couchdb</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
diff --git a/log4j-docker/pom.xml b/log4j-docker/pom.xml
index 920bafa..929978e 100644
--- a/log4j-docker/pom.xml
+++ b/log4j-docker/pom.xml
@@ -34,6 +34,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<module.name>org.apache.logging.log4j.docker</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml
index 26f2b29..1ca6d3b 100644
--- a/log4j-flume-ng/pom.xml
+++ b/log4j-flume-ng/pom.xml
@@ -32,6 +32,7 @@
<docLabel>Flume Documentation</docLabel>
<projectDir>/flume-ng</projectDir>
<module.name>org.apache.logging.log4j.flume</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml
index 5524279..193fbd7 100644
--- a/log4j-iostreams/pom.xml
+++ b/log4j-iostreams/pom.xml
@@ -32,6 +32,7 @@
<docLabel>Streaming Documentation</docLabel>
<projectDir>/log4j-iostreams</projectDir>
<module.name>org.apache.logging.log4j.iostreams</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml
index 1f50dea..b010572 100644
--- a/log4j-jcl/pom.xml
+++ b/log4j-jcl/pom.xml
@@ -32,6 +32,7 @@
<docLabel>JCL Bridge Documentation</docLabel>
<projectDir>/jcl-bridge</projectDir>
<module.name>org.apache.logging.log4j.jcl</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml
index a882bd8..70804d5 100644
--- a/log4j-jdbc-dbcp2/pom.xml
+++ b/log4j-jdbc-dbcp2/pom.xml
@@ -25,6 +25,7 @@
<docLabel>Log4j JDBC DBCP 2 Documentation</docLabel>
<projectDir>/log4j-jdbc-dbcp2</projectDir>
<module.name>org.apache.logging.log4j.jdbc.dbcp2</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
diff --git a/log4j-jmx-gui/pom.xml b/log4j-jmx-gui/pom.xml
index 1fb7375..5730d1d 100644
--- a/log4j-jmx-gui/pom.xml
+++ b/log4j-jmx-gui/pom.xml
@@ -35,6 +35,7 @@
<projectDir>/jmx-gui</projectDir>
<jenkins.java.home>/home/jenkins/tools/java/latest1.7</jenkins.java.home>
<module.name>org.apache.logging.log4j.jmx.gui</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-jpa/pom.xml b/log4j-jpa/pom.xml
index 8408ffc..79f01f4 100644
--- a/log4j-jpa/pom.xml
+++ b/log4j-jpa/pom.xml
@@ -25,6 +25,7 @@
<docLabel>Log4j JPA Documentation</docLabel>
<projectDir>/log4j-jpa</projectDir>
<module.name>org.apache.logging.log4j.jpa</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
diff --git a/log4j-jpl/pom.xml b/log4j-jpl/pom.xml
index 9c98807..5405ee0 100644
--- a/log4j-jpl/pom.xml
+++ b/log4j-jpl/pom.xml
@@ -28,6 +28,7 @@
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<module.name>org.apache.logging.log4j.jpl</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<artifactId>log4j-jpl</artifactId>
diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml
index cc06f4b..605d3b4 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -28,6 +28,7 @@
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<module.name>org.apache.logging.log4j.jul</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<artifactId>log4j-jul</artifactId>
diff --git a/log4j-kubernetes/pom.xml b/log4j-kubernetes/pom.xml
index b04f596..2980e94 100644
--- a/log4j-kubernetes/pom.xml
+++ b/log4j-kubernetes/pom.xml
@@ -34,6 +34,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<module.name>org.apache.logging.log4j.kubernetes</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml
index 2e1286f..e19dcd7 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -38,6 +38,7 @@
<docLabel>Log4j Layout for JSON Template Documentation</docLabel>
<projectDir>/log4j-layout-template-json</projectDir>
<module.name>org.apache.logging.log4j.layout.template.json</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
diff --git a/log4j-liquibase/pom.xml b/log4j-liquibase/pom.xml
index 402abe8..ea7ec4b 100644
--- a/log4j-liquibase/pom.xml
+++ b/log4j-liquibase/pom.xml
@@ -31,6 +31,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Liquibase Documentation</docLabel>
<projectDir>/liquibase</projectDir>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-mongodb3/pom.xml b/log4j-mongodb3/pom.xml
index b08b6ed..81ea7b3 100644
--- a/log4j-mongodb3/pom.xml
+++ b/log4j-mongodb3/pom.xml
@@ -34,6 +34,7 @@
<docLabel>MongoDB 3 Documentation</docLabel>
<projectDir>/log4j-mongodb3</projectDir>
<module.name>org.apache.logging.log4j.mongodb3</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml
index 60e88af..88db2bd 100644
--- a/log4j-mongodb4/pom.xml
+++ b/log4j-mongodb4/pom.xml
@@ -34,6 +34,7 @@
<docLabel>MongoDB 4 Documentation</docLabel>
<projectDir>/log4j-mongodb4</projectDir>
<module.name>org.apache.logging.log4j.mongodb4</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml
index 4c0e3f7..db8d717 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi/pom.xml
@@ -32,6 +32,7 @@
<docLabel>OSGi Documentation</docLabel>
<projectDir>/osgi</projectDir>
<module.name>org.apache.logging.log4j.osgi</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<!-- Place Felix before Equinox because Felix is signed. / also place it before org.osgi.core so that its versions of the OSGi classes are used -->
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index 073d579..a192ba9 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -42,6 +42,7 @@
<javac.target>1.7</javac.target>
<uberjar.name>benchmarks</uberjar.name>
<revapi.skip>true</revapi.skip>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index b852518..16fd0b6 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -33,6 +33,7 @@
<projectDir>/slf4j-impl</projectDir>
<slf4j.version>1.7.25</slf4j.version>
<module.name>org.apache.logging.log4j.slf4j</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-slf4j18-impl/pom.xml b/log4j-slf4j18-impl/pom.xml
index 47075e4..8e64675 100644
--- a/log4j-slf4j18-impl/pom.xml
+++ b/log4j-slf4j18-impl/pom.xml
@@ -33,6 +33,7 @@
<projectDir>/slf4j18</projectDir>
<slf4j.version>1.8.0-beta4</slf4j.version>
<module.name>org.apache.logging.log4j.slf4j</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-spring-boot/pom.xml b/log4j-spring-boot/pom.xml
index 8b4c4b8..de7a24a 100644
--- a/log4j-spring-boot/pom.xml
+++ b/log4j-spring-boot/pom.xml
@@ -32,6 +32,7 @@
<docLabel>Log4j Spring Boot Documentation</docLabel>
<projectDir>/log4j-spring-boot</projectDir>
<module.name>org.apache.logging.log4j.spring.boot</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencyManagement>
<dependencies>
diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml
index 1d86e10..e5586de 100644
--- a/log4j-spring-cloud-config/pom.xml
+++ b/log4j-spring-cloud-config/pom.xml
@@ -35,6 +35,7 @@
<spring-boot.version>2.3.4.RELEASE</spring-boot.version>
<springVersion>5.2.8.RELEASE</springVersion>
<log4jParentDir>${basedir}/..</log4jParentDir>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencyManagement>
<dependencies>
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index d0c8994..49370ed 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -32,6 +32,7 @@
<docLabel>Log4j Tag Library Documentation</docLabel>
<projectDir>/taglib</projectDir>
<module.name>org.apache.logging.log4j.taglib</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index d15f982..52acc05 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -32,6 +32,7 @@
<docLabel>SLF4J Documentation</docLabel>
<projectDir>/log4j-to-slf4j</projectDir>
<module.name>org.apache.logging.slf4j</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml
index 3eab8eb..073ffa1 100644
--- a/log4j-web/pom.xml
+++ b/log4j-web/pom.xml
@@ -34,6 +34,7 @@
<docLabel>Web Documentation</docLabel>
<projectDir>/log4j-web</projectDir>
<module.name>org.apache.logging.log4j.web</module.name>
+ <maven.doap.skip>true</maven.doap.skip>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 6dec19b..5ef4de1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,6 +229,7 @@
<manifestfile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestfile>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
+ <maven.doap.skip>false</maven.doap.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<docLabel>Site Documentation</docLabel>
<projectDir />
@@ -1341,6 +1342,7 @@
</charter>
<pmc>https://logging.apache.org</pmc>
</asfExtOptions>
+ <skip>${maven.doap.skip}</skip>
</configuration>
<executions>
<execution>