diff --git a/.apache-commons-logging.metadata b/.apache-commons-logging.metadata index 36f7431..63843a2 100644 --- a/.apache-commons-logging.metadata +++ b/.apache-commons-logging.metadata @@ -1 +1 @@ -0a134d01e9aeb09b33f4c7450fb41abb7bed9db6 SOURCES/commons-logging-1.2-src.tar.gz +83a736429d012340650e367aea5448facc17b14e SOURCES/commons-logging-1.3.4-src.tar.gz diff --git a/.gitignore b/.gitignore index 65e8188..3817ee2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/commons-logging-1.2-src.tar.gz +SOURCES/commons-logging-1.3.4-src.tar.gz diff --git a/SOURCES/0001-Generate-different-Bundle-SymbolicName-for-different.patch b/SOURCES/0001-Generate-different-Bundle-SymbolicName-for-different.patch deleted file mode 100644 index a8c0ddc..0000000 --- a/SOURCES/0001-Generate-different-Bundle-SymbolicName-for-different.patch +++ /dev/null @@ -1,99 +0,0 @@ -From d71aa7acc93b944b159ac63f85d9ba1a566f5a8d Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Tue, 29 Jul 2014 09:00:03 +0200 -Subject: [PATCH 1/2] Generate different Bundle-SymbolicName for different JARs - ---- - pom.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 55 insertions(+) - -diff --git a/pom.xml b/pom.xml -index cdad31c..5707595 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -179,6 +179,52 @@ under the License. - - - -+ -+ org.apache.felix -+ maven-bundle-plugin -+ -+ -+ tests-bundle-manifest -+ process-classes -+ -+ manifest -+ -+ -+ ${project.build.directory}/osgi-tests -+ -+ ${commons.osgi.symbolicName}.tests -+ -+ -+ -+ -+ api-bundle-manifest -+ process-classes -+ -+ manifest -+ -+ -+ ${project.build.directory}/osgi-api -+ -+ ${commons.osgi.symbolicName}.api -+ -+ -+ -+ -+ adapters-bundle-manifest -+ process-classes -+ -+ manifest -+ -+ -+ ${project.build.directory}/osgi-adapters -+ -+ ${commons.osgi.symbolicName}.adapters -+ -+ -+ -+ -+ -+ - -- org.codehaus.mojo -- build-helper-maven-plugin -- 1.0 -- -- -- attach-artifacts -- package -- -- attach-artifact -- -- -- -- -- ${project.build.directory}/${project.artifactId}-adapters-${project.version}.jar -- jar -- adapters -- -- -- ${project.build.directory}/${project.artifactId}-api-${project.version}.jar -- jar -- api -- -- -- -- -- -- -- -- --