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

package init

Browse Source
This commit is contained in:
chengzihan2 2020-08-25 14:27:24 +08:00
parent bf88f13bc5
commit 5bc9a9a2fc
6 changed files with 308 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
0.13.0.tar.gz Normal file
View File

Binary file not shown.

87
maven-jaxb2-plugin-0.13.0-adapt-for-maven-3.patch Normal file
View File

@ -0,0 +1,87 @@
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
--- maven-jaxb2-plugin-0.13.0/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java 2015-08-30 11:39:57.000000000 +0200
+++ 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
@@ -23,6 +23,7 @@
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 @@
super.setUp();
mavenProjectBuilder = (MavenProjectBuilder) getContainer().lookup(
- MavenProjectBuilder.ROLE);
+ MavenProjectHelper.ROLE);
}
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
--- 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
+++ 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
@@ -23,6 +23,7 @@
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;
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 -->
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
@@ -37,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
</dependency>
<dependency>
<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
--- 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
+++ 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
@@ -1191,7 +1191,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.13.0/pom.xml maven-jaxb2-plugin-0.13.0.maven3/pom.xml
--- maven-jaxb2-plugin-0.13.0/pom.xml 2015-08-30 11:39:57.000000000 +0200
+++ maven-jaxb2-plugin-0.13.0.maven3/pom.xml 2015-10-26 07:09:26.349608065 +0100
@@ -162,7 +162,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-compat</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>

72
maven-jaxb2-plugin-0.13.0-dont-use-internal-resolver.patch Normal file
View File

@ -0,0 +1,72 @@
diff -Nru maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml maven-jaxb2-plugin-0.13.0.resolver/plugin-core/pom.xml
--- maven-jaxb2-plugin-0.13.0/plugin-core/pom.xml 2015-08-30 11:39:57.000000000 +0200
+++ maven-jaxb2-plugin-0.13.0.resolver/plugin-core/pom.xml 2015-10-26 07:04:15.851855712 +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.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
--- 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
+++ 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
@@ -74,8 +74,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.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
@@ -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.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
--- 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
+++ 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
@@ -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.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
--- 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
+++ 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
@@ -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 {

84
maven-jaxb2-plugin-0.13.0-remove-enconding-option.patch Normal file
View File

@ -0,0 +1,84 @@
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
--- 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
+++ 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
@@ -33,12 +33,6 @@
options.target = createSpecVersion(optionsConfiguration
.getSpecVersion());
- final String encoding = optionsConfiguration.getEncoding();
-
- if (encoding != null) {
- options.encoding = createEncoding(encoding);
- }
-
options.setSchemaLanguage(createLanguage(optionsConfiguration
.getSchemaLanguage()));
@@ -105,26 +99,6 @@
}
}
-
- 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 -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
+++ 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)) {

61
maven-jaxb2-plugin.spec Normal file
View File

@ -0,0 +1,61 @@
Name: maven-jaxb2-plugin
Version: 0.13.0
Release: 1
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
Source0: https://github.com/highsource/maven-jaxb2-plugin/archive/0.13.0.tar.gz
Patch0: %{name}-0.13.0-dont-use-internal-resolver.patch
Patch1: %{name}-0.13.0-adapt-for-maven-3.patch
Patch2: %{name}-0.13.0-remove-enconding-option.patch
BuildArch: noarch
BuildRequires: java-headless maven-local mvn(com.sun.codemodel:codemodel) mvn(junit:junit)
BuildRequires: mvn(org.apache.commons:commons-lang3) mvn(org.apache.maven:maven-compat)
BuildRequires: mvn(org.apache.maven:maven-core) mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) mvn(org.glassfish.jaxb:jaxb-runtime)
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(xml-resolver:xml-resolver)
%description
This Maven 2 plugin wraps the JAXB 2.x XJC compiler and provides the capability
to generate Java sources from XML Schemas.
%package javadoc
Summary: API documentation for %{name}
%description javadoc
The API documentation of %{name}.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%pom_disable_module plugin-2.0
%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-2.2
%build
(cd plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/;
mv DelegatingReaderWrapper.java DelegatingReaderWrapper.java_
mv DelegatingInputStreamWrapper.java DelegatingInputStreamWrapper.java_
)
%mvn_build
%install
%mvn_install
%files -f .mfiles
%doc README.md
%license LICENSE
%files javadoc -f .mfiles-javadoc
%license LICENSE
%changelog
* Wed Aug 5 2020 chengzihan <chengzihan2@huawei.com> - 0.13.0-1
- Package init

4
maven-jaxb2-plugin.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: highsource/maven-jaxb2-plugin
tag_prefix: "^"
seperator: "."