Index: pom.xml =================================================================== --- pom.xml (revision 1521748) +++ pom.xml (working copy) @@ -143,7 +143,10 @@ * + *;resolution:=optional 3.0.1 Index: log4j-osgi/core-osgi-reduced/pom.xml =================================================================== --- log4j-osgi/core-osgi-reduced/pom.xml (revision 1521748) +++ log4j-osgi/core-osgi-reduced/pom.xml (working copy) @@ -37,11 +37,210 @@ org.apache.logging.log4j log4j-core + compile + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core + + *.* + + org/apache/logging/log4j/core + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/appender + + AbstractAppender.class + AbstractManager.class + AbstractOutputStreamAppender.class + AppenderLoggingException.class + CompressionType.class + ConsoleAppender.class + DefaultErrorHandler.class + FailoverAppender.class + FailoversPlugin.class + FileAppender.class + FileManager.class + ManagerFactory.class + OutputStreamManager.class + RandomAccessFileAppender.class + RandomAccessFileManager.class + RollingFileAppender.class + RollingRandomAccessFileAppender.class + + org/apache/logging/log4j/core/appender + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/appender/rewrite + + *.* + + org/apache/logging/log4j/core/appender/rewrite + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/appender/rolling + + **/*.* + + org/apache/logging/log4j/core/appender/rolling + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/appender/routing + + *.* + + org/apache/logging/log4j/core/appender/routing + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/filter + + **/*.* + + org/apache/logging/log4j/core/filter + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/helpers + + **/*.* + + org/apache/logging/log4j/core/helpers + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/impl + + **/*.* + + org/apache/logging/log4j/core/impl + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/jmx + + **/*.* + + org/apache/logging/log4j/core/jmx + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/layout + + **/*.* + + org/apache/logging/log4j/core/layout + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/lookup + + **/*.* + + org/apache/logging/log4j/core/lookup + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/pattern + + **/*.* + + org/apache/logging/log4j/core/pattern + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/selector + + **/*.* + + org/apache/logging/log4j/core/selector + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/net + + Advertiser.class + + org/apache/logging/log4j/core/net + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/net/ssl + + **/*.* + + org/apache/logging/log4j/core/net/ssl + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/config + + **/*.* + + org/apache/logging/log4j/core/config + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/config/plugins + + *.class + + org/apache/logging/log4j/core/config/plugins + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/appender/db + + **/*.* + + org/apache/logging/log4j/core/appender/db + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/appender/db/jpa + + **/*.* + + org/apache/logging/log4j/core/appender/db/jpa + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/appender/db/jpa/converter + + **/*.* + + org/apache/logging/log4j/core/appender/db/jpa/converter + + + ${basedir}/target/log4j-core/classes/org/apache/logging/log4j/core/appender/db/nosql + + **/*.* + + org/apache/logging/log4j/core/appender/db/nosql + + + ${basedir}/target/log4j-core/classes/META-INF + + MANIFEST.MF + + + log4j-provider.properties + **/*.* + + META-INF + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + process-sources + + unpack + + + + + org.apache.logging.log4j + log4j-core + + + target/log4j-core/classes + + + + + maven-antrun-plugin @@ -59,6 +258,25 @@ + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + process-classes + + java + + + + + org.apache.logging.log4j.core.config.plugins.PluginManager + + ${project.build.outputDirectory} + + + + org.apache.felix maven-bundle-plugin true @@ -71,26 +289,22 @@ true - false + true <_nouses>true <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME ${osgi.symbolicName} - - !${project.parent.groupId}.core.appender.db.jpa.*, - ${project.parent.groupId}.core.appender.db.nosql, - !${project.parent.groupId}.core.appender.db.nosql.*, - !${project.parent.groupId}.core.async.*, - !${project.parent.groupId}.core.net.*, - ${project.parent.groupId}.core.* - + ${osgi.export} ${osgi.private} - ${osgi.import} + ${osgi.import.optional} ${osgi.dynamicImport} ${project.url} org.apache.logging.log4j-api;bundle-version=${project.version.osgi} + + {maven-resources} +