Skip to content

Commit 6eed880

Browse files
committed
Port log4j-jpl changes from 2.x
The only differences were in the POM file. Part of #2016.
1 parent 9bddb55 commit 6eed880

File tree

1 file changed

+1
-31
lines changed

1 file changed

+1
-31
lines changed

log4j-jpl/pom.xml

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,18 @@
2929
<description>The Apache Log4j implementation of java.lang.System.LoggerFinder</description>
3030

3131
<properties>
32-
<log4jParentDir>${basedir}/..</log4jParentDir>
3332
<module.name>org.apache.logging.log4j.jpl</module.name>
3433
</properties>
3534

3635
<dependencies>
37-
<dependency>
38-
<groupId>org.osgi</groupId>
39-
<artifactId>org.osgi.framework</artifactId>
40-
<scope>provided</scope>
41-
</dependency>
4236
<dependency>
4337
<groupId>org.apache.logging.log4j</groupId>
4438
<artifactId>log4j-api</artifactId>
4539
</dependency>
4640
<dependency>
4741
<groupId>org.apache.logging.log4j</groupId>
4842
<artifactId>log4j-core</artifactId>
49-
<optional>true</optional>
50-
</dependency>
51-
<dependency>
52-
<groupId>com.lmax</groupId>
53-
<artifactId>disruptor</artifactId>
54-
<optional>true</optional>
43+
<scope>test</scope>
5544
</dependency>
5645
<dependency>
5746
<groupId>org.apache.logging.log4j</groupId>
@@ -74,23 +63,4 @@
7463
<scope>test</scope>
7564
</dependency>
7665
</dependencies>
77-
78-
<build>
79-
<plugins>
80-
<plugin>
81-
<groupId>org.apache.maven.plugins</groupId>
82-
<artifactId>maven-surefire-plugin</artifactId>
83-
<!-- Manual override of the Surefire provider -->
84-
<!-- The `surefire-platform` provider initializes JUL before calling our tests -->
85-
<dependencies>
86-
<dependency>
87-
<groupId>org.apache.maven.surefire</groupId>
88-
<artifactId>surefire-junit47</artifactId>
89-
<version>${surefire.version}</version>
90-
</dependency>
91-
</dependencies>
92-
</plugin>
93-
</plugins>
94-
</build>
95-
9666
</project>

0 commit comments

Comments
 (0)