From f3792428188e80e2ef73cc3351783032ed5c50a6 Mon Sep 17 00:00:00 2001
From: gil <puntogil@libero.it>
Date: Jan 20 2015 10:41:37 +0000
Subject: Update to 0.9.1


---

diff --git a/maven-jaxb2-plugin.spec b/maven-jaxb2-plugin.spec
index 1a2b728..ab86723 100644
--- a/maven-jaxb2-plugin.spec
+++ b/maven-jaxb2-plugin.spec
@@ -1,15 +1,15 @@
 Name:          maven-jaxb2-plugin
-Version:       0.8.1
-Release:       13%{?dist}
+Version:       0.9.1
+Release:       1%{?dist}
 Summary:       Provides the capability to generate java sources from schemas
 License:       BSD and ASL 2.0
 URL:           http://java.net/projects/maven-jaxb2-plugin/pages/Home
-# svn export https://svn.java.net/svn/maven-jaxb2-plugin~svn/tags/0.8.1/ maven-jaxb2-plugin-0.8.1
-# tar -zcvf maven-jaxb2-plugin-0.8.1.tar.gz maven-jaxb2-plugin-0.8.1
+# svn export https://svn.java.net/svn/maven-jaxb2-plugin~svn/tags/0.9.1/ maven-jaxb2-plugin-0.9.1
+# tar -zcvf maven-jaxb2-plugin-0.9.1.tar.gz maven-jaxb2-plugin-0.9.1
 Source0:       %{name}-%{version}.tar.gz
 # Don't try to use an internal bundled resolver, as this is not available in
 # Fedora:
-Patch0:        %{name}-dont-use-internal-resolver.patch
+Patch0:        %{name}-0.9.1-dont-use-internal-resolver.patch
 # Adapt for Maven 3:
 Patch1:        %{name}-adapt-for-maven-3.patch
 # Remove the enconding option as the version of the XJC compiler that we build
@@ -21,8 +21,7 @@ BuildRequires: java
 BuildRequires: maven-local
 BuildRequires: xml-commons-resolver
 BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-surefire-provider-junit4
-BuildRequires: maven-anno-plugin
+BuildRequires: maven-surefire-provider-junit
 BuildRequires: glassfish-jaxb
 BuildRequires: codemodel
 
@@ -41,7 +40,6 @@ The API documentation of %{name}.
 %patch0 -p1
 # Build only version 2.2
 %pom_disable_module plugin-2.0
-%pom_disable_module plugin-2.1
 %pom_disable_module plugin
 %pom_disable_module testing
 %patch1 -p1
@@ -49,10 +47,26 @@ The API documentation of %{name}.
 %pom_add_dep com.sun.codemodel:codemodel:2.6 plugin-2.2
 %patch2 -p1
 
-%build
+sed -i "s|MavenProjectBuilder.ROLE|org.apache.maven.project.MavenProjectHelper.ROLE|" \
+ plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java
+
+%pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:configuration"
 
+
+%if %{?fedora} <= 21
+# use glassfish-jaxb >= 2.2.7
+%pom_disable_module plugin-2.2
+%mvn_file :maven-jaxb21-plugin %{name}
+%else
+# use glassfish-jaxb >= 2.1.14
+%pom_disable_module plugin-2.1
 %mvn_file :maven-jaxb22-plugin %{name}
+%endif
+
 %mvn_file :%{name}-core %{name}-core
+
+%build
+
 %mvn_build
 
 %install
@@ -63,6 +77,9 @@ The API documentation of %{name}.
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Jan 20 2015 gil cattaneo <puntogil@libero.it> 0.9.1-1
+- Update to 0.9.1
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -105,4 +122,3 @@ The API documentation of %{name}.
 
 * Sat Jan 21 2012 Marek Goldmann <mgoldman@redhat.com> 0.8.1-2
 - Initial packaging
-