From 1b75b96aa3b5f8b8514ff75009aa077f34560c9f Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Jun 23 2016 10:29:29 +0000 Subject: Update to upstream version 0.12 - Enable tests --- diff --git a/.gitignore b/.gitignore index d71dda4..3b9a7b2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /apache-rat-0.9-src.tar.bz2 /apache-rat-0.10-src.tar.bz2 /apache-rat-0.11-src.tar.bz2 +/apache-rat-0.12-src.tar.bz2 diff --git a/0001-Port-to-current-doxia-sitetools.patch b/0001-Port-to-current-doxia-sitetools.patch new file mode 100644 index 0000000..d90c0f9 --- /dev/null +++ b/0001-Port-to-current-doxia-sitetools.patch @@ -0,0 +1,26 @@ +From a49b2c89cdd8478ac83b8227c10a5da3155e3581 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Thu, 23 Jun 2016 12:22:32 +0200 +Subject: [PATCH 1/2] Port to current doxia-sitetools + +--- + apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +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 8d1eae6..01aceb3 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 +@@ -150,8 +150,7 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport { + + siteRenderer.generateDocument(writer, sink, siteContext); + +- siteRenderer.copyResources(siteContext, new File(getProject().getBasedir(), "src/site/resources"), +- outputDirectory); ++ siteRenderer.copyResources(siteContext, outputDirectory); + } catch (IOException e) { + throw new MojoExecutionException(e.getMessage(), e); + } catch (MavenReportException e) { +-- +2.7.4 + diff --git a/0001-Update-to-Maven-Doxia-1.6.patch b/0001-Update-to-Maven-Doxia-1.6.patch deleted file mode 100644 index c55f2fd..0000000 --- a/0001-Update-to-Maven-Doxia-1.6.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 - ---- - apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 2 +- - 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 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 -@@ -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; --- -2.1.0 - diff --git a/apache-rat.spec b/apache-rat.spec index e197312..6cf4d3a 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,15 +1,15 @@ Name: apache-rat -Version: 0.11 -Release: 3%{?dist} +Version: 0.12 +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 -Patch3: 0001-Update-to-Maven-Doxia-1.6.patch BuildArch: noarch +Patch1: 0001-Port-to-current-doxia-sitetools.patch + BuildRequires: maven-local BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-collections:commons-collections) @@ -25,20 +25,21 @@ BuildRequires: mvn(org.apache.maven.doxia:doxia-core) BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) -BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-artifact:2.2.1) BuildRequires: mvn(org.apache.maven:maven-artifact-manager) -BuildRequires: mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-model:2.2.1) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-project) -BuildRequires: mvn(org.apache.maven:maven-settings) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache.maven:maven-settings:2.2.1) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.hamcrest:hamcrest-library) +BuildRequires: mvn(org.mockito:mockito-all) +BuildRequires: mvn(org.mockito:mockito-core) %description Release Audit Tool (RAT) is a tool to improve accuracy and efficiency when @@ -53,6 +54,11 @@ It is therefore highly tuned to the Apache style of releases. This package just contains meta-data, you will want either apache-rat-tasks, or apache-rat-plugin. +%package api +Summary: API module for %{name} + +%description api +Shared beans and services. %package core Summary: Core functionality for %{name} @@ -86,7 +92,8 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{version} -%patch3 -p1 + +%patch1 -p1 # apache-rat is a module bundling other RAT modules together and as # such it is not needed. @@ -99,18 +106,23 @@ This package contains the API documentation for %{name}. %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-enforcer-plugin +# runs non-xmvn maven and downloads stuff +%pom_remove_plugin -r :maven-invoker-plugin + # wagon-ssh is not needed in Fedora. %pom_xpath_remove pom:extensions +# incompatible with our plexus-container +rm apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java + %build -# Tests are skipped because of incompatibility with Maven 3 -%mvn_build -s -f +%mvn_build -s %install %mvn_install #Wrapper script -%jpackage_script org.apache.rat.Report "" "" %{name}/%{name}-core:commons-cli:commons-io:commons-collections:commons-compress:commons-lang:junit apache-rat true +%jpackage_script org.apache.rat.Report "" "" %{name}/%{name}-core:commons-cli:commons-io:commons-collections:commons-compress:commons-lang:junit apache-rat true #Ant taksks mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d @@ -120,22 +132,28 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %files -f .mfiles-%{name}-project %doc LICENSE NOTICE -%files core -f .mfiles-%{name}-core -%doc README.txt RELEASE_NOTES.txt +%files api -f .mfiles-%{name}-api +%doc README.txt RELEASE-NOTES.txt %doc LICENSE NOTICE -%dir %{_javadir}/%{name} + +%files core -f .mfiles-%{name}-core %{_bindir}/%{name} %files plugin -f .mfiles-%{name}-plugin %files tasks -f .mfiles-%{name}-tasks %{_sysconfdir}/ant.d/%{name} +%doc ant-task-examples.xml %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE %changelog +* Thu Jun 23 2016 Michael Simacek - 0.12-1 +- Update to upstream version 0.12 +- Enable tests + * Wed Feb 03 2016 Fedora Release Engineering - 0.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index e75e527..920dc7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47961a1ae5f5697cf40e951edff60302 apache-rat-0.11-src.tar.bz2 +b16ae9ada406b55cd8ea8374d55d68bf apache-rat-0.12-src.tar.bz2