rpms/plexus-maven-plugin/devel plexus-maven-plugin-add-deps.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 plexus-maven-plugin.spec, 1.16, 1.17 sources, 1.3, 1.4 plexus-maven-plugin-add-jdom-dep.patch, 1.2, NONE plexus-maven-plugin-maven-doxia.patch, 1.2, NONE
Stanislav Ochotnicky
sochotni at fedoraproject.org
Fri Jun 25 08:34:22 UTC 2010
Author: sochotni
Update of /cvs/pkgs/rpms/plexus-maven-plugin/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26412
Modified Files:
.cvsignore plexus-maven-plugin.spec sources
Added Files:
plexus-maven-plugin-add-deps.patch
Removed Files:
plexus-maven-plugin-add-jdom-dep.patch
plexus-maven-plugin-maven-doxia.patch
Log Message:
Rebase to new upstream version
plexus-maven-plugin-add-deps.patch:
pom.xml | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
--- NEW FILE plexus-maven-plugin-add-deps.patch ---
diff --git a/pom.xml b/pom.xml
index 6f98e38..d6a55f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: pom.xml 7182 2008-01-18 19:35:40Z jdcasey $ -->
-
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -51,6 +51,11 @@
<version>2.0.5</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>2.0</version>
@@ -86,18 +91,18 @@
</plugin>
</plugins>
</reporting>
-
+
<profiles>
<profile>
<id>super-helpful-integration-tests</id>
-
+
<activation>
<property>
<name>shit</name>
<value>true</value>
</property>
</activation>
-
+
<build>
<defaultGoal>install</defaultGoal>
<plugins>
@@ -119,5 +124,5 @@
</build>
</profile>
</profiles>
-
+
</project>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 20 Aug 2009 20:08:55 -0000 1.3
+++ .cvsignore 25 Jun 2010 08:34:22 -0000 1.4
@@ -1 +1 @@
-plexus-maven-plugin-1.3.5-src.tar.gz
+plexus-maven-plugin-1.3.8-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.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- plexus-maven-plugin.spec 12 Sep 2009 21:29:38 -0000 1.16
+++ plexus-maven-plugin.spec 25 Jun 2010 08:34:22 -0000 1.17
@@ -1,41 +1,12 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-%define parent plexus
-%define subname maven-plugin
+%global parent plexus
+%global subname maven-plugin
-%define maven_settings_file %{_builddir}/%{name}/settings.xml
+%global maven_settings_file %{_builddir}/%{name}/settings.xml
Name: %{parent}-%{subname}
-Version: 1.3.5
-Release: 1.3%{?dist}
+Version: 1.3.8
+Release: 1%{?dist}
Epoch: 0
Summary: Plexus Maven plugin
License: MIT
@@ -43,38 +14,37 @@ Group: Development/Java
URL: http://plexus.codehaus.org/
# 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
+# 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
-Patch0: %{name}-maven-doxia.patch
-Patch1: %{name}-add-jdom-dep.patch
+Patch0: %{name}-add-deps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires: maven2 >= 2.0.4
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-surefire
+BuildRequires: maven2
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven2-common-poms >= 1.0
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-surefire-provider-junit
BuildRequires: plexus-appserver >= 1.0-0.a5.3
-BuildRequires: plexus-cdc >= 1.0-0.5.a10
+BuildRequires: plexus-cdc >= 1.0-0.7.a14
BuildRequires: plexus-container-default
BuildRequires: plexus-runtime-builder >= 1.0-0.a9.2
-Requires: maven2 >= 2.0.4
+Requires: maven2
Requires: maven2-common-poms >= 1.0
Requires: plexus-appserver >= 1.0-0.a5.3
-Requires: plexus-cdc >= 1.0-0.5.a10
+Requires: plexus-cdc >= 1.0-0.8.a14
Requires: plexus-container-default
Requires: plexus-runtime-builder >= 1.0-0.a9.2
@@ -94,8 +64,7 @@ Javadoc for %{name}.
%prep
%setup -q
-%patch0 -b .sav
-%patch1 -b .sav
+%patch0 -p1
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -149,6 +118,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/*
%changelog
+* 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
+
* Sun Sep 13 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.3.5-1.3
- BR maven-doxia-sitetools.
- BR maven-surefire-provider-junit.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 20 Aug 2009 20:08:55 -0000 1.3
+++ sources 25 Jun 2010 08:34:22 -0000 1.4
@@ -1 +1 @@
-a43d1f8144bd467168b84e83cf62728a plexus-maven-plugin-1.3.5-src.tar.gz
+27cc2f8ec27eb3ab7fdf23cf85e97825 plexus-maven-plugin-1.3.8-src.tar.gz
--- plexus-maven-plugin-add-jdom-dep.patch DELETED ---
--- plexus-maven-plugin-maven-doxia.patch DELETED ---
More information about the scm-commits
mailing list