Repository: logging-log4j2 Updated Branches: refs/heads/master 6c8f0d6bc -> 55b9fd209
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/55b9fd20/log4j-samples/loggerProperties/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-samples/loggerProperties/pom.xml b/log4j-samples/loggerProperties/pom.xml index 207bb2e..62700ea 100644 --- a/log4j-samples/loggerProperties/pom.xml +++ b/log4j-samples/loggerProperties/pom.xml @@ -50,6 +50,14 @@ <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.2</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/55b9fd20/log4j-samples/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-samples/pom.xml b/log4j-samples/pom.xml index 2c7cc63..e301bfb 100644 --- a/log4j-samples/pom.xml +++ b/log4j-samples/pom.xml @@ -111,6 +111,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.2</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/55b9fd20/log4j-samples/scala-api/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-samples/scala-api/pom.xml b/log4j-samples/scala-api/pom.xml index d305bcb..7d3bbe8 100644 --- a/log4j-samples/scala-api/pom.xml +++ b/log4j-samples/scala-api/pom.xml @@ -75,6 +75,14 @@ <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.2</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/55b9fd20/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4c58276..5235378 100644 --- a/pom.xml +++ b/pom.xml @@ -191,6 +191,7 @@ <javadoc.plugin.version>2.10.4</javadoc.plugin.version> <!-- surefire.plugin.version 2.18 yields http://jira.codehaus.org/browse/SUREFIRE-1121, which is fixed in 2.18.1 --> <!-- surefire.plugin.version 2.19 yields https://issues.apache.org/jira/browse/SUREFIRE-1193. --> + <!-- all versions after 2.13 yield https://issues.apache.org/jira/browse/SUREFIRE-720 --> <surefire.plugin.version>2.20</surefire.plugin.version> <failsafe.plugin.version>2.20</failsafe.plugin.version> <checkstyle.plugin.version>2.17</checkstyle.plugin.version> @@ -302,6 +303,12 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api-java9</artifactId> + <version>${project.version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> <version>${project.version}</version> </dependency> @@ -937,64 +944,6 @@ <plugin> <artifactId>maven-clean-plugin</artifactId> <version>3.0.0</version> - <executions> - <execution> - <id>clean-java9</id> - <goals> - <goal>clean</goal> - </goals> - <phase>process-resources</phase> - <configuration> - <excludeDefaultDirectories>true</excludeDefaultDirectories> - <filesets> - <fileset> - <directory>${project.build.directory}/classes</directory> - <includes> - <include>**/*.class</include> - </includes> - <excludes> - <exclude>module-info.class</exclude> - </excludes> - <followSymlinks>false</followSymlinks> - </fileset> - </filesets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>${compiler.plugin.version}</version> - <executions> - <execution> - <!-- disable annotation processing for first pass --> - <id>default-compile</id> - <configuration> - <excludes> - <exclude>module-info.java</exclude> - </excludes> - </configuration> - </execution> - <execution> - <id>java9-compile</id> - <goals> - <goal>compile</goal> - </goals> - <phase>compile</phase> - <configuration> - <!-- compile everything to ensure module-info contains right entries --> - <!-- required when JAVA_HOME is JDK 8 or below --> - <jdkToolchain> - <version>9</version> - </jdkToolchain> - <release>9</release> - <proc>none</proc> - <includes> - <include>module-info.java</include> - </includes> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -1323,6 +1272,7 @@ </site> </distributionManagement> <modules> + <module>log4j-api-java9</module> <module>log4j-api</module> <module>log4j-core</module> <module>log4j-core-its</module>
