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 2017/10/15 05:34:16 UTC
logging-log4j2 git commit: LOG4J-2056 - modularize log4j-api. Turn
others into automatic modules
Repository: logging-log4j2
Updated Branches:
refs/heads/master 9b8a17f4c -> d5d00d09e
LOG4J-2056 - modularize log4j-api. Turn others into automatic modules
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d5d00d09
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d5d00d09
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d5d00d09
Branch: refs/heads/master
Commit: d5d00d09ecf28edc9b926ab7a7af51ad406b09d6
Parents: 9b8a17f
Author: Ralph Goers <rg...@nextiva.com>
Authored: Sat Oct 14 22:34:09 2017 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sat Oct 14 22:34:09 2017 -0700
----------------------------------------------------------------------
log4j-1.2-api/pom.xml | 1 +
log4j-api-java9/src/assembly/java9.xml | 12 ++++++++++
log4j-api-java9/src/main/java/module-info.java | 9 ++++++++
.../java/org/apache/logging/log4j/Dummy.java | 24 ++++++++++++++++++++
.../org/apache/logging/log4j/message/Dummy.java | 24 ++++++++++++++++++++
.../org/apache/logging/log4j/simple/Dummy.java | 24 ++++++++++++++++++++
.../org/apache/logging/log4j/spi/Provider.java | 24 ++++++++++++++++++++
.../org/apache/logging/log4j/status/Dummy.java | 24 ++++++++++++++++++++
log4j-appserver/pom.xml | 1 +
log4j-core/pom.xml | 1 +
log4j-flume-ng/pom.xml | 1 +
log4j-iostreams/pom.xml | 1 +
log4j-jcl/pom.xml | 1 +
log4j-jmx-gui/pom.xml | 1 +
log4j-jul/pom.xml | 1 +
log4j-liquibase/pom.xml | 21 +++++++++++++++++
log4j-nosql/pom.xml | 1 +
log4j-osgi/pom.xml | 1 +
log4j-slf4j-impl/pom.xml | 1 +
log4j-taglib/pom.xml | 1 +
log4j-to-slf4j/pom.xml | 1 +
log4j-web/pom.xml | 1 +
pom.xml | 11 +++++----
23 files changed, 182 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-1.2-api/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 5b93624..2451438 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -31,6 +31,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j 1.2 Documentation</docLabel>
<projectDir>/log4j12-api</projectDir>
+ <module.name>org.apache.log4j</module.name>
</properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-api-java9/src/assembly/java9.xml
----------------------------------------------------------------------
diff --git a/log4j-api-java9/src/assembly/java9.xml b/log4j-api-java9/src/assembly/java9.xml
index 739c95d..7955703 100644
--- a/log4j-api-java9/src/assembly/java9.xml
+++ b/log4j-api-java9/src/assembly/java9.xml
@@ -31,6 +31,18 @@
<includes>
<include>**/*.class</include>
</includes>
+ <excludes>
+ <exclude>module-info.class</exclude>
+ <exclude>**/Dummy.class</exclude>
+ <exclude>**/spi/Provider.class</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/classes</outputDirectory>
+ <includes>
+ <include>module-info.class</include>
+ </includes>
</fileSet>
</fileSets>
</assembly>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-api-java9/src/main/java/module-info.java
----------------------------------------------------------------------
diff --git a/log4j-api-java9/src/main/java/module-info.java b/log4j-api-java9/src/main/java/module-info.java
new file mode 100644
index 0000000..25c1d29
--- /dev/null
+++ b/log4j-api-java9/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+module org.apache.logging.log4j {
+ exports org.apache.logging.log4j;
+ exports org.apache.logging.log4j.message;
+ exports org.apache.logging.log4j.simple;
+ exports org.apache.logging.log4j.spi;
+ exports org.apache.logging.log4j.status;
+ exports org.apache.logging.log4j.util;
+ uses org.apache.logging.log4j.spi.Provider;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-api-java9/src/main/java/org/apache/logging/log4j/Dummy.java
----------------------------------------------------------------------
diff --git a/log4j-api-java9/src/main/java/org/apache/logging/log4j/Dummy.java b/log4j-api-java9/src/main/java/org/apache/logging/log4j/Dummy.java
new file mode 100644
index 0000000..24012e6
--- /dev/null
+++ b/log4j-api-java9/src/main/java/org/apache/logging/log4j/Dummy.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j;
+
+/**
+ * This is a dummy class and is only here to allow module-info.java to compile. It will not
+ * be copied into the log4j-api module.
+ */
+public class Dummy {
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-api-java9/src/main/java/org/apache/logging/log4j/message/Dummy.java
----------------------------------------------------------------------
diff --git a/log4j-api-java9/src/main/java/org/apache/logging/log4j/message/Dummy.java b/log4j-api-java9/src/main/java/org/apache/logging/log4j/message/Dummy.java
new file mode 100644
index 0000000..082e36e
--- /dev/null
+++ b/log4j-api-java9/src/main/java/org/apache/logging/log4j/message/Dummy.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.message;
+
+/**
+ * This is a dummy class and is only here to allow module-info.java to compile. It will not
+ * be copied into the log4j-api module.
+ */
+public class Dummy {
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-api-java9/src/main/java/org/apache/logging/log4j/simple/Dummy.java
----------------------------------------------------------------------
diff --git a/log4j-api-java9/src/main/java/org/apache/logging/log4j/simple/Dummy.java b/log4j-api-java9/src/main/java/org/apache/logging/log4j/simple/Dummy.java
new file mode 100644
index 0000000..c3a24e2
--- /dev/null
+++ b/log4j-api-java9/src/main/java/org/apache/logging/log4j/simple/Dummy.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.simple;
+
+/**
+ * This is a dummy class and is only here to allow module-info.java to compile. It will not
+ * be copied into the log4j-api module.
+ */
+public class Dummy {
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-api-java9/src/main/java/org/apache/logging/log4j/spi/Provider.java
----------------------------------------------------------------------
diff --git a/log4j-api-java9/src/main/java/org/apache/logging/log4j/spi/Provider.java b/log4j-api-java9/src/main/java/org/apache/logging/log4j/spi/Provider.java
new file mode 100644
index 0000000..65b8638
--- /dev/null
+++ b/log4j-api-java9/src/main/java/org/apache/logging/log4j/spi/Provider.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.spi;
+
+/**
+ * This is a dummy class and is only here to allow module-info.java to compile. It will not
+ * be copied into the log4j-api module.
+ */
+public class Provider {
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-api-java9/src/main/java/org/apache/logging/log4j/status/Dummy.java
----------------------------------------------------------------------
diff --git a/log4j-api-java9/src/main/java/org/apache/logging/log4j/status/Dummy.java b/log4j-api-java9/src/main/java/org/apache/logging/log4j/status/Dummy.java
new file mode 100644
index 0000000..d53dc43
--- /dev/null
+++ b/log4j-api-java9/src/main/java/org/apache/logging/log4j/status/Dummy.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.status;
+
+/**
+ * This is a dummy class and is only here to allow module-info.java to compile. It will not
+ * be copied into the log4j-api module.
+ */
+public class Dummy {
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-appserver/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
index b95efa3..e96b1fc 100644
--- a/log4j-appserver/pom.xml
+++ b/log4j-appserver/pom.xml
@@ -34,6 +34,7 @@
<docLabel>Web Documentation</docLabel>
<projectDir>/log4j-appserver</projectDir>
<tomcat.version>8.5.20</tomcat.version>
+ <module.name>org.apache.logging.log4j.appserver</module.name>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-core/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index a65a44f..b90f1fd 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -407,6 +407,7 @@
<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>
</manifestEntries>
</archive>
</configuration>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-flume-ng/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml
index 2bde90b..19175f8 100644
--- a/log4j-flume-ng/pom.xml
+++ b/log4j-flume-ng/pom.xml
@@ -31,6 +31,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Flume Documentation</docLabel>
<projectDir>/flume-ng</projectDir>
+ <module.name>org.apache.logging.log4j.flume</module.name>
</properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-iostreams/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml
index 0917974..861c943 100644
--- a/log4j-iostreams/pom.xml
+++ b/log4j-iostreams/pom.xml
@@ -31,6 +31,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Streaming Documentation</docLabel>
<projectDir>/log4j-iostreams</projectDir>
+ <module.name>org.apache.logging.log4j.iostreams</module.name>
</properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-jcl/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml
index 3810524..4064131 100644
--- a/log4j-jcl/pom.xml
+++ b/log4j-jcl/pom.xml
@@ -31,6 +31,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>JCL Bridge Documentation</docLabel>
<projectDir>/jcl-bridge</projectDir>
+ <module.name>org.apache.logging.log4j.jcl</module.name>
</properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-jmx-gui/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jmx-gui/pom.xml b/log4j-jmx-gui/pom.xml
index 4270bb9..48562e3 100644
--- a/log4j-jmx-gui/pom.xml
+++ b/log4j-jmx-gui/pom.xml
@@ -34,6 +34,7 @@
<docLabel>JMX GUI Documentation</docLabel>
<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>
</properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-jul/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml
index 1ef208c..5c1208f 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -27,6 +27,7 @@
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
+ <module.name>org.apache.logging.log4j.jul</module.name>
</properties>
<artifactId>log4j-jul</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-liquibase/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-liquibase/pom.xml b/log4j-liquibase/pom.xml
index 78ac775..969436e 100644
--- a/log4j-liquibase/pom.xml
+++ b/log4j-liquibase/pom.xml
@@ -140,6 +140,27 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.0.2</version>
+ <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>
+ </plugin>
</plugins>
</build>
<reporting>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-nosql/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-nosql/pom.xml b/log4j-nosql/pom.xml
index 35c887c..670c5e2 100644
--- a/log4j-nosql/pom.xml
+++ b/log4j-nosql/pom.xml
@@ -33,6 +33,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>NoSQL Documentation</docLabel>
<projectDir>/log4j-nosql</projectDir>
+ <module.name>org.apache.logging.log4j.nosql</module.name>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml
index 0ef5be6..01af59f 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi/pom.xml
@@ -31,6 +31,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>OSGi Documentation</docLabel>
<projectDir>/osgi</projectDir>
+ <module.name>org.apache.logging.log4j.osgi</module.name>
</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 -->
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-slf4j-impl/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index 50e5cae..2691dfb 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -32,6 +32,7 @@
<docLabel>SLF4J Documentation</docLabel>
<projectDir>/slf4j-impl</projectDir>
<slf4j.version>1.8.0-alpha2</slf4j.version>
+ <module.name>org.apache.logging.log4j.slf4j.impl</module.name>
</properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-taglib/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index 316c3a1..32ed968 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -31,6 +31,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j Tag Library Documentation</docLabel>
<projectDir>/taglib</projectDir>
+ <module.name>org.apache.logging.log4j.taglib</module.name>
</properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-to-slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index ac3e30b..cfd777c 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -31,6 +31,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>SLF4J Documentation</docLabel>
<projectDir>/log4j-to-slf4j</projectDir>
+ <module.name>org.apache.logging.slf4j</module.name>
</properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/log4j-web/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml
index 4b2fc63..6d5d282 100644
--- a/log4j-web/pom.xml
+++ b/log4j-web/pom.xml
@@ -33,6 +33,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Web Documentation</docLabel>
<projectDir>/log4j-web</projectDir>
+ <module.name>org.apache.logging.log4j.web</module.name>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5d00d09/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c0d7df..f27af6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,7 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the license for the specific language governing permissions and
~ limitations under the license.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
@@ -209,7 +208,7 @@
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<docLabel>Site Documentation</docLabel>
- <projectDir />
+ <projectDir/>
<commonsLoggingVersion>1.2</commonsLoggingVersion>
<osgi.api.version>6.0.0</osgi.api.version>
<!-- Version 5.15.0 requires Java 8 -->
@@ -220,6 +219,7 @@
<mockitoVersion>2.10.0</mockitoVersion>
<argLine>-Xms256m -Xmx1024m</argLine>
<javaTargetVersion>1.7</javaTargetVersion>
+ <module.name/>
</properties>
<pluginRepositories>
<pluginRepository>
@@ -870,7 +870,7 @@
<maxmem>1024</maxmem>
<compilerArguments>
<Xmaxwarns>10000</Xmaxwarns>
- <Xlint />
+ <Xlint/>
</compilerArguments>
</configuration>
</plugin>
@@ -970,6 +970,7 @@
<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>
@@ -1084,7 +1085,7 @@
</goals>
<configuration>
<skip>true</skip>
- <resourceBundles />
+ <resourceBundles/>
</configuration>
</execution>
</executions>