packages/maven-jaxb2-plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!4 Update to version 0.15.1

Browse Source 
From: @wang--ge 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530
This commit is contained in:
openeuler-ci-bot 2024-01-23 06:44:58 +00:00 committed by Gitee
commit c8000cdf14
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 200 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
0.13.0.tar.gz
View File

Binary file not shown.

BIN
jaxb-tools-0.15.1.tar.gz Normal file
View File

Binary file not shown.

102
maven-jaxb2-plugin-0.13.0-adapt-for-maven-3.patch
View File

@ -1,15 +1,16 @@
diff -Nru maven-jaxb2-plugin-0.13.0/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java maven-jaxb2-plugin-0.13.0.maven3/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java diff --git a/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java b/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java
--- maven-jaxb2-plugin-0.13.0/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java 2015-08-30 11:39:57.000000000 +0200 index 8124cb5..78f7aff 100644
+++ maven-jaxb2-plugin-0.13.0.maven3/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java 2015-10-26 07:08:33.061224903 +0100 --- a/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java
@@ -23,6 +23,7 @@ +++ b/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java
@@ -23,6 +23,7 @@ import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.MavenProjectHelper; +import org.apache.maven.project.MavenProjectHelper;
import org.jvnet.mjiip.v_2.XJC2Mojo;
public abstract class JAXBGenerateTest extends AbstractMojoTestCase { public abstract class JAXBGenerateTest extends AbstractMojoTestCase {
@@ -37,7 +38,7 @@
@@ -36,7 +37,7 @@ public abstract class JAXBGenerateTest extends AbstractMojoTestCase {
super.setUp(); super.setUp();
mavenProjectBuilder = (MavenProjectBuilder) getContainer().lookup( mavenProjectBuilder = (MavenProjectBuilder) getContainer().lookup(
@ -18,41 +19,22 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin/src/test/java/org/jvnet/jaxb2/maven2/
} }
protected static File getBaseDir() { protected static File getBaseDir() {
diff -Nru maven-jaxb2-plugin-0.13.0/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java maven-jaxb2-plugin-0.13.0.maven3/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml
--- maven-jaxb2-plugin-0.13.0/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java 2015-08-30 11:39:57.000000000 +0200 index ec44704..00898f0 100644
+++ maven-jaxb2-plugin-0.13.0.maven3/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java 2015-10-26 07:08:33.061224903 +0100 --- a/plugin-core/pom.xml
@@ -23,6 +23,7 @@ +++ b/plugin-core/pom.xml
import org.apache.maven.plugin.testing.AbstractMojoTestCase; @@ -32,6 +32,10 @@
import org.apache.maven.project.MavenProject; <artifactId>txw2</artifactId>
import org.apache.maven.project.MavenProjectBuilder; </dependency>
+import org.apache.maven.project.MavenProjectHelper;
public abstract class JAXBGenerateTest extends AbstractMojoTestCase {
@@ -36,7 +37,7 @@
super.setUp();
mavenProjectBuilder = (MavenProjectBuilder) getContainer().lookup(
- MavenProjectBuilder.ROLE);
+ MavenProjectHelper.ROLE);
}
protected static File getBaseDir() {
diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml maven-jaxb2-plugin-0.13.0.maven3/plugin-core/pom.xml
--- maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml 2015-10-26 07:10:24.540750466 +0100
+++ maven-jaxb2-plugin-0.13.0.maven3/plugin-core/pom.xml 2015-10-26 07:08:33.061224903 +0100
@@ -25,6 +25,10 @@
<!-- Maven plugin and api classes --> <!-- Maven plugin and api classes -->
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ </dependency>
+ <dependency> + <dependency>
+ <groupId>org.apache.maven</groupId> + <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId> + <artifactId>maven-compat</artifactId>
</dependency> + </dependency>
<dependency> <dependency>
@@ -37,7 +41,7 @@ <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
@@ -46,7 +50,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
@ -61,22 +43,45 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml maven-jaxb2-plugin-0.13.
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.plugin-tools</groupId> <groupId>org.apache.maven.plugin-tools</groupId>
diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java maven-jaxb2-plugin-0.13.0.maven3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java 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
--- maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java 2015-08-30 11:39:57.000000000 +0200 index 2d97d08..925914e 100644
+++ maven-jaxb2-plugin-0.13.0.maven3/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java 2015-10-26 07:08:33.062224854 +0100 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java
@@ -1191,7 +1191,7 @@ +++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java
@@ -1322,7 +1322,7 @@ public abstract class AbstractXJC2Mojo<O> extends AbstractMojo implements
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final Set<Artifact> artifacts = MavenMetadataSource final Set<Artifact> artifacts = MavenMetadataSource
.createArtifacts(getArtifactFactory(), .createArtifacts(getArtifactFactory(),
- Arrays.asList(dependencyResource), - Arrays.<Dependency>asList(dependencyResource),
+ Arrays.asList((Dependency) dependencyResource), + Arrays.<Dependency>asList((Dependency) dependencyResource),
Artifact.SCOPE_RUNTIME, null, getProject()); Artifact.SCOPE_RUNTIME, null, getProject());
if (artifacts.size() != 1) { if (artifacts.size() != 1) {
diff -Nru maven-jaxb2-plugin-0.13.0/pom.xml maven-jaxb2-plugin-0.13.0.maven3/pom.xml diff --git a/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java b/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java
--- maven-jaxb2-plugin-0.13.0/pom.xml 2015-08-30 11:39:57.000000000 +0200 index 35cd0ff..da75800 100644
+++ maven-jaxb2-plugin-0.13.0.maven3/pom.xml 2015-10-26 07:09:26.349608065 +0100 --- a/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java
@@ -162,7 +162,7 @@ +++ b/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java
@@ -23,6 +23,7 @@ import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.MavenProjectHelper;
import org.jvnet.mjiip.v_2.XJC2Mojo;
public abstract class JAXBGenerateTest extends AbstractMojoTestCase {
@@ -37,7 +38,7 @@ public abstract class JAXBGenerateTest extends AbstractMojoTestCase {
super.setUp();
mavenProjectBuilder = (MavenProjectBuilder) getContainer().lookup(
- MavenProjectBuilder.ROLE);
+ MavenProjectHelper.ROLE);
}
protected static File getBaseDir() {
diff --git a/pom.xml b/pom.xml
index 53d5dac..7070059 100644
--- a/pom.xml
+++ b/pom.xml
@@ -341,7 +341,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
@ -85,3 +90,6 @@ diff -Nru maven-jaxb2-plugin-0.13.0/pom.xml maven-jaxb2-plugin-0.13.0.maven3/pom
<version>${maven.version}</version> <version>${maven.version}</version>
</dependency> </dependency>
<dependency> <dependency>
--
2.33.0

70
maven-jaxb2-plugin-0.13.0-dont-use-internal-resolver.patch
View File

@ -1,7 +1,8 @@
diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml maven-jaxb2-plugin-0.13.0.resolver/plugin-core/pom.xml diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml
--- maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml 2015-08-30 11:39:57.000000000 +0200 index e6c49b2..ec44704 100644
+++ maven-jaxb2-plugin-0.13.0.resolver/plugin-core/pom.xml 2015-10-26 07:04:15.851855712 +0100 --- a/plugin-core/pom.xml
@@ -18,9 +18,9 @@ +++ b/plugin-core/pom.xml
@@ -23,9 +23,9 @@
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@ -12,26 +13,28 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml maven-jaxb2-plugin-0.13.
+ <artifactId>xml-resolver</artifactId> + <artifactId>xml-resolver</artifactId>
+ <version>1.2</version> + <version>1.2</version>
</dependency> </dependency>
<!-- Maven plugin and api classes -->
<dependency> <dependency>
diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java <groupId>org.glassfish.jaxb</groupId>
--- maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java 2015-08-30 11:39:57.000000000 +0200 diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java
+++ maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java 2015-10-26 07:04:15.852855663 +0100 index 6fb4aae..2f882be 100644
@@ -74,8 +74,8 @@ --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java
import org.xml.sax.InputSource; +++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java
import org.xml.sax.SAXException; @@ -76,8 +76,8 @@ import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
-import com.sun.org.apache.xml.internal.resolver.CatalogManager; import org.xml.sax.SAXException;
-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
+import org.apache.xml.resolver.CatalogManager; -import com.sun.org.apache.xml.internal.resolver.CatalogManager;
+import org.apache.xml.resolver.tools.CatalogResolver; -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. import com.sun.xml.txw2.annotation.XmlNamespace;
diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java
--- maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java 2015-08-30 11:39:57.000000000 +0200 /**
+++ maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java 2015-10-26 07:04:15.853855614 +0100 diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java
@@ -5,7 +5,7 @@ index 764bb69..e5a95c5 100644
--- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java
+++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java
@@ -5,7 +5,7 @@ import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
public class ClasspathCatalogResolver extends public class ClasspathCatalogResolver extends
@ -40,10 +43,11 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/ma
public static final String URI_SCHEME_CLASSPATH = "classpath"; public static final String URI_SCHEME_CLASSPATH = "classpath";
diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java
--- maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java 2015-08-30 11:39:57.000000000 +0200 index a95d51b..5a6c558 100644
+++ maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java 2015-10-26 07:04:15.854855565 +0100 --- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java
@@ -10,10 +10,10 @@ +++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java
@@ -10,10 +10,10 @@ import org.jvnet.jaxb2.maven2.DependencyResource;
import org.jvnet.jaxb2.maven2.DependencyResourceResolver; import org.jvnet.jaxb2.maven2.DependencyResourceResolver;
import org.jvnet.jaxb2.maven2.plugin.logging.NullLog; import org.jvnet.jaxb2.maven2.plugin.logging.NullLog;
@ -56,10 +60,11 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/main/java/org/jvnet/jaxb2/ma
public static final String URI_SCHEME_MAVEN = "maven"; public static final String URI_SCHEME_MAVEN = "maven";
private final DependencyResourceResolver dependencyResourceResolver; private final DependencyResourceResolver dependencyResourceResolver;
diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java diff --git a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java b/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java
--- maven-jaxb2-plugin-0.13.0/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java 2015-08-30 11:39:57.000000000 +0200 index 588be4d..e21fabd 100644
+++ maven-jaxb2-plugin-0.13.0.resolver/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java 2015-10-26 07:04:15.855855516 +0100 --- a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java
@@ -7,8 +7,8 @@ +++ b/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java
@@ -7,8 +7,8 @@ import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
@ -70,3 +75,6 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/src/test/java/org/jvnet/jaxb2/ma
public class MavenCatalogResolverTest { public class MavenCatalogResolverTest {
--
2.33.0

141
maven-jaxb2-plugin-0.13.0-remove-enconding-option.patch
View File

@ -1,7 +1,88 @@
diff -Nru maven-jaxb2-plugin-0.13.0/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java maven-jaxb2-plugin-0.13.0.enconding/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java 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
--- maven-jaxb2-plugin-0.13.0/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java 2015-08-30 11:39:57.000000000 +0200 index 6cb4ed2..f0688ef 100644
+++ maven-jaxb2-plugin-0.13.0.enconding/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java 2015-10-26 07:13:24.427916727 +0100 --- a/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java
@@ -33,12 +33,6 @@ +++ b/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java
@@ -32,11 +32,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()));
@@ -97,23 +92,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 {
diff --git a/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/OptionsFactory.java b/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/OptionsFactory.java
index a1d1214..d395c96 100644
--- a/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/OptionsFactory.java
+++ b/plugin-2.3/src/main/java/org/jvnet/mjiip/v_2_3/OptionsFactory.java
@@ -32,11 +32,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()));
@@ -97,23 +92,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 {
diff --git a/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java b/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java
index 4ae2ccb..2f3e039 100644
--- a/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java
+++ b/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java
@@ -33,11 +33,6 @@ public class OptionsFactory implements
options.target = createSpecVersion(optionsConfiguration options.target = createSpecVersion(optionsConfiguration
.getSpecVersion()); .getSpecVersion());
@ -10,15 +91,13 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin/src/main/java/org/jvnet/mjiip/v_2/Opt
- if (encoding != null) { - if (encoding != null) {
- options.encoding = createEncoding(encoding); - options.encoding = createEncoding(encoding);
- } - }
-
options.setSchemaLanguage(createLanguage(optionsConfiguration options.setSchemaLanguage(createLanguage(optionsConfiguration
.getSchemaLanguage())); .getSchemaLanguage()));
@@ -109,25 +104,6 @@ public class OptionsFactory implements
@@ -105,26 +99,6 @@
}
} }
-
- private String createEncoding(String encoding) - private String createEncoding(String encoding)
- throws MojoExecutionException { - throws MojoExecutionException {
- if (encoding == null) { - if (encoding == null) {
@ -41,44 +120,6 @@ diff -Nru maven-jaxb2-plugin-0.13.0/plugin/src/main/java/org/jvnet/mjiip/v_2/Opt
private Language createLanguage(String schemaLanguage) private Language createLanguage(String schemaLanguage)
throws MojoExecutionException { throws MojoExecutionException {
diff -Nru maven-jaxb2-plugin-0.13.0/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java maven-jaxb2-plugin-0.13.0.enconding/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java --
--- maven-jaxb2-plugin-0.13.0/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2015-08-30 11:39:57.000000000 +0200 2.33.0
+++ maven-jaxb2-plugin-0.13.0.enconding/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2015-10-26 07:13:24.428916678 +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)) {

27
maven-jaxb2-plugin.spec
View File

@ -1,10 +1,10 @@
Name: maven-jaxb2-plugin Name: maven-jaxb2-plugin
Version: 0.13.0 Version: 0.15.1
Release: 2 Release: 1
Summary: Provides the capability to generate java sources from schemas Summary: Provides the capability to generate java sources from schemas
License: BSD-2-Clause and ASL 2.0 License: BSD-2-Clause and ASL 2.0
URL: http://java.net/projects/maven-jaxb2-plugin/pages/Home URL: http://java.net/projects/maven-jaxb2-plugin/pages/Home
Source0: https://github.com/highsource/maven-jaxb2-plugin/archive/0.13.0.tar.gz Source0: https://github.com/highsource/jaxb-tools/archive/%{version}/jaxb-tools-%{version}.tar.gz
Patch0: %{name}-0.13.0-dont-use-internal-resolver.patch Patch0: %{name}-0.13.0-dont-use-internal-resolver.patch
Patch1: %{name}-0.13.0-adapt-for-maven-3.patch Patch1: %{name}-0.13.0-adapt-for-maven-3.patch
Patch2: %{name}-0.13.0-remove-enconding-option.patch Patch2: %{name}-0.13.0-remove-enconding-option.patch
@ -20,6 +20,13 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-utils) mvn(org.glassfish.jax
BuildRequires: mvn(org.glassfish.jaxb:jaxb-xjc) mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.glassfish.jaxb:jaxb-xjc) mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) mvn(org.sonatype.plexus:plexus-build-api) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) mvn(org.sonatype.plexus:plexus-build-api)
BuildRequires: mvn(xml-resolver:xml-resolver) BuildRequires: mvn(xml-resolver:xml-resolver)
BuildRequires: mvn(com.sun.activation:jakarta.activation)
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) maven
BuildRequires: mvn(org.eclipse.aether:aether-connector-basic)
BuildRequires: mvn(org.eclipse.aether:aether-transport-wagon)
BuildRequires: mvn(org.apache.maven.wagon:wagon-http)
BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api)
%description %description
This Maven 2 plugin wraps the JAXB 2.x XJC compiler and provides the capability This Maven 2 plugin wraps the JAXB 2.x XJC compiler and provides the capability
to generate Java sources from XML Schemas. to generate Java sources from XML Schemas.
@ -30,21 +37,14 @@ Summary: API documentation for %{name}
The API documentation of %{name}. The API documentation of %{name}.
%prep %prep
%setup -q %autosetup -n jaxb-tools-%{version} -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%pom_disable_module plugin-2.0 %pom_disable_module plugin-2.0
%pom_disable_module plugin-2.1 %pom_disable_module plugin-2.1
%pom_add_dep com.sun.codemodel:codemodel:2.6 plugin %pom_add_dep com.sun.codemodel:codemodel:2.6 plugin
%pom_add_dep com.sun.codemodel:codemodel:2.6 plugin-2.2 %pom_add_dep com.sun.codemodel:codemodel:2.6 plugin-2.2
%build %build
(cd plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/; %mvn_build -b
mv DelegatingReaderWrapper.java DelegatingReaderWrapper.java_
mv DelegatingInputStreamWrapper.java DelegatingInputStreamWrapper.java_
)
%mvn_build
%install %install
%mvn_install %mvn_install
@ -57,6 +57,9 @@ The API documentation of %{name}.
%license LICENSE %license LICENSE
%changelog %changelog
* Mon Jan 22 2024 Ge Wang <wang__ge@126.com> - 0.15.1-1
- Update to version 0.15.1
* Tue May 10 2022 xu_ping <xuping33@h-partners.com> - 0.13.0-2 * Tue May 10 2022 xu_ping <xuping33@h-partners.com> - 0.13.0-2
- License compliance rectification - License compliance rectification