commit e1d8188cd776020fe7e2f837b6811031f3dbee61
Author: Tomas Radej <tradej(a)redhat.com>
Date: Wed Aug 17 15:53:42 2011 +0200
Update to 2.6, guideline fixes
.gitignore | 1 +
maven-ear-plugin-plexus-dep.patch | 28 ++++++++++++++++++++++++++++
maven-ear-plugin.spec | 31 ++++++++++++++-----------------
sources | 2 +-
4 files changed, 44 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7264cb4..4fcf972 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-ear-plugin-2.4.2.tar.bz2
/maven-ear-plugin-2.5-source-release.zip
+/maven-ear-plugin-2.6-source-release.zip
diff --git a/maven-ear-plugin-plexus-dep.patch b/maven-ear-plugin-plexus-dep.patch
new file mode 100644
index 0000000..9748608
--- /dev/null
+++ b/maven-ear-plugin-plexus-dep.patch
@@ -0,0 +1,28 @@
+diff --git a/pom.xml b/pom.xml
+index 65bc2b0..7adf7ec 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -63,6 +63,11 @@ under the License.
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
++ <groupId>org.codehaus.plexus</groupId>
++ <artifactId>plexus-container-default</artifactId>
++ <version>1.0-alpha-9-stable-1</version>
++ </dependency>
++ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${mavenVersion}</version>
+@@ -89,11 +94,6 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-container-default</artifactId>
+- <version>1.0-alpha-9-stable-1</version>
+- </dependency>
+- <dependency>
+- <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.5</version>
+ </dependency>
diff --git a/maven-ear-plugin.spec b/maven-ear-plugin.spec
index 8ea6506..dfb5c5b 100644
--- a/maven-ear-plugin.spec
+++ b/maven-ear-plugin.spec
@@ -1,5 +1,5 @@
Name: maven-ear-plugin
-Version: 2.5
+Version: 2.6
Release: 1%{?dist}
Summary: Maven EAR Plugin
@@ -8,6 +8,10 @@ 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}...
+# plexus-container-default needs to be before plexus-plugin-api in the
+# classpath as there is a duplication and incompatibility of classes
+Patch0: %{name}-plexus-dep.patch
+
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -22,7 +26,7 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-archiver
BuildRequires: plexus-archiver
-BuildRequires: plexus-container-default
+BuildRequires: plexus-container-default > 0:1.0-0.5.a9
BuildRequires: plexus-utils
BuildRequires: maven-shared-filtering
BuildRequires: maven-shared-verifier
@@ -36,9 +40,6 @@ Requires: plexus-archiver
Requires: plexus-container-default
Requires: plexus-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
Obsoletes: maven2-plugin-ear <= 0:2.0.8
Provides: maven2-plugin-ear = 0:%{version}-%{release}
@@ -56,42 +57,38 @@ API documentation for %{name}.
%prep
%setup -q
+%patch0 -p1
%build
mvn-rpmbuild \
-Dmaven.test.skip=true \
- install javadoc:javadoc
+ install javadoc:aggregate
%install
# jars
install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
-
# poms
install -Dpm 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}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
-%{_javadir}/*
+%{_javadir}/%{name}.jar
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
+* Mon Sep 05 2011 Tomas Radej <tradej(a)redhat.com> - 2.6-1
+- Update to 2.6
+- Guideline fixes
+
* Wed May 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.5-1
- Update to upstream 2.5 version.
- Adapt to current guidelines.
diff --git a/sources b/sources
index 3f28232..758adfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9de26bb3b02278d5fac17889ec343df9 maven-ear-plugin-2.5-source-release.zip
+875faa4fc06f489e161bf4637681c4c7 maven-ear-plugin-2.6-source-release.zip