diff --git a/.gitignore b/.gitignore index 5fa6b8c..d71dda4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /apache-rat-incubating-0.8-src.tar.bz2 /apache-rat-0.9-src.tar.bz2 /apache-rat-0.10-src.tar.bz2 +/apache-rat-0.11-src.tar.bz2 diff --git a/0001-Update-to-Maven-Doxia-1.6.patch b/0001-Update-to-Maven-Doxia-1.6.patch index 4afc262..c55f2fd 100644 --- a/0001-Update-to-Maven-Doxia-1.6.patch +++ b/0001-Update-to-Maven-Doxia-1.6.patch @@ -1,4 +1,4 @@ -From c6e8903a7ed5df9a4e2f7ec212c91da1981161a2 Mon Sep 17 00:00:00 2001 +From 0afc2d821039be592828553aa031f8280e701b27 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 11 Aug 2014 14:26:34 +0200 Subject: [PATCH] Update to Maven Doxia 1.6 @@ -8,23 +8,23 @@ Subject: [PATCH] Update to Maven Doxia 1.6 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java -index 0394c8a..af97882 100644 +index a9e5aa9..6ea74c1 100644 --- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java +++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java -@@ -27,12 +27,12 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException; - import org.apache.maven.artifact.resolver.ArtifactResolver; - import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; - import org.apache.maven.artifact.versioning.VersionRange; --import org.apache.maven.doxia.sink.render.RenderingContext; - import org.apache.maven.doxia.site.decoration.Body; - import org.apache.maven.doxia.site.decoration.DecorationModel; - import org.apache.maven.doxia.site.decoration.Skin; - import org.apache.maven.doxia.siterenderer.Renderer; - import org.apache.maven.doxia.siterenderer.RendererException; +@@ -39,12 +39,12 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException; + import org.apache.maven.artifact.resolver.ArtifactResolver; + import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; + import org.apache.maven.artifact.versioning.VersionRange; +-import org.apache.maven.doxia.sink.render.RenderingContext; + import org.apache.maven.doxia.site.decoration.Body; + import org.apache.maven.doxia.site.decoration.DecorationModel; + import org.apache.maven.doxia.site.decoration.Skin; + import org.apache.maven.doxia.siterenderer.Renderer; + import org.apache.maven.doxia.siterenderer.RendererException; +import org.apache.maven.doxia.siterenderer.RenderingContext; - import org.apache.maven.doxia.siterenderer.SiteRenderingContext; - import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; - import org.apache.maven.plugin.MojoExecutionException; + import org.apache.maven.doxia.siterenderer.SiteRenderingContext; + import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; + import org.apache.maven.plugin.MojoExecutionException; -- -1.9.3 +2.1.0 diff --git a/apache-rat-0.8-test.patch b/apache-rat-0.8-test.patch deleted file mode 100644 index 672708f..0000000 --- a/apache-rat-0.8-test.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- apache-rat-0.8-20100827/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java.test 2010-07-13 10:10:23.000000000 -0600 -+++ apache-rat-0.8-20100827/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java 2010-10-28 15:20:11.897580449 -0600 -@@ -61,7 +61,7 @@ - private Renderer newSiteRenderer() - throws Exception - { -- return (Renderer) container.lookup( Renderer.ROLE, "default" ); -+ return (Renderer) getContainer().lookup( Renderer.ROLE, "default" ); - } - - /** -@@ -129,7 +129,7 @@ - localRepo = System.getProperty( "user.home" ) + "/.m2/repository"; - } - ArtifactRepositoryLayout repositoryLayout = -- (ArtifactRepositoryLayout) container.lookup(ArtifactRepositoryLayout.ROLE, "default" ); -+ (ArtifactRepositoryLayout) getContainer().lookup(ArtifactRepositoryLayout.ROLE, "default" ); - return new DefaultArtifactRepository( "local", "file://" + localRepo, repositoryLayout ); - } - diff --git a/apache-rat.spec b/apache-rat.spec index 51ebbe3..512a1b9 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,13 +1,12 @@ Name: apache-rat -Version: 0.10 -Release: 6%{?dist} +Version: 0.11 +Release: 1%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries License: ASL 2.0 URL: http://creadur.apache.org/rat/ Source0: http://www.apache.org/dist/creadur/%{name}-%{version}/%{name}-%{version}-src.tar.bz2 -Patch2: apache-rat-0.8-test.patch Patch3: 0001-Update-to-Maven-Doxia-1.6.patch BuildArch: noarch @@ -87,7 +86,6 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{version} -%patch2 -p1 -b .test %patch3 -p1 # apache-rat is a module bundling other RAT modules together and as @@ -98,6 +96,9 @@ This package contains the API documentation for %{name}. # skipped anyways. See rhbz#988561 %pom_remove_plugin :maven-antrun-plugin apache-rat-tasks +%pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin + # wagon-ssh is not needed in Fedora. %pom_xpath_remove pom:extensions @@ -135,6 +136,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Wed Feb 18 2015 Mikolaj Izdebski - 0.11-1 +- Update to upstream version 0.11 + * Mon Aug 11 2014 Mikolaj Izdebski - 0.10-6 - Update to Maven Doxia 1.6 diff --git a/sources b/sources index b579645..e75e527 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58f17a69466053fcca3e8b80838a3c64 apache-rat-0.10-src.tar.bz2 +47961a1ae5f5697cf40e951edff60302 apache-rat-0.11-src.tar.bz2