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.3-pom.patch
deleted file mode 100644
index 1421ce1..0000000
--- a/hawtjni-1.3-pom.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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 @@
- 1.0
-
-
--
--
--
--
--
--
-- org.apache.maven.plugins
-- maven-shade-plugin
-- 1.3
--
--
-- package
--
-- shade
--
--
--
--
-- junit:junit
--
--
--
--
--
--
--
--
--
--
-
-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 @@
-
-
- org.apache.maven
-+ maven-compat
-+ 3.0.3
-+
-+
-+
-+ org.apache.maven
- maven-artifact-manager
- 2.0
-
-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
-@@ -210,8 +210,6 @@
- hawtjni-runtime
- hawtjni-generator
- maven-hawtjni-plugin
-- hawtjni-example
-- hawtjni-website
-
-
-
diff --git a/hawtjni-1.5-pom.patch b/hawtjni-1.5-pom.patch
new file mode 100644
index 0000000..3e4b04d
--- /dev/null
+++ b/hawtjni-1.5-pom.patch
@@ -0,0 +1,68 @@
+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 @@
+
+
+
+-
+-
+-
+-
+-
+- org.apache.maven.plugins
+- maven-shade-plugin
+- 1.3
+-
+-
+- package
+-
+- shade
+-
+-
+-
+-
+- junit:junit
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+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 @@
+
+
+ org.apache.maven
++ maven-compat
++ 3.0.3
++
++
++
++ org.apache.maven
+ maven-artifact-manager
+ 2.0
+
++
+
+ org.apache.maven
+ maven-artifact
+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 @@
+ hawtjni-runtime
+ hawtjni-generator
+ maven-hawtjni-plugin
+- hawtjni-example
+- hawtjni-website
+
+
+
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> collector) {
+- List annotated = finder.findAnnotatedClasses(annotation);
++ List> 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 1.5-1
+- Upstream release 1.5
+
* Fri Jan 13 2012 Fedora Release Engineering - 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