rpms/plexus-maven-plugin/devel plexus-maven-plugin-add-jdom-dep.patch, NONE, 1.1.2.1 plexus-maven-plugin-maven-doxia.patch, NONE, 1.1.2.1 plexus-maven-plugin-pom.patch, NONE, 1.1.2.1 plexus-maven-plugin-jpp-depmap.xml, 1.1, 1.1.2.1 plexus-maven-plugin.spec, 1.11, 1.11.2.1 sources, 1.2, 1.2.2.1
Fernando Nasser
fnasser at fedoraproject.org
Wed May 20 21:52:22 UTC 2009
Author: fnasser
Update of /cvs/extras/rpms/plexus-maven-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1428
Modified Files:
Tag: private-newmaven-branch
plexus-maven-plugin-jpp-depmap.xml plexus-maven-plugin.spec
sources
Added Files:
Tag: private-newmaven-branch
plexus-maven-plugin-add-jdom-dep.patch
plexus-maven-plugin-maven-doxia.patch
plexus-maven-plugin-pom.patch
Log Message:
Update but to pre-bootstrap release
plexus-maven-plugin-add-jdom-dep.patch:
--- NEW FILE plexus-maven-plugin-add-jdom-dep.patch ---
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:
--- NEW FILE plexus-maven-plugin-maven-doxia.patch ---
--- 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/Configuration.java.sav1 2007-10-01 06:35:26.000000000 +0200
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java 2008-06-09 15:08:26.000000000 +0200
@@ -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;
/**
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java.sav1 2007-10-01 06:35:26.000000000 +0200
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java 2008-06-09 15:09:59.000000000 +0200
@@ -28,7 +28,7 @@
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;
/**
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java.sav1 2007-10-01 06:35:26.000000000 +0200
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java 2008-06-09 15:11:53.000000000 +0200
@@ -25,7 +25,7 @@
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;
/**
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java.sav1 2007-10-01 06:35:26.000000000 +0200
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java 2008-06-09 15:13:25.000000000 +0200
@@ -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;
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java.sav1 2007-10-01 06:35:26.000000000 +0200
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java 2008-06-09 15:14:35.000000000 +0200
@@ -19,7 +19,7 @@
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;
plexus-maven-plugin-pom.patch:
--- NEW FILE plexus-maven-plugin-pom.patch ---
--- pom.xml.sav0 2007-11-11 06:38:20.000000000 +0100
+++ pom.xml 2008-06-09 14:28:46.000000000 +0200
@@ -73,6 +73,19 @@
<url>http://fisheye.codehaus.org/browse/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.6</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<reporting>
<plugins>
<plugin>
Index: plexus-maven-plugin-jpp-depmap.xml
===================================================================
RCS file: /cvs/extras/rpms/plexus-maven-plugin/devel/plexus-maven-plugin-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -p -r1.1 -r1.1.2.1
--- plexus-maven-plugin-jpp-depmap.xml 20 Mar 2007 03:59:53 -0000 1.1
+++ plexus-maven-plugin-jpp-depmap.xml 20 May 2009 21:51:52 -0000 1.1.2.1
@@ -129,5 +129,30 @@
</jpp>
</dependency>
-</dependencies>
+ <dependency>
+ <maven>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>servlet_2_4_api</artifactId>
+ <version>2.4</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>com.thoughtworks.qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>1.6.3</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>qdox</artifactId>
+ <version>1.6.1</version>
+ </jpp>
+ </dependency>
+</dependencies>
Index: plexus-maven-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-maven-plugin/devel/plexus-maven-plugin.spec,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -p -r1.11 -r1.11.2.1
--- plexus-maven-plugin.spec 24 Mar 2009 19:46:43 -0000 1.11
+++ plexus-maven-plugin.spec 20 May 2009 21:51:52 -0000 1.11.2.1
@@ -28,7 +28,6 @@
# 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
@@ -37,24 +36,25 @@
%define maven_settings_file %{_builddir}/%{name}/settings.xml
Name: %{parent}-%{subname}
-Version: 1.2
-Release: 3.7%{?dist}
+Version: 1.3.5
+Release: 5%{?dist}
Epoch: 0
Summary: Plexus Maven plugin
-License: MIT
+License: Apache Software License
Group: Development/Java
URL: http://plexus.codehaus.org/
-
+# svn export http://svn.codehaus.org/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.5
+# tar czf plexus-maven-plugin-src.tar.gz plexus-maven-plugin-1.3.5
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
+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
+BuildArch: noarch
%endif
BuildRequires: jpackage-utils >= 0:1.7.2
@@ -64,25 +64,23 @@ 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: maven2-plugin-release
+BuildRequires: maven-doxia
BuildRequires: plexus-appserver >= 1.0-0.a5.3
-BuildRequires: plexus-cdc >= 1.0-0.a4.2
-BuildRequires: plexus-container-default
+BuildRequires: plexus-cdc >= 1.0-0.3.a10
+BuildRequires: plexus-containers
+BuildRequires: plexus-containers-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
-Requires: plexus-container-default
+Requires: plexus-cdc >= 1.0
+Requires: plexus-containers-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
@@ -105,20 +103,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
@@ -177,7 +174,7 @@ fi
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/maven-plugin-1.2.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/maven-plugin-%{version}.jar.*
%endif
%files javadoc
@@ -185,24 +182,24 @@ fi
%doc %{_javadocdir}/*
%changelog
-* Tue Mar 24 2009 Deepak Bhole <dbhole at redhat.com> 1.2-3.7
-- Adjust tomcat requirements
+* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-5
+- reverte to 1.3.5 for building maven2-2..0.8
-* Mon Mar 23 2009 Deepak Bhole <dbhole at redhat.com> - 0:1.2-3.6
-- Fix cdc requirement version
-- Added tomcat BR
+* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-4
+- rebuild with new maven2 2.0.8 built in bootstrap mode
-* Mon Mar 23 2009 Deepak Bhole <dbhole at redhat.com> - 0:1.2-3.5
-- Build on ppc64
+* Wed Feb 04 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-3
+- rebuild with bootstrap JPP5 mode
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2-3.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Jan 13 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-2jpp.1
+- Import from dbhole's maven 2.0.8 packages, initial building
-* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2-2.4
-- drop repotag
+* Mon Feb 25 2008 Deepak Bhole <dbhole at redhat.com> 0:1.3.5-1jpp.1
+- From <r.apel at r-apel.de>:
+- Update to 1.3.5
-* Thu Feb 28 2008 Deepak Bhole <dbhole at redhat.com> 1.2-2jpp.3
-- Rebuild
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.2-3jpp.2
+- Autorebuild for GCC 4.3
* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.2-2jpp.2
- ExcludeArch ppc64
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plexus-maven-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -p -r1.2 -r1.2.2.1
--- sources 20 Mar 2007 03:59:53 -0000 1.2
+++ sources 20 May 2009 21:51:52 -0000 1.2.2.1
@@ -1 +1 @@
-7b14f7b4f7ff23672db8423e92830ed0 plexus-maven-plugin-src.tar.gz
+f94f11fb20d6ee96ce1f25502b7ef501 plexus-maven-plugin-src.tar.gz
More information about the scm-commits
mailing list