[maven-jaxb2-plugin] update to 0.12.3
gil
gil at fedoraproject.org
Wed Feb 11 16:29:07 UTC 2015
commit 7e72c011415708b2a1124ce51519f91b62341493
Author: gil <puntogil at libero.it>
Date: Wed Feb 11 17:28:50 2015 +0100
update to 0.12.3
.gitignore | 1 +
maven-jaxb2-plugin-0.12.3-adapt-for-maven-3.patch | 41 +++++++
...-plugin-0.12.3-dont-use-internal-resolver.patch | 72 +++++++++++
...xb2-plugin-0.12.3-remove-enconding-option.patch | 93 +++++++--------
...2-plugin-0.9.1-dont-use-internal-resolver.patch | 126 --------------------
maven-jaxb2-plugin-adapt-for-maven-3.patch | 58 ---------
maven-jaxb2-plugin-add-codemodel-dependency.patch | 28 -----
maven-jaxb2-plugin-build-2.2-only.patch | 35 ------
maven-jaxb2-plugin.spec | 36 ++++--
sources | 2 +-
10 files changed, 178 insertions(+), 314 deletions(-)
---
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 @@
+ <!-- Maven plugin and api classes -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+ <dependency>
+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<Artifact> 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 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>${maven.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
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 @@
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+- <groupId>com.sun.org.apache.xml.internal</groupId>
+- <artifactId>resolver</artifactId>
+- <version>20050927</version>
++ <groupId>xml-resolver</groupId>
++ <artifactId>xml-resolver</artifactId>
++ <version>1.2</version>
+ </dependency>
+ <!-- Maven plugin and api classes -->
+ <dependency>
+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-remove-enconding-option.patch b/maven-jaxb2-plugin-0.12.3-remove-enconding-option.patch
similarity index 53%
rename from maven-jaxb2-plugin-remove-enconding-option.patch
rename to maven-jaxb2-plugin-0.12.3-remove-enconding-option.patch
index 3fbeeb1..b63c3a1 100644
--- a/maven-jaxb2-plugin-remove-enconding-option.patch
+++ b/maven-jaxb2-plugin-0.12.3-remove-enconding-option.patch
@@ -1,52 +1,41 @@
-From 6a6d43bd62a8ff7134642ffeb2d8bf4732634c67 Mon Sep 17 00:00:00 2001
-From: Juan Hernandez <juan.hernandez at redhat.com>
-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 -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.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 <puntogil at libero.it> 0.12.3-1
+- Update to 0.12.3
+- introduce license macro
+
* Tue Jan 20 2015 gil cattaneo <puntogil at libero.it> 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
More information about the scm-commits
mailing list