2:25 a.m.
commit f0134ddb369a9ff5540b8edcfc764beedacbc7ab
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Apr 5 10:25:14 2011 +0300
Update to upstream 1.5 release.
Build with maven 3.
.gitignore | 1 +
002_maven-scm_fix-svn-provider-build.patch | 11 -----
maven-scm-jpp-depmap.xml | 28 +-------------
maven-scm.spec | 58 +++++++++++----------------
sources | 2 +-
5 files changed, 27 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 550a912..18aa7f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-scm-1.2.tar.xz
/maven-scm-1.4.tar.xz
+maven-scm-1.5-source-release.zip
diff --git a/maven-scm-jpp-depmap.xml b/maven-scm-jpp-depmap.xml
index 006bec5..f7f135c 100644
--- a/maven-scm-jpp-depmap.xml
+++ b/maven-scm-jpp-depmap.xml
@@ -1,31 +1,5 @@
<dependencies>
- <dependency>
- <maven>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- <version>1.3</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>regexp</artifactId>
- <version>1.3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0.3</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0.3</version>
- </jpp>
- </dependency>
-
- <dependency>
+ <dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
diff --git a/maven-scm.spec b/maven-scm.spec
index 16ad2db..2b8fa4b 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -28,39 +28,31 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%global maven_settings_file %{_builddir}/%{name}/settings.xml
-%global namedversion 1.4
-
Name: maven-scm
-Version: 1.4
-Release: 6%{?dist}
+Version: 1.5
+Release: 1%{?dist}
Epoch: 0
Summary: Common API for doing SCM operations
License: ASL 2.0
Group: Development/Libraries
URL: http://maven.apache.org/scm
-# svn export
-# http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.4/ maven-scm-1.4/
-# tar cJf maven-scm-1.4.tar.xz maven-scm-1.4/
-Source0: %{name}-%{namedversion}.tar.xz
+Source0:
http://repo1.maven.org/maven2/org/apache/maven/scm/%{name}/%{version}/%{n...
Source1: %{name}-jpp-depmap.xml
# remove dependency on mockito per accurev provider tests
Patch0: 001_maven-scm_remove-mockito-test-dep.patch
-# fix package name in svn provider
-Patch1: 002_maven-scm_fix-svn-provider-build.patch
# fix a missing cast (plexus-container-default version mismatch?)
-Patch3: 004_maven-scm_fix-svn-provider-java.patch
+Patch1: 004_maven-scm_fix-svn-provider-java.patch
# fix modello configuration in vss provider pom and the cast as above
-Patch4: 005_maven-scm_fix-vss-provider-pom.patch
-Patch5: 006_maven-scm_fix-vss-provider-java.patch
+Patch2: 005_maven-scm_fix-vss-provider-pom.patch
+Patch3: 006_maven-scm_fix-vss-provider-java.patch
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: maven2 >= 2.0.6
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -70,35 +62,35 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-invoker-plugin
-BuildRequires: maven-shared-invoker
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven2-common-poms >= 0:1.0-21
BuildRequires: modello >= 1.1
BuildRequires: netbeans-cvsclient
BuildRequires: plexus-utils >= 1.5.6
-BuildRequires: saxon-scripts
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-interpolation
BuildRequires: bzr
+BuildRequires: subversion
BuildRequires: plexus-maven-plugin
BuildRequires: plexus-classworlds
Requires: junit >= 3.8.2
-Requires: jakarta-commons-collections >= 3.1
+Requires: apache-commons-collections >= 3.1
Requires: modello >= 1.0-0.a8
Requires: netbeans-cvsclient >= 6.9
Requires: jakarta-oro >= 2.0.8
Requires: plexus-utils >= 1.2
Requires: velocity >= 1.4
+Requires: maven
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
%description
-Maven SCM supports Maven 2.x plugins (e.g. maven-release-plugin) and other
+Maven SCM supports Maven plugins (e.g. maven-release-plugin) and other
tools (e.g. Continum) in providing them a common API for doing SCM operations.
%package test
@@ -112,6 +104,7 @@ Tests for %{name}.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -120,29 +113,22 @@ Javadoc for %{name}.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
# We dont have mockito, needed for accurev tests, disable for now
find
maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev
-type f -name "*Test*" -exec rm -f '{}' \;
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.failure.ignore=true \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+ -Dmaven.local.depmap.file=%{SOURCE1} \
install javadoc:aggregate
%install
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
for jar in `find . -type f -name "*.jar" | grep -E "target/.*.jar$"`;
do
newname=`basename $jar`
@@ -160,12 +146,12 @@ for i in `find . -name pom.xml | grep -v \\\./pom.xml | \
artifactname=`basename \`dirname $i\``
jarname=`echo $artifactname | sed -e s:^maven-scm-::g`
cp -p $i $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.$artifactname.pom
- %add_to_maven_depmap org.apache.maven.scm $artifactname %{namedversion}
JPP/%{name} $jarname
+ %add_to_maven_depmap org.apache.maven.scm $artifactname %{version} JPP/%{name}
$jarname
done
cp -p pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-scm-scm.pom
-%add_to_maven_depmap org.apache.maven.scm maven-scm %{namedversion} JPP/maven-scm scm
+%add_to_maven_depmap org.apache.maven.scm maven-scm %{version} JPP/maven-scm scm
-%add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{namedversion}
JPP/maven-scm plugin
+%add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{version} JPP/maven-scm
plugin
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -199,6 +185,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/*
%changelog
+* Tue Apr 5 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.5-1
+- Update to upstream 1.5 release.
+- Build with maven 3.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:1.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 07d89d6..988cde5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02b1f6861676b5f89c38073ac33f90ba maven-scm-1.4.tar.xz
+da090d412eb53a2e36042b0c37888f0d maven-scm-1.5-source-release.zip