maven-jaxb2-plugin/maven-jaxb2-plugin-0.13.0-remove-enconding-option.patch

126 lines
3.9 KiB
Diff
Raw Permalink Normal View History

2024-01-22 19:55:37 +08:00
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 6cb4ed2..f0688ef 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
@@ -32,11 +32,6 @@ public class OptionsFactory implements
options.target = SpecVersion.V2_2;
2020-08-25 14:27:24 +08:00
- final String encoding = optionsConfiguration.getEncoding();
-
- if (encoding != null) {
- options.encoding = createEncoding(encoding);
- }
2024-01-22 19:55:37 +08:00
2020-08-25 14:27:24 +08:00
options.setSchemaLanguage(createLanguage(optionsConfiguration
.getSchemaLanguage()));
2024-01-22 19:55:37 +08:00
@@ -97,23 +92,6 @@ public class OptionsFactory implements
return options;
2020-08-25 14:27:24 +08:00
}
2024-01-22 19:55:37 +08:00
2020-08-25 14:27:24 +08:00
- private String createEncoding(String encoding)
- throws MojoExecutionException {
- if (encoding == null) {
- return null;
- }
- try {
- if (!Charset.isSupported(encoding)) {
2024-01-22 19:55:37 +08:00
- throw new MojoExecutionException(MessageFormat.format(
- "Unsupported encoding [{0}].", encoding));
2020-08-25 14:27:24 +08:00
- }
- return encoding;
- } catch (IllegalCharsetNameException icne) {
2024-01-22 19:55:37 +08:00
- throw new MojoExecutionException(MessageFormat.format(
- "Unsupported encoding [{0}].", encoding));
2020-08-25 14:27:24 +08:00
- }
-
- }
private Language createLanguage(String schemaLanguage)
throws MojoExecutionException {
2024-01-22 19:55:37 +08:00
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
2020-08-25 14:27:24 +08:00
options.target = SpecVersion.V2_2;
- final String encoding = optionsConfiguration.getEncoding();
-
- if (encoding != null) {
- options.encoding = createEncoding(encoding);
- }
2024-01-22 19:55:37 +08:00
2020-08-25 14:27:24 +08:00
options.setSchemaLanguage(createLanguage(optionsConfiguration
.getSchemaLanguage()));
2024-01-22 19:55:37 +08:00
@@ -97,23 +92,6 @@ public class OptionsFactory implements
2020-08-25 14:27:24 +08:00
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));
- }
-
- }
2024-01-22 19:55:37 +08:00
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
.getSpecVersion());
- final String encoding = optionsConfiguration.getEncoding();
-
- if (encoding != null) {
- options.encoding = createEncoding(encoding);
- }
options.setSchemaLanguage(createLanguage(optionsConfiguration
.getSchemaLanguage()));
@@ -109,25 +104,6 @@ public class OptionsFactory implements
}
- private String createEncoding(String encoding)
- throws MojoExecutionException {
- if (encoding == null) {
- return null;
- }
- try {
- if (!Charset.isSupported(encoding)) {
- throw new MojoExecutionException(
2020-08-25 14:27:24 +08:00
-
2024-01-22 19:55:37 +08:00
- MessageFormat.format("Unsupported encoding [{0}].", encoding));
- }
- return encoding;
- } catch (IllegalCharsetNameException icne) {
- throw new MojoExecutionException(
-
- MessageFormat.format("Unsupported encoding [{0}].", encoding));
- }
-
- }
2020-08-25 14:27:24 +08:00
private Language createLanguage(String schemaLanguage)
throws MojoExecutionException {
2024-01-22 19:55:37 +08:00
--
2.33.0