Skip to content

Commit 465f828

Browse files
committed
Fix build
1 parent 940297f commit 465f828

File tree

4 files changed

+43
-27
lines changed

4 files changed

+43
-27
lines changed

jpl-to-log4j-api/pom.xml

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,67 +19,54 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
2121
<groupId>org.apache.logging.log4j</groupId>
22-
<artifactId>log4j</artifactId>
22+
<artifactId>log4j-jdk-parent</artifactId>
2323
<version>${revision}</version>
24-
<relativePath>../log4j-parent</relativePath>
24+
<relativePath>../parent</relativePath>
2525
</parent>
2626

27-
<artifactId>log4j-jpl</artifactId>
28-
<name>Apache Log4j JDK Platform Logging Adapter</name>
27+
<artifactId>jpl-to-log4j-api</artifactId>
28+
<name>JPL to Log4j API logging bridge</name>
2929
<description>The Apache Log4j implementation of java.lang.System.LoggerFinder</description>
3030

3131
<properties>
32-
<module.name>org.apache.logging.log4j.jpl</module.name>
32+
<!-- Skips BND Baseline until the first release -->
33+
<bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
34+
35+
<module.name>org.apache.logging.jpl.log4j.api</module.name>
3336
<maven.compiler.release>11</maven.compiler.release>
3437
</properties>
3538

3639
<dependencies>
40+
3741
<dependency>
3842
<groupId>org.apache.logging.log4j</groupId>
3943
<artifactId>log4j-api</artifactId>
4044
</dependency>
45+
4146
<dependency>
4247
<groupId>org.apache.logging.log4j</groupId>
4348
<artifactId>log4j-core</artifactId>
4449
<scope>test</scope>
4550
</dependency>
51+
4652
<dependency>
4753
<groupId>org.apache.logging.log4j</groupId>
4854
<artifactId>log4j-core-test</artifactId>
4955
<scope>test</scope>
5056
</dependency>
57+
5158
<dependency>
5259
<groupId>org.hamcrest</groupId>
5360
<artifactId>hamcrest</artifactId>
5461
<scope>test</scope>
5562
</dependency>
63+
5664
<dependency>
5765
<groupId>org.junit.jupiter</groupId>
5866
<artifactId>junit-jupiter-engine</artifactId>
5967
<scope>test</scope>
6068
</dependency>
61-
</dependencies>
6269

63-
<build>
64-
<plugins>
65-
<plugin>
66-
<groupId>org.apache.maven.plugins</groupId>
67-
<artifactId>maven-surefire-plugin</artifactId>
68-
<executions>
69-
<!-- Uses a different id than `default-test` to ignore the `java8-tests` profile -->
70-
<execution>
71-
<id>run-tests</id>
72-
<goals>
73-
<goal>test</goal>
74-
</goals>
75-
</execution>
76-
<execution>
77-
<id>default-test</id>
78-
<phase>none</phase>
79-
</execution>
80-
</executions>
81-
</plugin>
82-
</plugins>
83-
</build>
70+
</dependencies>
8471

8572
</project>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
117
org.apache.logging.log4j.jpl.Log4jSystemLoggerFinder

parent/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@
7171
<scope>import</scope>
7272
</dependency>
7373

74+
<dependency>
75+
<groupId>org.hamcrest</groupId>
76+
<artifactId>hamcrest</artifactId>
77+
<version>${hamcrest.version}</version>
78+
</dependency>
79+
7480
<dependency>
7581
<groupId>org.junit</groupId>
7682
<artifactId>junit-bom</artifactId>

pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<module>parent</module>
6060

6161
<!-- Modules here must have a corresponding entry in `dependencyManagement > dependencies` block below! -->
62+
<module>jpl-to-log4j-api</module>
6263
<module>log4j-api-to-jul</module>
6364

6465
</modules>
@@ -100,6 +101,12 @@
100101
<dependencyManagement>
101102
<dependencies>
102103

104+
<dependency>
105+
<groupId>org.apache.logging.log4j</groupId>
106+
<artifactId>jpl-to-log4j-api</artifactId>
107+
<version>${project.version}</version>
108+
</dependency>
109+
103110
<dependency>
104111
<groupId>org.apache.logging.log4j</groupId>
105112
<artifactId>log4j-api-to-jul</artifactId>

0 commit comments

Comments
 (0)