Permalink
Browse files

PAXLOGGING-124: The log4j classes embedded are not the modified versi…

…ons of these classes
  • Loading branch information...
1 parent 43acc46 commit 3fc0a359ce76cb331678af901e261950c8946d68 @gnodet gnodet committed Dec 16, 2011
Showing with 3 additions and 26 deletions.
  1. +0 −8 pax-logging-service/build.properties
  2. +2 −7 pax-logging-service/osgi.bnd
  3. +0 −10 pax-logging-service/pom.xml
  4. +1 −1 pom.xml
View
8 pax-logging-service/build.properties
@@ -1,8 +0,0 @@
-source.. = src/main.java/,\
- src/main/java/,\
- src/test/java/,\
- src/main/resources/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- target/classes/log4j-1.2.13.jar
View
9 pax-logging-service/osgi.bnd
@@ -1,13 +1,8 @@
Bundle-Activator: org.ops4j.pax.logging.service.internal.Activator
-Embed-Dependency: \
- log4j;inline=true
-
Private-Package: \
- org.apache.log4j; -split-package:=merge-first, \
- org.apache.log4j.config; -split-package:=merge-first, \
- org.apache.log4j.sift; -split-package:=merge-first, \
- org.apache.log4j.spi; -split-package:=merge-first, \
+ org.apache.log4j*; -split-package:=merge-first, \
+ META-INF.maven.log4j*, \
org.ops4j.pax.logging.internal, \
org.ops4j.pax.logging.service.internal, \
org.ops4j.pax.logging.util
View
10 pax-logging-service/pom.xml
@@ -84,16 +84,6 @@
<include>${project.groupId}:${project.artifactId}</include>
</includes>
</artifactSet>
- <!--
- <filters>
- <filter>
- <artifact>log4j:log4j</artifact>
- <excludes>
- <exclude>org/**</exclude>
- </excludes>
- </filter>
- </filters>
- -->
<createSourcesJar>true</createSourcesJar>
<promoteTransitiveDependencies>false</promoteTransitiveDependencies>
<createDependencyReducedPom>false</createDependencyReducedPom>
View
2 pom.xml
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.1.0</version>
+ <version>2.3.6</version>
<extensions>true</extensions>
<configuration>
<instructions>

0 comments on commit 3fc0a35

Please sign in to comment.