diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 7ee3374..03ca3d9 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -29,7 +29,6 @@ URL: http://commons.apache.org/%{base_name} Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source1: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc Source2: apache-commons-logging.keyring -Source3: http://central.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom Source4: http://central.maven.org/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom Patch0: commons-logging-1.1.3-src-junit.diff Patch1: commons-logging-1.2-sourcetarget.patch @@ -100,7 +99,7 @@ popd # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/%{short_name}-%{version}.pom +install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/%{short_name}-%{version}.pom sed 's#1.1#1.2#g' < %{SOURCE4} > tmp.pom install -pm 644 tmp.pom %{buildroot}/%{_mavenpomdir}/%{short_name}-api-%{version}.pom sed -e 's#1.1#1.2#g' -e "s#%{short_name}-api#%{short_name}-adapters#g" < %{SOURCE4} > tmp.pom diff --git a/commons-logging-1.2.pom b/commons-logging-1.2.pom deleted file mode 100644 index 0e91a6f..0000000 --- a/commons-logging-1.2.pom +++ /dev/null @@ -1,547 +0,0 @@ - - - - - org.apache.commons - commons-parent - 34 - - 4.0.0 - commons-logging - commons-logging - Apache Commons Logging - 1.2 - Apache Commons Logging is a thin adapter allowing configurable bridging to other, - well known logging systems. - http://commons.apache.org/proper/commons-logging/ - - - JIRA - http://issues.apache.org/jira/browse/LOGGING - - - 2001 - - - - baliuka - Juozas Baliuka - baliuka@apache.org - - Java Developer - - - - morgand - Morgan Delagrange - morgand@apache.org - Apache - - Java Developer - - - - donaldp - Peter Donald - donaldp@apache.org - - - rdonkin - Robert Burrell Donkin - rdonkin@apache.org - The Apache Software Foundation - - - skitching - Simon Kitching - skitching@apache.org - The Apache Software Foundation - - - dennisl - Dennis Lundberg - dennisl@apache.org - The Apache Software Foundation - - - costin - Costin Manolache - costin@apache.org - The Apache Software Foundation - - - craigmcc - Craig McClanahan - craigmcc@apache.org - The Apache Software Foundation - - - tn - Thomas Neidhart - tn@apache.org - The Apache Software Foundation - - - sanders - Scott Sanders - sanders@apache.org - The Apache Software Foundation - - - rsitze - Richard Sitze - rsitze@apache.org - The Apache Software Foundation - - - bstansberry - Brian Stansberry - - - rwaldhoff - Rodney Waldhoff - rwaldhoff@apache.org - The Apache Software Foundation - - - - - Matthew P. Del Buono - - Provided patch - - - - Vince Eagen - vince256 at comcast dot net - - Lumberjack logging abstraction - - - - Peter Lawrey - - Provided patch - - - - Berin Loritsch - bloritsch at apache dot org - - Lumberjack logging abstraction - JDK 1.4 logging abstraction - - - - Philippe Mouawad - - Provided patch - - - - Neeme Praks - neeme at apache dot org - - Avalon logging abstraction - - - - - - - scm:svn:http://svn.apache.org/repos/asf/commons/proper/logging/trunk - scm:svn:https://svn.apache.org/repos/asf/commons/proper/logging/trunk - http://svn.apache.org/repos/asf/commons/proper/logging/trunk - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - testjar - package - - test-jar - - - commons-logging - - - - - apijar - package - - jar - - - ${project.artifactId}-api-${project.version} - - org/apache/commons/logging/*.class - org/apache/commons/logging/impl/LogFactoryImpl*.class - org/apache/commons/logging/impl/WeakHashtable*.class - org/apache/commons/logging/impl/SimpleLog*.class - org/apache/commons/logging/impl/NoOpLog*.class - org/apache/commons/logging/impl/Jdk14Logger.class - META-INF/LICENSE.txt - META-INF/NOTICE.txt - - - **/package.html - - - - - - adaptersjar - package - - jar - - - ${project.artifactId}-adapters-${project.version} - - org/apache/commons/logging/impl/**.class - META-INF/LICENSE.txt - META-INF/NOTICE.txt - - - org/apache/commons/logging/impl/WeakHashtable*.class - org/apache/commons/logging/impl/LogFactoryImpl*.class - - - - - - - fulljar - package - - jar - - - ${project.artifactId}-${project.version} - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - site.resources - site - - - - - - - - - - - run - - - - - - - - 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 - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - - org.codehaus.mojo - cobertura-maven-plugin - ${commons.cobertura.version} - - true - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${commons.surefire.version} - - - integration-test - - integration-test - verify - - - ${failsafe.runorder} - - **/*TestCase.java - - - - ${log4j:log4j:jar} - ${logkit:logkit:jar} - ${javax.servlet:servlet-api:jar} - target/${project.build.finalName}.jar - target/${project.artifactId}-api-${project.version}.jar - target/${project.artifactId}-adapters-${project.version}.jar - target/commons-logging-tests.jar - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.3 - - - src/main/assembly/bin.xml - src/main/assembly/src.xml - - gnu - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.4 - - - - properties - - - - - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - javadocs - commons-logging-** - - - - - - - - - - junit - junit - 3.8.1 - test - - - log4j - log4j - 1.2.17 - true - - - logkit - logkit - 1.0.1 - true - - - avalon-framework - avalon-framework - 4.1.5 - true - - - javax.servlet - servlet-api - 2.3 - provided - true - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.7 - - ${basedir}/checkstyle.xml - false - ${basedir}/license-header.txt - - - - org.codehaus.mojo - clirr-maven-plugin - 2.2.2 - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-1 - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - true - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.0.1 - - - 1.3 - true - - ${basedir}/pmd.xml - - - - - - - - - apache.website - ${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/logging/ - - - - - 1.2 - 1.2 - logging - 1.2 - LOGGING - 12310484 - - RC2 - 2.12 - true - - filesystem - - - javax.servlet;version="[2.1.0, 3.0.0)";resolution:=optional, - org.apache.avalon.framework.logger;version="[4.1.3, 4.1.5]";resolution:=optional, - org.apache.log;version="[1.0.1, 1.0.1]";resolution:=optional, - org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional - - -