Fix build
diff --git a/jpl-to-log4j-api/pom.xml b/jpl-to-log4j-api/pom.xml index 736a95f..05f46b2 100644 --- a/jpl-to-log4j-api/pom.xml +++ b/jpl-to-log4j-api/pom.xml
@@ -19,67 +19,54 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j</artifactId> + <artifactId>log4j-jdk-parent</artifactId> <version>${revision}</version> - <relativePath>../log4j-parent</relativePath> + <relativePath>../parent</relativePath> </parent> - <artifactId>log4j-jpl</artifactId> - <name>Apache Log4j JDK Platform Logging Adapter</name> + <artifactId>jpl-to-log4j-api</artifactId> + <name>JPL to Log4j API logging bridge</name> <description>The Apache Log4j implementation of java.lang.System.LoggerFinder</description> <properties> - <module.name>org.apache.logging.log4j.jpl</module.name> + <!-- Skips BND Baseline until the first release --> + <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing> + + <module.name>org.apache.logging.jpl.log4j.api</module.name> <maven.compiler.release>11</maven.compiler.release> </properties> <dependencies> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> </dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core-test</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <!-- Uses a different id than `default-test` to ignore the `java8-tests` profile --> - <execution> - <id>run-tests</id> - <goals> - <goal>test</goal> - </goals> - </execution> - <execution> - <id>default-test</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> + </dependencies> </project>
diff --git a/jpl-to-log4j-api/src/main/resources/META-INF/services/java.lang.System$LoggerFinder b/jpl-to-log4j-api/src/main/resources/META-INF/services/java.lang.System$LoggerFinder index b959e7e..0f0f23e 100644 --- a/jpl-to-log4j-api/src/main/resources/META-INF/services/java.lang.System$LoggerFinder +++ b/jpl-to-log4j-api/src/main/resources/META-INF/services/java.lang.System$LoggerFinder
@@ -1 +1,17 @@ +# 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. org.apache.logging.log4j.jpl.Log4jSystemLoggerFinder \ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml index 65886d1..01efcec 100644 --- a/parent/pom.xml +++ b/parent/pom.xml
@@ -72,6 +72,12 @@ </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <version>${hamcrest.version}</version> + </dependency> + + <dependency> <groupId>org.junit</groupId> <artifactId>junit-bom</artifactId> <version>${junit.version}</version>
diff --git a/pom.xml b/pom.xml index 65a200b..1b8ff72 100644 --- a/pom.xml +++ b/pom.xml
@@ -59,6 +59,7 @@ <module>parent</module> <!-- Modules here must have a corresponding entry in `dependencyManagement > dependencies` block below! --> + <module>jpl-to-log4j-api</module> <module>log4j-api-to-jul</module> </modules> @@ -102,6 +103,12 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> + <artifactId>jpl-to-log4j-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api-to-jul</artifactId> <version>${project.version}</version> </dependency>