Skip to content

Commit 349d321

Browse files
authored
Merge branch 'branch_1.2.18' into osgi-manifest-cleanup
2 parents 274ee9d + d2f001d commit 349d321

File tree

12 files changed

+83
-1567
lines changed

12 files changed

+83
-1567
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@
326326
org.xml.sax.helpers
327327
</Import-Package>
328328
<Bundle-DocURL>https://reload4j.qos.ch/</Bundle-DocURL>
329-
<Bundle-RequiredExecutionEnvironment>JavaSE-1.5</Bundle-RequiredExecutionEnvironment>
329+
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
330330
</instructions>
331331
</configuration>
332332
</plugin>

src/main/java/org/apache/log4j/jmx/AbstractDynamicMBean.java

Lines changed: 0 additions & 175 deletions
This file was deleted.

src/main/java/org/apache/log4j/jmx/Agent.java

Lines changed: 0 additions & 128 deletions
This file was deleted.

0 commit comments

Comments
 (0)