commit 6f45adc6577a814f99159c2047124531f1902b19
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Jan 26 13:08:45 2011 +0200
Build with maven 3.
Drop depmap and other non needed parts.
.gitignore | 1 +
maven-war-plugin-depmap.xml | 16 ---------------
maven-war-plugin.spec | 46 +++++++++++++-----------------------------
sources | 2 +-
4 files changed, 16 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b4f5d11..ae598a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-war-plugin-2.1-beta-1.tgz
+maven-war-plugin-2.1.1-source-release.zip
diff --git a/maven-war-plugin.spec b/maven-war-plugin.spec
index 8df6cdc..43bfcae 100644
--- a/maven-war-plugin.spec
+++ b/maven-war-plugin.spec
@@ -1,18 +1,12 @@
-%global version 2.1-beta-1
Name: maven-war-plugin
Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven WAR Plugin
Group: Development/Libraries
License: ASL 2.0
URL:
http://maven.apache.org/plugins/maven-war-plugin/
-#svn export
http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-b...
maven-war-plugin
-#tar czf maven-war-plugin-2.1-beta-1.tgz maven-war-plugin
-Source0:
http://repo2.maven.org/maven2/org/apache/maven/plugins/maven-war-plugin/2...
-Source1: %{name}-depmap.xml
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:
http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
BuildArch: noarch
@@ -20,7 +14,7 @@ BuildArch: noarch
BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
# Maven and its dependencies
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-jar-plugin
@@ -28,16 +22,16 @@ BuildRequires: maven-doxia
BuildRequires: maven-doxia-tools
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-plugin-cobertura
BuildRequires: maven-shared-filtering
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-changes
-BuildRequires: maven2-plugin-invoker
+BuildRequires: maven-idea-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-changes-plugin
+BuildRequires: maven-invoker-plugin
# Others
BuildRequires: xstream
@@ -69,28 +63,15 @@ API documentation for %{name}.
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-# The depmap is used by the mvn-jpp command to convert dependencies
-# to the locations and versions that are available (if needed)
-cp %{SOURCE1} %{name}-depmap.xml
-export MAVEN_DEPMAP=$(pwd)/%{name}-depmap.xml
-
-mvn-jpp \
- -e \
+mvn-local -e \
-Dmaven.test.skip=true \
- -Dmaven2.jpp.mode=true \
- -Dmaven2.jpp.depmap.file=${MAVEN_DEPMAP} \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins maven-war-plugin %{version} JPP
maven-war-plugin
@@ -111,9 +92,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -126,6 +104,10 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}
%changelog
+* Wed Jan 26 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.1.1-2
+- Build with maven 3.
+- Drop depmap and other non needed parts.
+
* Sat Nov 20 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.1.1-1
- Update to new version.
diff --git a/sources b/sources
index d1c2205..b44744d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e0f89ca57b53c9e44542e655ff7aa89 maven-war-plugin-2.1-beta-1.tgz
+26aa9f34e40a832ece2c3bd7381c0b11 maven-war-plugin-2.1.1-source-release.zip