rpms/plexus-maven-plugin/devel plexus-maven-plugin-add-jdom-dep.patch, 1.1, 1.2 plexus-maven-plugin-maven-doxia.patch, 1.1, 1.2 .cvsignore, 1.2, 1.3 plexus-maven-plugin.spec, 1.12, 1.13 sources, 1.2, 1.3
Andrew Overholt
overholt at fedoraproject.org
Thu Aug 20 20:08:56 UTC 2009
Author: overholt
Update of /cvs/pkgs/rpms/plexus-maven-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17992
Modified Files:
.cvsignore plexus-maven-plugin.spec sources
Added Files:
plexus-maven-plugin-add-jdom-dep.patch
plexus-maven-plugin-maven-doxia.patch
Log Message:
* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 0:1.3.5-1.1
- Update to 1.3.5 (courtesy Ralph Apel and Deepak Bhole)
- Remove gcj support
plexus-maven-plugin-add-jdom-dep.patch:
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
Index: plexus-maven-plugin-add-jdom-dep.patch
===================================================================
RCS file: plexus-maven-plugin-add-jdom-dep.patch
diff -N plexus-maven-plugin-add-jdom-dep.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ plexus-maven-plugin-add-jdom-dep.patch 20 Aug 2009 20:08:55 -0000 1.2
@@ -0,0 +1,15 @@
+diff -up ./pom.xml.sav ./pom.xml
+--- ./pom.xml.sav 2007-03-17 19:28:24.000000000 -0400
++++ ./pom.xml 2008-12-01 15:34:11.000000000 -0500
+@@ -47,6 +47,11 @@
+ <artifactId>plexus-cdc</artifactId>
+ <version>1.0-alpha-10</version>
+ </dependency>
++ <dependency>
++ <groupId>JPP</groupId>
++ <artifactId>jdom</artifactId>
++ <version>1.0</version>
++ </dependency>
+ </dependencies>
+ <scm>
+ <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.5</connection>
plexus-maven-plugin-maven-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(-)
Index: plexus-maven-plugin-maven-doxia.patch
===================================================================
RCS file: plexus-maven-plugin-maven-doxia.patch
diff -N plexus-maven-plugin-maven-doxia.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ plexus-maven-plugin-maven-doxia.patch 20 Aug 2009 20:08:55 -0000 1.2
@@ -0,0 +1,100 @@
+--- src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java.sav0 2007-11-22 18:04:28.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java 2007-11-22 18:04:42.000000000 +0100
+@@ -27,8 +27,8 @@
+ 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 @@
+ 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 @@
+ return project;
+ }
+
+- protected SiteRenderer getSiteRenderer()
++ protected Renderer getSiteRenderer()
+ {
+ return siteRenderer;
+ }
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java.sav1 2007-11-22 18:18:16.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java 2007-11-22 18:19:05.000000000 +0100
+@@ -17,7 +17,7 @@
+ */
+ import java.util.List;
+
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+ import org.jdom.Element;
+
+ /**
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java.sav0 2007-11-22 18:21:17.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java 2007-11-22 18:21:49.000000000 +0100
+@@ -15,7 +15,7 @@
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+ import org.jdom.Element;
+
+ import java.util.ArrayList;
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java.sav0 2007-11-22 18:25:57.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java 2007-11-22 18:26:46.000000000 +0100
+@@ -17,7 +17,7 @@
+ */
+
+ import org.jdom.Element;
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+ import org.codehaus.plexus.util.StringUtils;
+
+ import java.util.Iterator;
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java.sav0 2007-11-22 18:29:44.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java 2007-11-22 18:30:22.000000000 +0100
+@@ -25,7 +25,7 @@
+ package org.codehaus.plexus.maven.plugin.report;
+
+ import org.jdom.Element;
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+
+ /**
+ * @author <a href="mailto:trygvis at inamo.no">Trygve Laugstøl</a>
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java.sav0 2007-11-22 18:31:57.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java 2007-11-22 18:32:14.000000000 +0100
+@@ -25,7 +25,7 @@
+ package org.codehaus.plexus.maven.plugin.report;
+
+ import org.jdom.Element;
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+
+ import java.util.Iterator;
+ import java.util.List;
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java.sav0 2007-11-22 18:34:25.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java 2007-11-22 18:34:45.000000000 +0100
+@@ -25,7 +25,7 @@
+ package org.codehaus.plexus.maven.plugin.report;
+
+ import org.jdom.Element;
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+ import org.codehaus.plexus.util.StringUtils;
+
+ /**
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 20 Mar 2007 03:59:53 -0000 1.2
+++ .cvsignore 20 Aug 2009 20:08:55 -0000 1.3
@@ -1 +1 @@
-plexus-maven-plugin-src.tar.gz
+plexus-maven-plugin-1.3.5-src.tar.gz
Index: plexus-maven-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/plexus-maven-plugin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- plexus-maven-plugin.spec 26 Jul 2009 18:56:11 -0000 1.12
+++ plexus-maven-plugin.spec 20 Aug 2009 20:08:55 -0000 1.13
@@ -28,34 +28,31 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
%define parent plexus
%define subname maven-plugin
%define maven_settings_file %{_builddir}/%{name}/settings.xml
Name: %{parent}-%{subname}
-Version: 1.2
-Release: 4.7%{?dist}
+Version: 1.3.5
+Release: 1.1%{?dist}
Epoch: 0
Summary: Plexus Maven plugin
License: MIT
Group: Development/Java
URL: http://plexus.codehaus.org/
-Source0: %{name}-src.tar.gz
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-maven-plugin-1.2
-# plexus-maven-plugin/
-# tar czf plexus-maven-plugin-src.tar.gz plexus-maven-plugin/
-Source1: %{name}-jpp-depmap.xml
+# svn export \
+# http://svn.codehaus.org/plexus/archive/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.5/
+# tar czf plexus-maven-plugin-1.3.5-src.tar.gz plexus-maven-plugin-1.3.5
+Source0: %{name}-%{version}-src.tar.gz
+
+Patch0: %{name}-maven-doxia.patch
+Patch1: %{name}-add-jdom-dep.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if ! %{gcj_support}
BuildArch: noarch
-%endif
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: maven2 >= 2.0.4
@@ -64,35 +61,24 @@ BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-release
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-surefire
BuildRequires: maven2-common-poms >= 1.0
BuildRequires: plexus-appserver >= 1.0-0.a5.3
-BuildRequires: plexus-cdc >= 1.0-0.a4.2
+BuildRequires: plexus-cdc >= 1.0-0.5.a10
BuildRequires: plexus-container-default
BuildRequires: plexus-runtime-builder >= 1.0-0.a9.2
-BuildRequires: tomcat5
-BuildRequires: tomcat5-servlet-2.4-api
Requires: maven2 >= 2.0.4
Requires: maven2-common-poms >= 1.0
Requires: plexus-appserver >= 1.0-0.a5.3
-Requires: plexus-cdc >= 1.0-0.a4.2
+BuildRequires: plexus-cdc >= 1.0-0.5.a10
Requires: plexus-container-default
Requires: plexus-runtime-builder >= 1.0-0.a9.2
-Requires: tomcat5
-Requires: tomcat5-servlet-2.4-api
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description
Plexus Maven Plugin helps create plexus component descriptions
from within Maven.
@@ -105,20 +91,19 @@ Group: Development/Documentatio
Javadoc for %{name}.
%prep
-%setup -q -n %{name}
+%setup -q
+%patch0 -b .sav
+%patch1 -b .sav
%build
-
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
mvn-jpp \
-e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
-# -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-
%install
rm -rf $RPM_BUILD_ROOT
# jars
@@ -142,49 +127,30 @@ cp -pr target/site/apidocs/* \
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%postun
%update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%files
%defattr(-,root,root,-)
%{_javadir}/plexus
%{_datadir}/maven2
%{_mavendepmapfragdir}
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/maven-plugin-1.2.jar.*
-%endif
-
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%changelog
+* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 0:1.3.5-1.1
+- Update to 1.3.5 (courtesy Ralph Apel and Deepak Bhole)
+- Remove gcj support
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2-4.7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 20 Mar 2007 03:59:53 -0000 1.2
+++ sources 20 Aug 2009 20:08:55 -0000 1.3
@@ -1 +1 @@
-7b14f7b4f7ff23672db8423e92830ed0 plexus-maven-plugin-src.tar.gz
+a43d1f8144bd467168b84e83cf62728a plexus-maven-plugin-1.3.5-src.tar.gz
More information about the fedora-extras-commits
mailing list