[hawtjni] Upstream release 1.5
Marek Goldmann
goldmann at fedoraproject.org
Sun Jan 15 14:29:25 UTC 2012
commit 99dfc9fbf3b8e646e541277a9fd5b6bf6a93ddf7
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date: Sun Jan 15 09:28:41 2012 -0500
Upstream release 1.5
.gitignore | 1 +
hawtjni-1.3-pom.patch => hawtjni-1.5-pom.patch | 33 +++++++++++++-----------
hawtjni-1.5-xbean.patch | 12 ++++++++
hawtjni.spec | 16 ++++++++---
sources | 2 +-
5 files changed, 43 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8f73fba..a568433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/hawtjni-1.1.tar.xz
/hawtjni-1.2.tar.xz
/hawtjni-1.3.tar.xz
+/hawtjni-1.5.tar.xz
diff --git a/hawtjni-1.3-pom.patch b/hawtjni-1.5-pom.patch
similarity index 62%
rename from hawtjni-1.3-pom.patch
rename to hawtjni-1.5-pom.patch
index 1421ce1..3e4b04d 100644
--- a/hawtjni-1.3-pom.patch
+++ b/hawtjni-1.5-pom.patch
@@ -1,11 +1,10 @@
-diff -Naur hawtjni-1.3/hawtjni-generator/pom.xml hawtjni-1.3-work//hawtjni-generator/pom.xml
---- hawtjni-1.3/hawtjni-generator/pom.xml 2011-08-08 16:00:43.000000000 -0400
-+++ hawtjni-1.3-work//hawtjni-generator/pom.xml 2011-08-10 07:50:18.047509576 -0400
-@@ -67,33 +67,4 @@
- <version>1.0</version>
+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
+@@ -68,32 +68,4 @@
</dependency>
</dependencies>
--
+
- <build>
- <plugins>
-
@@ -35,25 +34,29 @@ diff -Naur hawtjni-1.3/hawtjni-generator/pom.xml hawtjni-1.3-work//hawtjni-gener
- </build>
-
</project>
-diff -Naur hawtjni-1.3/maven-hawtjni-plugin/pom.xml hawtjni-1.3-work//maven-hawtjni-plugin/pom.xml
---- hawtjni-1.3/maven-hawtjni-plugin/pom.xml 2011-08-08 16:00:43.000000000 -0400
-+++ hawtjni-1.3-work//maven-hawtjni-plugin/pom.xml 2011-08-10 08:02:53.922507991 -0400
-@@ -74,6 +74,12 @@
+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
+@@ -74,9 +74,16 @@
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>3.0.3</version>
-+ </dependency>
-+
++ </dependency>
++
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
<version>2.0</version>
</dependency>
-diff -Naur hawtjni-1.3/pom.xml hawtjni-1.3-work//pom.xml
---- hawtjni-1.3/pom.xml 2011-08-08 16:00:43.000000000 -0400
-+++ hawtjni-1.3-work//pom.xml 2011-08-10 07:49:51.090498936 -0400
++
+ <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
@@ -210,8 +210,6 @@
<module>hawtjni-runtime</module>
<module>hawtjni-generator</module>
diff --git a/hawtjni-1.5-xbean.patch b/hawtjni-1.5-xbean.patch
new file mode 100644
index 0000000..e9ccf6e
--- /dev/null
+++ b/hawtjni-1.5-xbean.patch
@@ -0,0 +1,12 @@
+diff -Naur hawtjni-1.5/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java hawtjni-1.5-work/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java
+--- hawtjni-1.5/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java 2011-09-21 12:20:30.000000000 -0400
++++ hawtjni-1.5-work/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java 2012-01-15 09:15:52.681253759 -0500
+@@ -402,7 +402,7 @@
+
+ @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);
diff --git a/hawtjni.spec b/hawtjni.spec
index 228a61c..ad27e70 100644
--- a/hawtjni.spec
+++ b/hawtjni.spec
@@ -1,15 +1,16 @@
Name: hawtjni
-Version: 1.3
-Release: 2%{?dist}
+Version: 1.5
+Release: 1%{?dist}
Summary: Code generator that produces the JNI code
Group: Development/Libraries
License: ASL 2.0 and EPL and BSD
URL: http://hawtjni.fusesource.org/
# git clone git://github.com/fusesource/hawtjni.git
-# cd hawtjni && git archive --format=tar --prefix=hawtjni-1.3/ hawtjni-project-1.3 | xz > hawtjni-1.3.tar.xz
+# 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
BuildArch: noarch
@@ -17,6 +18,7 @@ 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
@@ -30,11 +32,11 @@ BuildRequires: maven-surefire-provider-junit4
BuildRequires: log4j
BuildRequires: junit4
BuildRequires: fusesource-pom
-BuildRequires: xbean >= 3.7-7
+BuildRequires: xbean
Requires: java
Requires: jpackage-utils
-Requires: xbean >= 3.7-7
+Requires: xbean
Requires: apache-commons-cli
Requires: asm2
@@ -69,6 +71,7 @@ This package allows to use HawtJNI from a maven plugin.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
mvn-rpmbuild install javadoc:aggregate
@@ -114,6 +117,9 @@ install -pm 644 maven-%{name}-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-
%{_javadir}/maven-%{name}-plugin.jar
%changelog
+* Sun Jan 15 2012 Marek Goldmann <mgoldman at redhat.com> 1.5-1
+- Upstream release 1.5
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 32a592e..690d831 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a5fdbe48e91eb0b49febb2fe0562ca8b hawtjni-1.3.tar.xz
+84ae53887776bf12b5e9ec6d8fa2644b hawtjni-1.5.tar.xz
More information about the scm-commits
mailing list