[maven-ear-plugin] Update to upstream version 2.10

Michal Srb msrb at fedoraproject.org
Fri Mar 6 10:34:05 UTC 2015


commit 3c779a10675e552eb250dda8867601548f87fe34
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Mar 6 11:29:53 2015 +0100

    Update to upstream version 2.10
    
    - Adapt to current packaging guidelines

 .gitignore            |  1 +
 maven-ear-plugin.spec | 78 +++++++++++++++++----------------------------------
 sources               |  2 +-
 3 files changed, 27 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0065222..1ae1456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ maven-ear-plugin-2.4.2.tar.bz2
 /maven-ear-plugin-2.6-source-release.zip
 /maven-ear-plugin-2.7-source-release.zip
 /maven-ear-plugin-2.8-source-release.zip
+/maven-ear-plugin-2.10-source-release.zip
diff --git a/maven-ear-plugin.spec b/maven-ear-plugin.spec
index 2c352a2..b85e3c2 100644
--- a/maven-ear-plugin.spec
+++ b/maven-ear-plugin.spec
@@ -1,41 +1,29 @@
 Name:           maven-ear-plugin
-Version:        2.8
-Release:        7%{?dist}
+Version:        2.10
+Release:        1%{?dist}
 Summary:        Maven EAR Plugin
 
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-ear-plugin/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 BuildArch: noarch
 
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: junit
-BuildRequires: maven-local
-BuildRequires: maven-archiver
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-annotations
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-shared-filtering
-BuildRequires: maven-shared-verifier
-BuildRequires: maven-surefire-plugin
-BuildRequires: plexus-archiver
-BuildRequires: plexus-containers-container-default
-BuildRequires: plexus-utils
-BuildRequires: xmlunit
-
-Requires:       maven
-Requires:       jpackage-utils
-Requires:       maven-plugin-annotations
-Requires:       plexus-archiver
-Requires:       plexus-containers-container-default
-Requires:       plexus-utils
+BuildRequires:  maven-local
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.maven:maven-archiver)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven:maven-project)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.shared:maven-filtering)
+BuildRequires:  mvn(org.apache.maven.shared:maven-verifier)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-interpolation)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(xmlunit:xmlunit)
 
 Obsoletes: maven2-plugin-ear <= 0:2.0.8
 Provides: maven2-plugin-ear = 0:%{version}-%{release}
@@ -44,9 +32,7 @@ Provides: maven2-plugin-ear = 0:%{version}-%{release}
 Generates a J2EE Enterprise Archive (EAR) file.
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
@@ -55,37 +41,23 @@ API documentation for %{name}.
 %prep
 %setup -q 
 
-# Was missing
-%pom_add_dep org.codehaus.plexus:plexus-container-default:1.0
-
 %build
-mvn-rpmbuild \
-        -Dmaven.test.skip=true \
-        install javadoc:aggregate
+%mvn_build -f
 
 %install
-# jars
-install -Dpm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
-
-# poms
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_install
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
+%files -f .mfiles
 %doc LICENSE NOTICE
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
 %changelog
+* Fri Mar 06 2015 Michal Srb <msrb at redhat.com> - 2.10-1
+- Update to upstream version 2.10
+- Adapt to current packaging guidelines
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index ec12562..6907fbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ee6bf6b0bb3c9dd068ef05932549809  maven-ear-plugin-2.8-source-release.zip
+01c8c9b8216015b58144cbdb8fa81036  maven-ear-plugin-2.10-source-release.zip


More information about the scm-commits mailing list