[maven-release] * Mon Sep 13 2010 Guido Grazioli <guido.grazioli at gmail.com> - 2.0-1 - Update to upstream 2.0
Guido Grazioli
guidograzioli at fedoraproject.org
Mon Sep 13 14:21:20 UTC 2010
commit 50a03120807f72fa99f5e4ff07af780399a8bdbe
Author: Guido Grazioli <guido.grazioli at gmail.com>
Date: Mon Sep 13 16:20:41 2010 +0200
* Mon Sep 13 2010 Guido Grazioli <guido.grazioli at gmail.com> - 2.0-1
- Update to upstream 2.0
.gitignore | 1 +
001-mavenreleasemanager-skiptests.patch | 27 ---------
001_mavenreleasemanager_fixbuild.patch | 35 ++++++++++++
002-mavenreleaseplugin-skiptests.patch | 27 ---------
002_mavenreleaseplugin_skiptests.patch | 14 +++++
003-mavenreleaseplugin-skiphelpmojo.patch | 22 -------
maven-release-jpp-depmap.xml | 14 +++++
maven-release.spec | 86 +++++++++++------------------
sources | 2 +-
9 files changed, 97 insertions(+), 131 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7c47f50..91d8947 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-release-2.0.tar.xz
+/maven-release-2.0.tar.xz
diff --git a/001_mavenreleasemanager_fixbuild.patch b/001_mavenreleasemanager_fixbuild.patch
new file mode 100644
index 0000000..f645d46
--- /dev/null
+++ b/001_mavenreleasemanager_fixbuild.patch
@@ -0,0 +1,35 @@
+--- A/maven-release-manager/pom.xml 2010-09-11 01:26:43.000000000 +0200
++++ B/maven-release-manager/pom.xml 2010-09-13 15:28:21.472805005 +0200
+@@ -186,17 +186,6 @@
+ <version>${scmVersion}</version>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
+- <groupId>jmock</groupId>
+- <artifactId>jmock</artifactId>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>jmock</groupId>
+- <artifactId>jmock-cglib</artifactId>
+- <version>1.0.1</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <build>
+@@ -210,6 +199,14 @@
+ </configuration>
+ </plugin>
+ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <configuration>
++ <source>1.4</source>
++ <target>1.4</target>
++ </configuration>
++ </plugin>
++ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Xmx256m</argLine>
diff --git a/002_mavenreleaseplugin_skiptests.patch b/002_mavenreleaseplugin_skiptests.patch
new file mode 100644
index 0000000..2ac15f5
--- /dev/null
+++ b/002_mavenreleaseplugin_skiptests.patch
@@ -0,0 +1,14 @@
+--- A/maven-release-plugin/pom.xml 2010-02-06 23:18:25.000000000 +0100
++++ B/maven-release-plugin/pom.xml 2010-09-13 15:25:28.894805003 +0200
+@@ -95,11 +95,6 @@
+ <artifactId>jdom</artifactId>
+ </dependency>
+ <dependency>
+- <groupId>jmock</groupId>
+- <artifactId>jmock</artifactId>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <scope>test</scope>
diff --git a/maven-release-jpp-depmap.xml b/maven-release-jpp-depmap.xml
new file mode 100644
index 0000000..a5421ce
--- /dev/null
+++ b/maven-release-jpp-depmap.xml
@@ -0,0 +1,14 @@
+<dependencies>
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.5.4</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/plexus</groupId>
+ <artifactId>container-default</artifactId>
+ <version>1.0-alpha-9</version>
+ </jpp>
+ </dependency>
+</dependencies>
diff --git a/maven-release.spec b/maven-release.spec
index df89773..aaf4b48 100644
--- a/maven-release.spec
+++ b/maven-release.spec
@@ -1,38 +1,34 @@
-# svn revision
-%global svn_rev 659858
-# maven-release-manager version
-%global mversion 1.0
# maven-release parent pom version
-%global pversion 5-SNAPSHOT
+%global pversion 16
# maven-release-manager jar version
-%global mjarver 1.0-alpha-%{pversion}
+%global mjarver 2.0
# maven-release-plugin jar version
-%global pjarver 2.0-beta-8-SNAPSHOT
+%global pjarver 2.0
Name: maven-release
Version: 2.0
-Release: 0.%{svn_rev}svn.4%{?dist}
+Release: 1%{?dist}
Summary: Release a project updating the POM and tagging in the SCM
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-release-plugin/
# tar creation instructions
-# svn export -r659858 http://svn.apache.org/repos/asf/maven/release/trunk maven-release
-# tar cf maven-release-2.0.tar maven-release
-# xz maven-release-2.0.tar
+# svn export ttp://svn.apache.org/repos/asf//maven/release/tags/maven-release-2.0 maven-release-2.0
+# tar cfJ maven-release-2.0.tar.xz maven-release-2.0
Source0: maven-release-2.0.tar.xz
+Source1: maven-release-jpp-depmap.xml
+# Remove jmock needed for tests and set source to 1.4 to support assert stmt
+Patch0: 001_mavenreleasemanager_fixbuild.patch
# Remove deps needed for tests, till jmock gets packaged
-Patch0: 001-mavenreleasemanager-skiptests.patch
-Patch1: 002-mavenreleaseplugin-skiptests.patch
-# Remove helpmojo goal, till maven-plugin-plugin gets updated
-Patch2: 003-mavenreleaseplugin-skiphelpmojo.patch
+Patch1: 002_mavenreleaseplugin_skiptests.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel
BuildRequires: jpackage-utils
-BuildRequires: maven-scm >= 1.2-6
+BuildRequires: maven-scm >= 1.4-1
+BuildRequires: maven-scm-test >= 1.4-1
BuildRequires: maven2
BuildRequires: maven2-common-poms >= 0:1.0-13
BuildRequires: maven2-plugin-antrun
@@ -49,6 +45,7 @@ BuildRequires: plexus-maven-plugin
BuildRequires: plexus-utils
BuildRequires: maven-surefire-maven-plugin
### FIXME tomcat5-servlet-api should require tomcat5 (parent POM)
+BuildRequires: jaxen
BuildRequires: tomcat5-servlet-2.4-api
BuildRequires: tomcat5
@@ -89,33 +86,23 @@ repetitive, manual work. Releasing a project is made in two steps:
prepare and perform.
-%package manager-javadoc
-Summary: Javadocs for %{name}-manager
+%package javadoc
+Summary: Javadocs for %{name}
Group: Documentation
-Requires: %{name}-manager = %{version}-%{release}
-Requires: jpackage-utils
-BuildArch: noarch
-
-%description manager-javadoc
-This package contains the API documentation for %{name}-manager.
-
-
-%package plugin-javadoc
-Summary: Javadocs for %{name}-plugin
-Group: Documentation
-Requires: %{name}-plugin = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
+Obsoletes: %{name}-manager-javadoc <= 2.0-1
+Obsoletes: %{name}-plugin-javadoc <= 2.0-1
BuildArch: noarch
-%description plugin-javadoc
-This package contains the API documentation for %{name}-plugin.
+%description javadoc
+This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
cat > README << EOT
%{name}-%{version}
@@ -132,6 +119,7 @@ mkdir -p $MAVEN_REPO_LOCAL
mvn-jpp \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
install javadoc:aggregate
@@ -144,25 +132,18 @@ mkdir -p $RPM_BUILD_ROOT%{_javadir}
install -Dp -m 644 %{name}-manager/target/%{name}-manager-%{mjarver}.jar \
$RPM_BUILD_ROOT%{_javadir}/
(cd $RPM_BUILD_ROOT%{_javadir} \
- && ln -sf %{name}-manager-%{mjarver}.jar %{name}-manager-%{mversion}.jar \
&& ln -sf %{name}-manager-%{mjarver}.jar %{name}-manager.jar)
install -Dp -m 644 %{name}-plugin/target/%{name}-plugin-%{pjarver}.jar \
$RPM_BUILD_ROOT%{_javadir}/
(cd $RPM_BUILD_ROOT%{_javadir} \
- && ln -sf %{name}-plugin-%{pjarver}.jar %{name}-plugin-%{version}.jar \
&& ln -sf %{name}-plugin-%{pjarver}.jar %{name}-plugin.jar)
# javadocs
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-manager-%{mversion}
-cp -rp %{name}-manager/target/site/apidocs/ \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-manager-%{mversion}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-manager-%{mversion} %{name}-manager)
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-plugin-%{version}
-cp -rp %{name}-plugin/target/site/apidocs/ \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-plugin-%{version}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-plugin-%{version} %{name}-plugin)
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -rp target/site/apidocs/ \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
@@ -201,16 +182,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mavenpomdir}/JPP-%{name}-plugin.pom
-%files manager-javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-manager
-%{_javadocdir}/%{name}-manager-%{mversion}
-
-
-%files plugin-javadoc
+%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-plugin
-%{_javadocdir}/%{name}-plugin-%{version}
+%{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
%post
@@ -222,6 +197,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Sep 13 2010 Guido Grazioli <guido.grazioli at gmail.com> - 2.0-1
+- Update to upstream 2.0
+
* Sat Sep 11 2010 Guido Grazioli <guido.grazioli at gmail.com> - 2.0-0.659858svn.4
- Fix build requires
- Use javadoc:aggregate goal
diff --git a/sources b/sources
index 40b5e4c..d5af442 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81cdd43ab4596600fbfc1d05adb06973 maven-release-2.0.tar.xz
+75eece9079322e0c07fdc83324e335c4 maven-release-2.0.tar.xz
More information about the scm-commits
mailing list