[buildnumber-maven-plugin] Update to upstream 1.3 release.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Jun 13 07:39:04 UTC 2014
commit 72e4a6cb4f573759678ca7ebc66389e52b7ca1f7
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri Jun 13 10:38:58 2014 +0300
Update to upstream 1.3 release.
.gitignore | 1 +
buildnumber-maven-plugin.spec | 72 ++++++++++-------------------------------
sources | 2 +-
3 files changed, 19 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f4fee9..280953d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ buildnumber-maven-plugin-1.0-beta-4.tgz
/buildnumber-maven-plugin-1.0.tar.xz
/buildnumber-maven-plugin-1.1.tar.xz
/buildnumber-maven-plugin-1.2.tar.xz
+/buildnumber-maven-plugin-1.3-source-release.zip
diff --git a/buildnumber-maven-plugin.spec b/buildnumber-maven-plugin.spec
index 4c43091..04c7e7f 100644
--- a/buildnumber-maven-plugin.spec
+++ b/buildnumber-maven-plugin.spec
@@ -1,16 +1,14 @@
Name: buildnumber-maven-plugin
-Version: 1.2
-Release: 8%{?dist}
+Version: 1.3
+Release: 1%{?dist}
Summary: Build Number Maven Plugin
Group: Development/Libraries
License: MIT and ASL 2.0
-URL: http://svn.codehaus.org/mojo/tags/buildnumber-maven-plugin-1.2
+URL: http://svn.codehaus.org/mojo/tags/buildnumber-maven-plugin-%{version}
-# svn export http://svn.codehaus.org/mojo/tags/buildnumber-maven-plugin-1.2 buildnumber-maven-plugin
-# tar caf buildnumber-maven-plugin-1.2.tar.xz buildnumber-maven-plugin
-Source0: buildnumber-maven-plugin-1.2.tar.xz
-Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
+Source0: http://central.maven.org/maven2/org/codehaus/mojo/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch
@@ -20,26 +18,10 @@ BuildRequires: java-devel >= 1:1.6.0
# Maven and its dependencies
BuildRequires: maven-local
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-invoker-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-plugin-cobertura
-BuildRequires: plexus-containers-component-javadoc
-BuildRequires: plexus-containers-container-default
-BuildRequires: plexus-utils
+BuildRequires: cobertura-maven-plugin
BuildRequires: jna
-BuildRequires: mojo-parent
-BuildRequires: maven-project
BuildRequires: maven-scm
-
Requires: java-headless
Requires: maven
Requires: maven-project
@@ -78,50 +60,30 @@ Requires: jpackage-utils
API documentation for %{name}.
%prep
-%setup -q -n %{name}
-cp -p %{SOURCE2} .
+%setup -q
+cp -p %{SOURCE1} .
%pom_remove_dep com.google.code.maven-scm-provider-svnjava:maven-scm-provider-svnjava
%pom_remove_dep org.tmatesoft.svnkit:svnkit
+%pom_remove_plugin :maven-enforcer-plugin
+%pom_remove_plugin :maven-invoker-plugin
%build
-
-# tests skipped due to invoker problems with local repository tests
-mvn-rpmbuild -DskipTests=true \
- -Dmaven.test.skip=true \
- -Dmaven.compile.target=1.5 \
- install javadoc:aggregate
+%mvn_build
%install
+%mvn_install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%files
+%files -f .mfiles
%doc LICENSE.txt LICENSE-2.0.txt
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt LICENSE-2.0.txt
-%{_javadocdir}/%{name}
%changelog
+* Fri Jun 13 2014 Alexander Kurtakov <akurtako at redhat.com> 1.3-1
+- Update to upstream 1.3 release.
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 20ff9b5..496875d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
-ccedf52c252d2014c4dfb47547ad9e0b buildnumber-maven-plugin-1.2.tar.xz
+17a7aa878142f19fa24e5d2c3817485d buildnumber-maven-plugin-1.3-source-release.zip
More information about the scm-commits
mailing list