From 7e72c011415708b2a1124ce51519f91b62341493 Mon Sep 17 00:00:00 2001 From: gil Date: Feb 11 2015 16:28:50 +0000 Subject: update to 0.12.3 --- diff --git a/.gitignore b/.gitignore index d95acf7..10e14e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /maven-jaxb2-plugin-0.8.1.tar.gz /maven-jaxb2-plugin-0.9.1.tar.gz +/0.12.3.tar.gz diff --git a/maven-jaxb2-plugin-0.12.3-adapt-for-maven-3.patch b/maven-jaxb2-plugin-0.12.3-adapt-for-maven-3.patch new file mode 100644 index 0000000..f0d1b14 --- /dev/null +++ b/maven-jaxb2-plugin-0.12.3-adapt-for-maven-3.patch @@ -0,0 +1,41 @@ +diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/pom.xml maven-jaxb2-plugin-0.12.3.maven3/plugin-core/pom.xml +--- maven-jaxb2-plugin-0.12.3/plugin-core/pom.xml 2015-02-11 16:45:41.724475461 +0100 ++++ maven-jaxb2-plugin-0.12.3.maven3/plugin-core/pom.xml 2015-02-11 16:48:37.455478052 +0100 +@@ -25,6 +25,10 @@ + + + org.apache.maven ++ maven-compat ++ ++ ++ org.apache.maven + maven-plugin-api + + +diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java maven-jaxb2-plugin-0.12.3.maven3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java +--- maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java 2014-12-18 22:08:31.000000000 +0100 ++++ maven-jaxb2-plugin-0.12.3.maven3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java 2015-02-11 16:50:54.738667954 +0100 +@@ -1142,7 +1142,7 @@ + @SuppressWarnings("unchecked") + final Set artifacts = MavenMetadataSource + .createArtifacts(getArtifactFactory(), +- Arrays.asList(dependencyResource), ++ Arrays.asList((Dependency) dependencyResource), + Artifact.SCOPE_RUNTIME, null, getProject()); + + if (artifacts.size() != 1) { +diff -Nru maven-jaxb2-plugin-0.12.3/pom.xml maven-jaxb2-plugin-0.12.3.maven3/pom.xml +--- maven-jaxb2-plugin-0.12.3/pom.xml 2014-12-18 22:08:31.000000000 +0100 ++++ maven-jaxb2-plugin-0.12.3.maven3/pom.xml 2015-02-11 16:49:16.398262581 +0100 +@@ -147,6 +147,11 @@ + + + org.apache.maven ++ maven-compat ++ ${maven.version} ++ ++ ++ org.apache.maven + maven-project + ${maven.version} + diff --git a/maven-jaxb2-plugin-0.12.3-dont-use-internal-resolver.patch b/maven-jaxb2-plugin-0.12.3-dont-use-internal-resolver.patch new file mode 100644 index 0000000..11e1367 --- /dev/null +++ b/maven-jaxb2-plugin-0.12.3-dont-use-internal-resolver.patch @@ -0,0 +1,72 @@ +diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/pom.xml maven-jaxb2-plugin-0.12.3.resolver/plugin-core/pom.xml +--- maven-jaxb2-plugin-0.12.3/plugin-core/pom.xml 2014-12-18 22:08:31.000000000 +0100 ++++ maven-jaxb2-plugin-0.12.3.resolver/plugin-core/pom.xml 2015-02-11 17:13:34.668128244 +0100 +@@ -18,9 +18,9 @@ + commons-lang3 + + +- com.sun.org.apache.xml.internal +- resolver +- 20050927 ++ xml-resolver ++ xml-resolver ++ 1.2 + + + +diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java +--- maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java 2014-12-18 22:08:31.000000000 +0100 ++++ maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java 2015-02-11 16:37:55.439042014 +0100 +@@ -61,8 +61,8 @@ + import org.xml.sax.InputSource; + import org.xml.sax.SAXException; + +-import com.sun.org.apache.xml.internal.resolver.CatalogManager; +-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; ++import org.apache.xml.resolver.CatalogManager; ++import org.apache.xml.resolver.tools.CatalogResolver; + + /** + * Maven JAXB 2.x Mojo. +diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java +--- maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java 2014-12-18 22:08:31.000000000 +0100 ++++ maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java 2015-02-11 16:38:30.136061416 +0100 +@@ -5,7 +5,7 @@ + import java.net.URL; + + public class ClasspathCatalogResolver extends +- com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver { ++ org.apache.xml.resolver.tools.CatalogResolver { + + public static final String URI_SCHEME_CLASSPATH = "classpath"; + +diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java +--- maven-jaxb2-plugin-0.12.3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java 2014-12-18 22:08:31.000000000 +0100 ++++ maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java 2015-02-11 16:39:20.909163152 +0100 +@@ -10,10 +10,10 @@ + import org.jvnet.jaxb2.maven2.DependencyResourceResolver; + import org.jvnet.jaxb2.maven2.plugin.logging.NullLog; + +-import com.sun.org.apache.xml.internal.resolver.CatalogManager; ++import org.apache.xml.resolver.CatalogManager; + + public class MavenCatalogResolver extends +- com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver { ++ org.apache.xml.resolver.tools.CatalogResolver { + + public static final String URI_SCHEME_MAVEN = "maven"; + private final DependencyResourceResolver dependencyResourceResolver; +diff -Nru maven-jaxb2-plugin-0.12.3/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java +--- maven-jaxb2-plugin-0.12.3/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java 2014-12-18 22:08:31.000000000 +0100 ++++ maven-jaxb2-plugin-0.12.3.resolver/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java 2015-02-11 17:10:15.514496463 +0100 +@@ -7,8 +7,8 @@ + import org.junit.Test; + import org.xml.sax.InputSource; + +-import com.sun.org.apache.xml.internal.resolver.CatalogManager; +-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; ++import org.apache.xml.resolver.CatalogManager; ++import org.apache.xml.resolver.tools.CatalogResolver; + + public class MavenCatalogResolverTest { + diff --git a/maven-jaxb2-plugin-0.12.3-remove-enconding-option.patch b/maven-jaxb2-plugin-0.12.3-remove-enconding-option.patch new file mode 100644 index 0000000..b63c3a1 --- /dev/null +++ b/maven-jaxb2-plugin-0.12.3-remove-enconding-option.patch @@ -0,0 +1,41 @@ +diff -Nru maven-jaxb2-plugin-0.12.3/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java maven-jaxb2-plugin-0.12.3.enconding/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java +--- maven-jaxb2-plugin-0.12.3/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2014-12-18 22:08:31.000000000 +0100 ++++ maven-jaxb2-plugin-0.12.3.enconding/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2015-02-11 16:58:11.334829818 +0100 +@@ -32,12 +32,6 @@ + + options.target = SpecVersion.V2_2; + +- final String encoding = optionsConfiguration.getEncoding(); +- +- if (encoding != null) { +- options.encoding = createEncoding(encoding); +- } +- + options.setSchemaLanguage(createLanguage(optionsConfiguration + .getSchemaLanguage())); + +@@ -94,24 +88,6 @@ + return options; + } + +- private String createEncoding(String encoding) +- throws MojoExecutionException { +- if (encoding == null) { +- return null; +- } +- try { +- if (!Charset.isSupported(encoding)) { +- throw new MojoExecutionException(MessageFormat.format( +- "Unsupported encoding [{0}].", encoding)); +- } +- return encoding; +- } catch (IllegalCharsetNameException icne) { +- throw new MojoExecutionException(MessageFormat.format( +- "Unsupported encoding [{0}].", encoding)); +- } +- +- } +- + private Language createLanguage(String schemaLanguage) + throws MojoExecutionException { + if (StringUtils.isEmpty(schemaLanguage)) { diff --git a/maven-jaxb2-plugin-0.9.1-dont-use-internal-resolver.patch b/maven-jaxb2-plugin-0.9.1-dont-use-internal-resolver.patch deleted file mode 100644 index c89743f..0000000 --- a/maven-jaxb2-plugin-0.9.1-dont-use-internal-resolver.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -Nru maven-jaxb2-plugin-0.9.1/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java maven-jaxb2-plugin-0.9.1-gil/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java ---- maven-jaxb2-plugin-0.9.1/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java 2014-04-03 01:20:50.000000000 +0200 -+++ maven-jaxb2-plugin-0.9.1-gil/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java 2015-01-20 10:58:15.523411556 +0100 -@@ -12,8 +12,8 @@ - import org.jvnet.jaxb2.maven2.util.StringUtils; - import org.xml.sax.InputSource; - --import com.sun.org.apache.xml.internal.resolver.CatalogManager; --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.CatalogManager; -+import org.apache.xml.resolver.tools.CatalogResolver; - import com.sun.tools.xjc.BadCommandLineException; - import com.sun.tools.xjc.Language; - import com.sun.tools.xjc.Options; -diff -Nru maven-jaxb2-plugin-0.9.1/plugin-2.0/src/main/java/org/jvnet/mjiip/v_2_0/OptionsFactory.java maven-jaxb2-plugin-0.9.1-gil/plugin-2.0/src/main/java/org/jvnet/mjiip/v_2_0/OptionsFactory.java ---- maven-jaxb2-plugin-0.9.1/plugin-2.0/src/main/java/org/jvnet/mjiip/v_2_0/OptionsFactory.java 2014-04-03 01:20:50.000000000 +0200 -+++ maven-jaxb2-plugin-0.9.1-gil/plugin-2.0/src/main/java/org/jvnet/mjiip/v_2_0/OptionsFactory.java 2015-01-20 10:57:54.442578432 +0100 -@@ -10,8 +10,8 @@ - import org.jvnet.jaxb2.maven2.util.StringUtils; - import org.xml.sax.InputSource; - --import com.sun.org.apache.xml.internal.resolver.CatalogManager; --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.CatalogManager; -+import org.apache.xml.resolver.tools.CatalogResolver; - import com.sun.tools.xjc.BadCommandLineException; - import com.sun.tools.xjc.Language; - import com.sun.tools.xjc.Options; -diff -Nru maven-jaxb2-plugin-0.9.1/plugin-2.1/src/main/java/org/jvnet/mjiip/v_2_1/OptionsFactory.java maven-jaxb2-plugin-0.9.1-gil/plugin-2.1/src/main/java/org/jvnet/mjiip/v_2_1/OptionsFactory.java ---- maven-jaxb2-plugin-0.9.1/plugin-2.1/src/main/java/org/jvnet/mjiip/v_2_1/OptionsFactory.java 2014-04-03 01:20:50.000000000 +0200 -+++ maven-jaxb2-plugin-0.9.1-gil/plugin-2.1/src/main/java/org/jvnet/mjiip/v_2_1/OptionsFactory.java 2015-01-20 10:57:30.017930396 +0100 -@@ -10,8 +10,8 @@ - import org.jvnet.jaxb2.maven2.util.StringUtils; - import org.xml.sax.InputSource; - --import com.sun.org.apache.xml.internal.resolver.CatalogManager; --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.CatalogManager; -+import org.apache.xml.resolver.tools.CatalogResolver; - import com.sun.tools.xjc.BadCommandLineException; - import com.sun.tools.xjc.Language; - import com.sun.tools.xjc.Options; -diff -Nru maven-jaxb2-plugin-0.9.1/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java maven-jaxb2-plugin-0.9.1-gil/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java ---- maven-jaxb2-plugin-0.9.1/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2014-04-03 01:20:50.000000000 +0200 -+++ maven-jaxb2-plugin-0.9.1-gil/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2015-01-20 10:57:01.682498831 +0100 -@@ -12,8 +12,8 @@ - import org.jvnet.jaxb2.maven2.util.StringUtils; - import org.xml.sax.InputSource; - --import com.sun.org.apache.xml.internal.resolver.CatalogManager; --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.CatalogManager; -+import org.apache.xml.resolver.tools.CatalogResolver; - import com.sun.tools.xjc.BadCommandLineException; - import com.sun.tools.xjc.Language; - import com.sun.tools.xjc.Options; -diff -Nru maven-jaxb2-plugin-0.9.1/plugin-core/pom.xml maven-jaxb2-plugin-0.9.1-gil/plugin-core/pom.xml ---- maven-jaxb2-plugin-0.9.1/plugin-core/pom.xml 2014-09-16 00:19:39.000000000 +0200 -+++ maven-jaxb2-plugin-0.9.1-gil/plugin-core/pom.xml 2015-01-20 10:59:48.109286701 +0100 -@@ -12,9 +12,9 @@ - - - -- com.sun.org.apache.xml.internal -- resolver -- 20050927 -+ xml-resolver -+ xml-resolver -+ 1.2 - - - -diff -Nru maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java ---- maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java 2014-04-03 01:20:50.000000000 +0200 -+++ maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java 2015-01-20 11:00:28.260064257 +0100 -@@ -9,7 +9,7 @@ - import org.jvnet.jaxb2.maven2.util.IOUtils; - import org.xml.sax.InputSource; - --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.tools.CatalogResolver; - - public class OptionsConfiguration { - -diff -Nru maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java ---- maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java 2014-09-16 00:19:39.000000000 +0200 -+++ maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java 2015-01-20 11:00:49.534886644 +0100 -@@ -51,8 +51,8 @@ - import org.jvnet.jaxb2.maven2.util.IOUtils; - import org.sonatype.plexus.build.incremental.BuildContext; - --import com.sun.org.apache.xml.internal.resolver.CatalogManager; --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.CatalogManager; -+import org.apache.xml.resolver.tools.CatalogResolver; - - /** - * Maven JAXB 2.x Mojo. -diff -Nru maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java ---- maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java 2014-04-03 01:20:50.000000000 +0200 -+++ maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java 2015-01-20 11:01:53.819279942 +0100 -@@ -6,7 +6,7 @@ - import java.text.MessageFormat; - - public class ClasspathCatalogResolver extends -- com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver { -+ org.apache.xml.resolver.tools.CatalogResolver { - - public static final String URI_SCHEME_CLASSPATH = "classpath"; - -diff -Nru maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java ---- maven-jaxb2-plugin-0.9.1/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java 2011-10-30 10:53:41.000000000 +0100 -+++ maven-jaxb2-plugin-0.9.1-gil/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java 2015-01-20 11:02:15.675032357 +0100 -@@ -8,10 +8,10 @@ - import org.jvnet.jaxb2.maven2.DependencyResource; - import org.jvnet.jaxb2.maven2.DependencyResourceResolver; - --import com.sun.org.apache.xml.internal.resolver.CatalogManager; -+import org.apache.xml.resolver.CatalogManager; - - public class MavenCatalogResolver extends -- com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver { -+ org.apache.xml.resolver.tools.CatalogResolver { - - public static final String URI_SCHEME_MAVEN = "maven"; - private final DependencyResourceResolver dependencyResourceResolver; diff --git a/maven-jaxb2-plugin-adapt-for-maven-3.patch b/maven-jaxb2-plugin-adapt-for-maven-3.patch deleted file mode 100644 index 7c3373f..0000000 --- a/maven-jaxb2-plugin-adapt-for-maven-3.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 8278b03b66689243957cc5aa09562c694a12ab0a Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Mon, 20 Feb 2012 20:17:17 +0100 -Subject: [PATCH 3/3] Adapt for Maven 3 - ---- - plugin-core/pom.xml | 4 ++++ - .../org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java | 2 +- - pom.xml | 5 +++++ - 3 files changed, 10 insertions(+), 1 deletions(-) - -diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml -index 98664cd..f7def2f 100644 ---- a/plugin-core/pom.xml -+++ b/plugin-core/pom.xml -@@ -19,6 +19,10 @@ - - - org.apache.maven -+ maven-compat -+ -+ -+ org.apache.maven - maven-plugin-api - - -diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java -index 7dfeae6..695630f 100644 ---- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java -+++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java -@@ -926,7 +926,7 @@ public abstract class AbstractXJC2Mojo extends AbstractMojo implements - @SuppressWarnings("unchecked") - final Set artifacts = MavenMetadataSource - .createArtifacts(getArtifactFactory(), -- Arrays.asList(dependencyResource), -+ Arrays.asList((Dependency) dependencyResource), - Artifact.SCOPE_RUNTIME, null, getProject()); - - if (artifacts.size() != 1) { -diff --git a/pom.xml b/pom.xml -index d64f0e7..eb6e873 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -146,6 +146,11 @@ - - - org.apache.maven -+ maven-compat -+ ${maven.version} -+ -+ -+ org.apache.maven - maven-project - ${maven.version} - --- -1.7.9 - diff --git a/maven-jaxb2-plugin-add-codemodel-dependency.patch b/maven-jaxb2-plugin-add-codemodel-dependency.patch deleted file mode 100644 index 488d0e8..0000000 --- a/maven-jaxb2-plugin-add-codemodel-dependency.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 242f2b47a679a29204bc9e2c4dd29dfc91fb3314 Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Tue, 21 Feb 2012 20:33:03 +0100 -Subject: [PATCH 4/4] Add codemodel dependency - ---- - plugin-2.2/pom.xml | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/plugin-2.2/pom.xml b/plugin-2.2/pom.xml -index 56757fc..d5e7301 100644 ---- a/plugin-2.2/pom.xml -+++ b/plugin-2.2/pom.xml -@@ -37,6 +37,11 @@ - maven-plugin-testing-harness - test - -+ -+ com.sun.codemodel -+ codemodel -+ 2.6 -+ - - - --- -1.7.9 - diff --git a/maven-jaxb2-plugin-build-2.2-only.patch b/maven-jaxb2-plugin-build-2.2-only.patch deleted file mode 100644 index 0696739..0000000 --- a/maven-jaxb2-plugin-build-2.2-only.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c853f16bad564b46c51e714301362a75d80eec75 Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Mon, 20 Feb 2012 20:13:34 +0100 -Subject: [PATCH 2/2] Build version 2.2 only - ---- - pom.xml | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 8d59035..d64f0e7 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -54,11 +54,7 @@ - - - plugin-core -- plugin-2.0 -- plugin-2.1 - plugin-2.2 -- plugin -- testing - - - 2.0.6 -@@ -241,4 +237,4 @@ - - - -- -\ No newline at end of file -+ --- -1.7.9 - diff --git a/maven-jaxb2-plugin-remove-enconding-option.patch b/maven-jaxb2-plugin-remove-enconding-option.patch deleted file mode 100644 index 3fbeeb1..0000000 --- a/maven-jaxb2-plugin-remove-enconding-option.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 6a6d43bd62a8ff7134642ffeb2d8bf4732634c67 Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Tue, 21 Feb 2012 20:43:04 +0100 -Subject: [PATCH 5/5] Remove encoding option - ---- - .../java/org/jvnet/mjiip/v_2_2/OptionsFactory.java | 22 -------------------- - 1 files changed, 0 insertions(+), 22 deletions(-) - -diff --git a/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java b/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java -index b72a2e3..dc9159f 100644 ---- a/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java -+++ b/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java -@@ -36,10 +36,6 @@ public class OptionsFactory implements - - options.target = SpecVersion.V2_2; - -- final String encoding = optionsConfiguration.getEncoding(); -- if (encoding != null) { -- options.encoding = createEncoding(encoding); -- } - options.setSchemaLanguage(createLanguage(optionsConfiguration - .getSchemaLanguage())); - -@@ -99,24 +95,6 @@ public class OptionsFactory implements - return options; - } - -- private String createEncoding(String encoding) -- throws MojoExecutionException { -- if (encoding == null) { -- return null; -- } -- try { -- if (!Charset.isSupported(encoding)) { -- throw new MojoExecutionException(MessageFormat.format( -- "Unsupported encoding [{0}].", encoding)); -- } -- return encoding; -- } catch (IllegalCharsetNameException icne) { -- throw new MojoExecutionException(MessageFormat.format( -- "Unsupported encoding [{0}].", encoding)); -- } -- -- } -- - private Language createLanguage(String schemaLanguage) - throws MojoExecutionException { - if (StringUtils.isEmpty(schemaLanguage)) { --- -1.7.9 - diff --git a/maven-jaxb2-plugin.spec b/maven-jaxb2-plugin.spec index 879fe88..a628aad 100644 --- a/maven-jaxb2-plugin.spec +++ b/maven-jaxb2-plugin.spec @@ -1,29 +1,30 @@ Name: maven-jaxb2-plugin -Version: 0.9.1 -Release: 3%{?dist} +Version: 0.12.3 +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.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 +Source0: https://github.com/highsource/maven-jaxb2-plugin/archive/%{version}.tar.gz # Don't try to use an internal bundled resolver, as this is not available in # Fedora: -Patch0: %{name}-0.9.1-dont-use-internal-resolver.patch +Patch0: %{name}-0.12.3-dont-use-internal-resolver.patch # Adapt for Maven 3: -Patch1: %{name}-adapt-for-maven-3.patch +Patch1: %{name}-0.12.3-adapt-for-maven-3.patch # Remove the enconding option as the version of the XJC compiler that we build # in Fedora doesn't have it: -Patch2: %{name}-remove-enconding-option.patch +Patch2: %{name}-0.12.3-remove-enconding-option.patch BuildArch: noarch BuildRequires: java-headless BuildRequires: maven-local BuildRequires: xml-commons-resolver BuildRequires: maven-enforcer-plugin -BuildRequires: maven-surefire-provider-junit +BuildRequires: junit BuildRequires: glassfish-jaxb BuildRequires: codemodel +BuildRequires: mvn(org.apache.commons:commons-lang3) +BuildRequires: mvn(org.slf4j:slf4j-api) + %description This Maven 2 plugin wraps the JAXB 2.x XJC compiler and provides the capability @@ -38,21 +39,21 @@ The API documentation of %{name}. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 + # Build only version 2.2 %pom_disable_module plugin-2.0 %pom_disable_module plugin %pom_disable_module testing -%patch1 -p1 + + # Add dependency on codemodel: %pom_add_dep com.sun.codemodel:codemodel:2.6 plugin-2.2 -%patch2 -p1 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 @@ -73,10 +74,17 @@ sed -i "s|MavenProjectBuilder.ROLE|org.apache.maven.project.MavenProjectHelper.R %mvn_install %files -f .mfiles +%doc README.md TODO.md +%license LICENSE %files javadoc -f .mfiles-javadoc +%license LICENSE %changelog +* Wed Feb 11 2015 gil cattaneo 0.12.3-1 +- Update to 0.12.3 +- introduce license macro + * Tue Jan 20 2015 gil cattaneo 0.9.1-3 - rebuilt rhbz#1068387 diff --git a/sources b/sources index db8447e..bf91909 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d83ecd43a5bc588250318f0f7dc5af08 maven-jaxb2-plugin-0.9.1.tar.gz +9699a164b5206c850b91dc6ba5babbb8 0.12.3.tar.gz