rpms/plexus-maven-plugin/devel plexus-maven-plugin-doxia.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 plexus-maven-plugin.spec, 1.17, 1.18 sources, 1.4, 1.5
Stanislav Ochotnicky
sochotni at fedoraproject.org
Thu Jul 8 14:52:35 UTC 2010
Author: sochotni
Update of /cvs/pkgs/rpms/plexus-maven-plugin/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32103
Modified Files:
.cvsignore plexus-maven-plugin.spec sources
Added Files:
plexus-maven-plugin-doxia.patch
Log Message:
Add doxia patch, fix dist tarball, fix directories ownership
plexus-maven-plugin-doxia.patch:
PlexusComponentsReport.java | 10 +++++-----
report/Component.java | 2 +-
report/ComponentSet.java | 2 +-
report/Components.java | 2 +-
report/Configuration.java | 2 +-
report/Requirement.java | 2 +-
report/Requirements.java | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
--- NEW FILE plexus-maven-plugin-doxia.patch ---
diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java b/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java
index 4485c27..0352977 100644
--- a/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java
+++ b/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java
@@ -31,8 +31,8 @@ import java.util.Locale;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.Renderer;
import org.codehaus.plexus.maven.plugin.report.ComponentSet;
import org.jdom.Document;
import org.jdom.JDOMException;
@@ -62,9 +62,9 @@ public class PlexusComponentsReport
private MavenProject project;
/**
- * @component org.codehaus.doxia.site.renderer.SiteRenderer
+ * @component org.apache.maven.doxia.siterenderer.Renderer
*/
- private SiteRenderer siteRenderer;
+ private Renderer siteRenderer;
/**
* @parameter expression="${project.reporting.outputDirectory}
@@ -114,7 +114,7 @@ public class PlexusComponentsReport
return project;
}
- protected SiteRenderer getSiteRenderer()
+ protected Renderer getSiteRenderer()
{
return siteRenderer;
}
diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java b/src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java
index 675d043..ab5a5bf 100644
--- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java
+++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java
@@ -19,7 +19,7 @@ package org.codehaus.plexus.maven.plugin.report;
import java.util.Iterator;
import java.util.List;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
import org.codehaus.plexus.util.StringUtils;
import org.jdom.Element;
diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java b/src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java
index 167b1df..69c5d02 100644
--- a/src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java
+++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java
@@ -17,7 +17,7 @@ package org.codehaus.plexus.maven.plugin.report;
*/
import java.util.List;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
import org.jdom.Element;
/**
diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java b/src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java
index d865971..aeefa9a 100644
--- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java
+++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java
@@ -25,7 +25,7 @@ import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
import org.jdom.Element;
/**
diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java b/src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java
index 835c89d..63272d4 100644
--- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java
+++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java
@@ -24,7 +24,7 @@
package org.codehaus.plexus.maven.plugin.report;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
import org.jdom.Element;
/**
diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java b/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java
index ae29488..c315060 100644
--- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java
+++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java
@@ -24,7 +24,7 @@
package org.codehaus.plexus.maven.plugin.report;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
import org.codehaus.plexus.util.StringUtils;
import org.jdom.Element;
diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java b/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java
index d1c06a6..fb7e62a 100644
--- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java
+++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java
@@ -28,7 +28,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
import org.jdom.Element;
/**
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 25 Jun 2010 08:34:22 -0000 1.4
+++ .cvsignore 8 Jul 2010 14:52:34 -0000 1.5
@@ -1 +1 @@
-plexus-maven-plugin-1.3.8-src.tar.gz
+plexus-maven-plugin-1.3.8-src.tar.xz
Index: plexus-maven-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/plexus-maven-plugin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- plexus-maven-plugin.spec 25 Jun 2010 08:34:22 -0000 1.17
+++ plexus-maven-plugin.spec 8 Jul 2010 14:52:35 -0000 1.18
@@ -6,7 +6,7 @@
Name: %{parent}-%{subname}
Version: 1.3.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Plexus Maven plugin
License: MIT
@@ -15,10 +15,11 @@ URL: http://plexus.codehaus.o
# svn export \
# http://svn.codehaus.org/plexus/archive/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.8
-# tar czf plexus-maven-plugin-1.3.8-src.tar.gz plexus-maven-plugin-1.3.8
-Source0: %{name}-%{version}-src.tar.gz
+# tar czf plexus-maven-plugin-1.3.8-src.tar.xz plexus-maven-plugin-1.3.8
+Source0: %{name}-%{version}-src.tar.xz
Patch0: %{name}-add-deps.patch
+Patch1: %{name}-doxia.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,7 +38,7 @@ BuildRequires: maven2-common-poms >= 1.
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-surefire-provider-junit
BuildRequires: plexus-appserver >= 1.0-0.a5.3
-BuildRequires: plexus-cdc >= 1.0-0.7.a14
+BuildRequires: plexus-cdc >= 1.0-0.8.a14
BuildRequires: plexus-container-default
BuildRequires: plexus-runtime-builder >= 1.0-0.a9.2
@@ -65,6 +66,7 @@ Javadoc for %{name}.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -110,14 +112,19 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_javadir}/plexus
-%{_datadir}/maven2
-%{_mavendepmapfragdir}
+%{_mavenpomdir}/*pom
+%{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%changelog
+* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.3.8-2
+- Add doxia patch
+- Change dist archive to xz compression
+- Fix maven directories ownership
+
* Wed Jun 23 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.3.8-1
- Rebase to new upstream version
- Update BRs to new maven plugins
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 25 Jun 2010 08:34:22 -0000 1.4
+++ sources 8 Jul 2010 14:52:35 -0000 1.5
@@ -1 +1 @@
-27cc2f8ec27eb3ab7fdf23cf85e97825 plexus-maven-plugin-1.3.8-src.tar.gz
+38a56589014f086bb65edec212e31419 plexus-maven-plugin-1.3.8-src.tar.xz
More information about the scm-commits
mailing list