[maven-plugin-exec] Update to latest upstream version.
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Dec 6 18:31:31 UTC 2011
commit 6795b5d31f2f0230feeac119c8fe69d433500692
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date: Tue Dec 6 20:31:03 2011 +0200
Update to latest upstream version.
.gitignore | 1 +
add_compat.patch | 14 +++++++
maven-plugin-exec.spec | 93 ++++++++++++++++-------------------------------
sources | 2 +-
4 files changed, 48 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57aac6e..f471cc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-plugin-exec-1.1.tar.bz2
+exec-maven-plugin-1.2.1-source-release.zip
diff --git a/add_compat.patch b/add_compat.patch
new file mode 100644
index 0000000..2e868ff
--- /dev/null
+++ b/add_compat.patch
@@ -0,0 +1,14 @@
+--- pom.xml.sav 2011-09-19 20:52:36.000000000 +0300
++++ pom.xml 2011-12-06 20:22:52.447687276 +0200
+@@ -126,6 +126,11 @@
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.2</version>
++ </dependency>
++ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.5</version>
diff --git a/maven-plugin-exec.spec b/maven-plugin-exec.spec
index 8d117db..1d46d1e 100644
--- a/maven-plugin-exec.spec
+++ b/maven-plugin-exec.spec
@@ -1,41 +1,34 @@
Name: maven-plugin-exec
-Version: 1.1
-Release: 2%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
Summary: Exec Maven Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://mojo.codehaus.org/exec-maven-plugin
-# The source tarball has been generated from upstream VCS:
-# svn export https://svn.codehaus.org/mojo/tags/exec-maven-plugin-%{version}
-# %{name}-%{version}
-# tar cjvf %{name}-%{version}.tar.bz2 %{name}-%{version}
-Source0: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Source0: http://repo1.maven.org/maven2/org/codehaus/mojo/exec-maven-plugin/1.2.1/exec-maven-plugin-1.2.1-source-release.zip
+Patch0: add_compat.patch
BuildArch: noarch
-BuildRequires: maven2
-BuildRequires: maven2-common-poms >= 1.0-10
+BuildRequires: maven
BuildRequires: plexus-utils
BuildRequires: plexus-container-default
BuildRequires: maven-shared-plugin-testing-harness
-BuildRequires: maven2-plugin-remote-resources
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-enforcer
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-remote-resources-plugin
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-enforcer-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-doxia-sitetools
-Requires: maven2
+BuildRequires: mojo-signatures
+Requires: maven
Requires: plexus-utils
Requires: plexus-container-default
Requires: maven-shared-plugin-testing-harness
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
%description
A plugin to allow execution of system and Java programs
@@ -49,71 +42,49 @@ API documentation for %{name}.
%prep
-%setup -q
+%setup -q -n exec-maven-plugin-%{version}
+%patch0
+
+sed -i "s|java14|java15|g" pom.xml
#there is nothing under MIT license
rm -f LICENSE.txt
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.skip=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
install -m 644 target/exec-maven-plugin-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-%add_to_maven_depmap org.codehaus.mojo exec-maven-plugin %{version} JPP maven-plugin-exec
+ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# poms
-install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
-install -pm 644 pom.xml \
- %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
-%clean
-%{__rm} -rf %{buildroot}
+# javadoc
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%files
-%defattr(-,root,root,-)
%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
-%{_datadir}/maven2/poms/JPP-%{name}.pom
+%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Tue Dec 6 2011 Alexander Kurtakov <akurtako at redhat.com> 1.2.1-1
+- Update to latest upstream.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Fri Sep 11 2009 Alexander Kurtakov <akurtako at gmail.com> 1.1-1
- Initial package.
-
diff --git a/sources b/sources
index 9daccce..bb6e57e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15b15a06479e8a3d821c2ca0e811e128 maven-plugin-exec-1.1.tar.bz2
+e1cf1ddd8fbc456840269434b69f0bf1 exec-maven-plugin-1.2.1-source-release.zip
More information about the scm-commits
mailing list