[hawtjni] Replace plexus-maven-plugin with plexus-containers implementation
Stanislav Ochotnicky
sochotni at fedoraproject.org
Thu Jan 19 17:00:05 UTC 2012
commit 068838f688037d611f4f94027fe6ca4f995a115b
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Thu Jan 19 17:59:56 2012 +0100
Replace plexus-maven-plugin with plexus-containers implementation
...1-Fix-shading-and-remove-unneeded-modules.patch | 35 ++++++++++++++-----
0002-Fix-xbean-compatibility.patch | 25 ++++++++++++++
0003-Remove-plexus-maven-plugin-dependency.patch | 32 ++++++++++++++++++
hawtjni-1.5-xbean.patch | 12 -------
hawtjni.spec | 13 +++++--
5 files changed, 92 insertions(+), 25 deletions(-)
---
diff --git a/hawtjni-1.5-pom.patch b/0001-Fix-shading-and-remove-unneeded-modules.patch
similarity index 63%
rename from hawtjni-1.5-pom.patch
rename to 0001-Fix-shading-and-remove-unneeded-modules.patch
index 3e4b04d..1a08e02 100644
--- a/hawtjni-1.5-pom.patch
+++ b/0001-Fix-shading-and-remove-unneeded-modules.patch
@@ -1,6 +1,18 @@
-diff -Naur hawtjni-1.5/hawtjni-generator/pom.xml hawtjni-1.5-work/hawtjni-generator/pom.xml
---- hawtjni-1.5/hawtjni-generator/pom.xml 2011-09-21 12:20:30.000000000 -0400
-+++ hawtjni-1.5-work/hawtjni-generator/pom.xml 2012-01-14 21:16:52.849967350 -0500
+From 226e8614bd078479c3f99712f63f6dfbf1c46b0c Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Thu, 19 Jan 2012 17:12:16 +0100
+Subject: [PATCH 1/3] Fix shading and remove unneeded modules
+
+---
+ hawtjni-generator/pom.xml | 28 ----------------------------
+ maven-hawtjni-plugin/pom.xml | 7 +++++++
+ pom.xml | 2 --
+ 3 files changed, 7 insertions(+), 30 deletions(-)
+
+diff --git a/hawtjni-generator/pom.xml b/hawtjni-generator/pom.xml
+index fac8cc2..35b8aaa 100644
+--- a/hawtjni-generator/pom.xml
++++ b/hawtjni-generator/pom.xml
@@ -68,32 +68,4 @@
</dependency>
</dependencies>
@@ -34,9 +46,10 @@ diff -Naur hawtjni-1.5/hawtjni-generator/pom.xml hawtjni-1.5-work/hawtjni-genera
- </build>
-
</project>
-diff -Naur hawtjni-1.5/maven-hawtjni-plugin/pom.xml hawtjni-1.5-work/maven-hawtjni-plugin/pom.xml
---- hawtjni-1.5/maven-hawtjni-plugin/pom.xml 2011-09-21 12:20:30.000000000 -0400
-+++ hawtjni-1.5-work/maven-hawtjni-plugin/pom.xml 2012-01-15 08:58:39.970261531 -0500
+diff --git a/maven-hawtjni-plugin/pom.xml b/maven-hawtjni-plugin/pom.xml
+index 8ef99be..c0f4109 100644
+--- a/maven-hawtjni-plugin/pom.xml
++++ b/maven-hawtjni-plugin/pom.xml
@@ -74,9 +74,16 @@
<dependency>
@@ -54,9 +67,10 @@ diff -Naur hawtjni-1.5/maven-hawtjni-plugin/pom.xml hawtjni-1.5-work/maven-hawtj
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
-diff -Naur hawtjni-1.5/pom.xml hawtjni-1.5-work/pom.xml
---- hawtjni-1.5/pom.xml 2011-09-21 12:20:30.000000000 -0400
-+++ hawtjni-1.5-work/pom.xml 2012-01-14 21:15:42.238961785 -0500
+diff --git a/pom.xml b/pom.xml
+index fe2e17b..dfad938 100644
+--- a/pom.xml
++++ b/pom.xml
@@ -210,8 +210,6 @@
<module>hawtjni-runtime</module>
<module>hawtjni-generator</module>
@@ -66,3 +80,6 @@ diff -Naur hawtjni-1.5/pom.xml hawtjni-1.5-work/pom.xml
</modules>
</project>
+--
+1.7.7.4
+
diff --git a/0002-Fix-xbean-compatibility.patch b/0002-Fix-xbean-compatibility.patch
new file mode 100644
index 0000000..e0286d0
--- /dev/null
+++ b/0002-Fix-xbean-compatibility.patch
@@ -0,0 +1,25 @@
+From 6ffdfd242299afb283d619c8ff9d5ce96853f160 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Thu, 19 Jan 2012 17:12:42 +0100
+Subject: [PATCH 2/3] Fix xbean compatibility
+
+---
+ .../org/fusesource/hawtjni/generator/HawtJNI.java | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java b/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java
+index b4727c2..bf710eb 100755
+--- a/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java
++++ b/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java
+@@ -402,7 +402,7 @@ public class HawtJNI {
+
+ @SuppressWarnings("unchecked")
+ private void collectMatchingClasses(ClassFinder finder, Class annotation, LinkedHashSet<Class<?>> collector) {
+- List<Class> annotated = finder.findAnnotatedClasses(annotation);
++ List<Class<?>> annotated = finder.findAnnotatedClasses(annotation);
+ for (Class<?> clazz : annotated) {
+ if( packages.isEmpty() ) {
+ collector.add(clazz);
+--
+1.7.7.4
+
diff --git a/0003-Remove-plexus-maven-plugin-dependency.patch b/0003-Remove-plexus-maven-plugin-dependency.patch
new file mode 100644
index 0000000..bdf6336
--- /dev/null
+++ b/0003-Remove-plexus-maven-plugin-dependency.patch
@@ -0,0 +1,32 @@
+From 61963f6f7827459c551a03985e273d5feb65e55c Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Thu, 19 Jan 2012 17:13:50 +0100
+Subject: [PATCH 3/3] Remove plexus-maven-plugin dependency
+
+---
+ maven-hawtjni-plugin/pom.xml | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/maven-hawtjni-plugin/pom.xml b/maven-hawtjni-plugin/pom.xml
+index c0f4109..efdd192 100644
+--- a/maven-hawtjni-plugin/pom.xml
++++ b/maven-hawtjni-plugin/pom.xml
+@@ -139,12 +139,12 @@
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
+- <version>1.3.8</version>
++ <artifactId>plexus-component-metadata</artifactId>
++ <version>1.5.5</version>
+ <executions>
+ <execution>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+--
+1.7.7.4
+
diff --git a/hawtjni.spec b/hawtjni.spec
index ad27e70..d8665d1 100644
--- a/hawtjni.spec
+++ b/hawtjni.spec
@@ -1,6 +1,6 @@
Name: hawtjni
Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Code generator that produces the JNI code
Group: Development/Libraries
License: ASL 2.0 and EPL and BSD
@@ -9,8 +9,9 @@ URL: http://hawtjni.fusesource.org/
# git clone git://github.com/fusesource/hawtjni.git
# cd hawtjni && git archive --format=tar --prefix=hawtjni-1.5/ hawtjni-project-1.5 | xz > hawtjni-1.5.tar.xz
Source0: %{name}-%{version}.tar.xz
-Patch0: %{name}-%{version}-pom.patch
-Patch1: %{name}-%{version}-xbean.patch
+Patch0: 0001-Fix-shading-and-remove-unneeded-modules.patch
+Patch1: 0002-Fix-xbean-compatibility.patch
+Patch2: 0003-Remove-plexus-maven-plugin-dependency.patch
BuildArch: noarch
@@ -18,7 +19,6 @@ BuildRequires: jpackage-utils
BuildRequires: java-devel
BuildRequires: maven
BuildRequires: maven-compiler-plugin
-BuildRequires: plexus-maven-plugin
BuildRequires: maven-idea-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-surefire-report-plugin
@@ -29,6 +29,7 @@ BuildRequires: maven-eclipse-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-clean-plugin
BuildRequires: maven-surefire-provider-junit4
+BuildRequires: plexus-containers-component-metadata
BuildRequires: log4j
BuildRequires: junit4
BuildRequires: fusesource-pom
@@ -72,6 +73,7 @@ This package allows to use HawtJNI from a maven plugin.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
mvn-rpmbuild install javadoc:aggregate
@@ -117,6 +119,9 @@ install -pm 644 maven-%{name}-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-
%{_javadir}/maven-%{name}-plugin.jar
%changelog
+* Thu Jan 19 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.5-2
+- Replace plexus-maven-plugin with plexus-containers implementation
+
* Sun Jan 15 2012 Marek Goldmann <mgoldman at redhat.com> 1.5-1
- Upstream release 1.5
More information about the scm-commits
mailing list