You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2021/12/20 14:15:56 UTC
[ws-axiom] branch master updated: Upgrade to XmlBeans 5
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 75c89f1 Upgrade to XmlBeans 5
75c89f1 is described below
commit 75c89f1410b615812b5dcb3330c818ef4051f78c
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Mon Dec 20 14:15:38 2021 +0000
Upgrade to XmlBeans 5
---
pom.xml | 5 +++
testing/axiom-testsuite/pom.xml | 49 +++++++++++++++++-----
.../src/main/{schemas => schema}/identity.xsd | 0
.../src/main/{xsd => schema}/order.xsd | 0
.../src/main/{xsd => schema}/xmlvend.xsd | 0
5 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index e1d9630..0bd6b01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,6 +357,11 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<version>${log4j.version}</version>
</dependency>
diff --git a/testing/axiom-testsuite/pom.xml b/testing/axiom-testsuite/pom.xml
index 61e2b7a..4c66039 100644
--- a/testing/axiom-testsuite/pom.xml
+++ b/testing/axiom-testsuite/pom.xml
@@ -36,7 +36,7 @@
<url>http://ws.apache.org/axiom/</url>
<properties>
- <xmlbeans.version>2.6.0</xmlbeans.version>
+ <xmlbeans.version>5.0.2</xmlbeans.version>
</properties>
<dependencies>
@@ -92,6 +92,11 @@
<artifactId>xmlbeans</artifactId>
<version>${xmlbeans.version}</version>
</dependency>
+ <!-- Used by xmlbeans -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jaxp-testsuite</artifactId>
@@ -120,24 +125,48 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xmlbeans-maven-plugin</artifactId>
- <version>2.3.3</version>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>${xmlbeans.version}</version>
<executions>
<execution>
+ <id>xmlbeans-order</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <name>order</name>
+ <sourceSchemas>order.xsd</sourceSchemas>
+ <javaTargetDir>${project.build.directory}/generated-sources/xmlbeans/order</javaTargetDir>
+ <classTargetDir>${project.build.directory}/generated-resources/xmlbeans/order</classTargetDir>
+ </configuration>
+ </execution>
+ <execution>
+ <id>xmlbeans-xmlvend</id>
<goals>
- <goal>xmlbeans</goal>
+ <goal>compile</goal>
</goals>
<configuration>
- <javaSource>1.7</javaSource>
+ <name>xmlvend</name>
+ <sourceSchemas>xmlvend.xsd</sourceSchemas>
+ <javaTargetDir>${project.build.directory}/generated-sources/xmlbeans/xmlvend</javaTargetDir>
+ <classTargetDir>${project.build.directory}/generated-resources/xmlbeans/xmlvend</classTargetDir>
</configuration>
</execution>
</executions>
+ <configuration>
+ <repackage>org.apache.axiom.ts.xmlbeans</repackage>
+ </configuration>
<dependencies>
<dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>${xmlbeans.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -151,7 +180,7 @@
</goals>
<configuration>
<files>
- <file>src/main/schemas/identity.xsd</file>
+ <file>src/main/schema/identity.xsd</file>
</files>
</configuration>
</execution>
diff --git a/testing/axiom-testsuite/src/main/schemas/identity.xsd b/testing/axiom-testsuite/src/main/schema/identity.xsd
similarity index 100%
rename from testing/axiom-testsuite/src/main/schemas/identity.xsd
rename to testing/axiom-testsuite/src/main/schema/identity.xsd
diff --git a/testing/axiom-testsuite/src/main/xsd/order.xsd b/testing/axiom-testsuite/src/main/schema/order.xsd
similarity index 100%
rename from testing/axiom-testsuite/src/main/xsd/order.xsd
rename to testing/axiom-testsuite/src/main/schema/order.xsd
diff --git a/testing/axiom-testsuite/src/main/xsd/xmlvend.xsd b/testing/axiom-testsuite/src/main/schema/xmlvend.xsd
similarity index 100%
rename from testing/axiom-testsuite/src/main/xsd/xmlvend.xsd
rename to testing/axiom-testsuite/src/main/schema/xmlvend.xsd