You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by dk...@apache.org on 2021/05/04 14:45:46 UTC
[ws-xmlschema] branch master updated (1d4be64 -> fa56719)
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ws-xmlschema.git.
from 1d4be64 Updating website with latest release
new 2c596ad [XMLSCHEMA-60] Move to Java8, bump version to 2.3.0-SNAPSHOT
new 789b796 Update a bunch of test-scope dependencies to latest versions
new bb83135 Update a bunch of maven plugins to newer versions
new fa56719 [XMLSCHEMA-61] Update to be able to build/test with Java 11 and Java 17
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 59 +++++++++++++---------
w3c-testcases/pom.xml | 2 +-
xmlschema-bundle-test/pom.xml | 36 ++++++++++---
.../xmlschema/bundletest/XmlSchemaBundleTest.java | 3 ++
xmlschema-core/pom.xml | 6 +--
xmlschema-walker/pom.xml | 2 +-
6 files changed, 71 insertions(+), 37 deletions(-)
[ws-xmlschema] 01/04: [XMLSCHEMA-60] Move to Java8,
bump version to 2.3.0-SNAPSHOT
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-xmlschema.git
commit 2c596ad63f382f0a6c37a2e862a10532d272871f
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Tue May 4 09:49:02 2021 -0400
[XMLSCHEMA-60] Move to Java8, bump version to 2.3.0-SNAPSHOT
---
pom.xml | 6 +++---
w3c-testcases/pom.xml | 2 +-
xmlschema-bundle-test/pom.xml | 2 +-
xmlschema-core/pom.xml | 2 +-
xmlschema-walker/pom.xml | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1b20067..5fe8711 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>xmlschema</artifactId>
<packaging>pom</packaging>
<name>XmlSchema</name>
- <version>2.2.6-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<description>Apache XMLSchema is a light weight schema object model that can be used to manipulate or generate XML schema.</description>
<url>https://ws.apache.org/commons/xmlschema20/</url>
<issueManagement>
@@ -167,8 +167,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
diff --git a/w3c-testcases/pom.xml b/w3c-testcases/pom.xml
index dd4c588..8acf764 100644
--- a/w3c-testcases/pom.xml
+++ b/w3c-testcases/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema</artifactId>
- <version>2.2.6-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>w3c-testcases</artifactId>
<packaging>jar</packaging>
diff --git a/xmlschema-bundle-test/pom.xml b/xmlschema-bundle-test/pom.xml
index d1244d3..a6529d9 100644
--- a/xmlschema-bundle-test/pom.xml
+++ b/xmlschema-bundle-test/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema</artifactId>
- <version>2.2.6-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>xmlschema-bundle-test</artifactId>
<packaging>jar</packaging>
diff --git a/xmlschema-core/pom.xml b/xmlschema-core/pom.xml
index 3e83883..0c2c9b6 100644
--- a/xmlschema-core/pom.xml
+++ b/xmlschema-core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema</artifactId>
- <version>2.2.6-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>xmlschema-core</artifactId>
<packaging>bundle</packaging>
diff --git a/xmlschema-walker/pom.xml b/xmlschema-walker/pom.xml
index 48cb073..714dc10 100644
--- a/xmlschema-walker/pom.xml
+++ b/xmlschema-walker/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema</artifactId>
- <version>2.2.6-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>xmlschema-walker</artifactId>
<name>xmlschema-walker</name>
[ws-xmlschema] 03/04: Update a bunch of maven plugins to newer
versions
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-xmlschema.git
commit bb831354f7d4105b54c5d6e36e029dc95997f75f
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Tue May 4 10:21:11 2021 -0400
Update a bunch of maven plugins to newer versions
---
pom.xml | 49 ++++++++++++++++++++++++++-----------------
xmlschema-bundle-test/pom.xml | 10 +++++----
xmlschema-core/pom.xml | 2 +-
3 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index fc55e4d..eea8e15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>23</version>
</parent>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema</artifactId>
@@ -114,7 +114,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4.1</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -204,7 +204,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.18</version>
+ <version>2.22.2</version>
<configuration>
<systemPropertyVariables>
<org.apache.ws.commons.schema.protectReadOnlyCollections>true</org.apache.ws.commons.schema.protectReadOnlyCollections>
@@ -224,7 +224,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>3.2.0</version>
<configuration>
<attach>true</attach>
<quiet>true</quiet>
@@ -233,7 +233,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
+ <version>3.9.1</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
@@ -304,6 +304,28 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M3</version>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.6.1</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<profiles>
<profile>
@@ -424,7 +446,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10</version>
<inherited>false</inherited>
<executions>
<execution>
@@ -491,19 +513,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>3.0.0</version>
<inherited>false</inherited>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>setup.workspace</id>
@@ -622,7 +633,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
+ <version>3.1.2</version>
<!--configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
diff --git a/xmlschema-bundle-test/pom.xml b/xmlschema-bundle-test/pom.xml
index 4691778..e3039a0 100644
--- a/xmlschema-bundle-test/pom.xml
+++ b/xmlschema-bundle-test/pom.xml
@@ -33,7 +33,7 @@
<plugin>
<groupId>com.github.veithen.alta</groupId>
<artifactId>alta-maven-plugin</artifactId>
- <version>0.4</version>
+ <version>0.7.1</version>
<executions>
<execution>
<goals>
@@ -42,9 +42,11 @@
<configuration>
<name>%bundle.symbolicName%.link</name>
<value>%url%</value>
- <dependencySet>
- <scope>test</scope>
- </dependencySet>
+ <artifactSet>
+ <dependencySet>
+ <scope>test</scope>
+ </dependencySet>
+ </artifactSet>
</configuration>
</execution>
</executions>
diff --git a/xmlschema-core/pom.xml b/xmlschema-core/pom.xml
index 8ad8d47..849b2c7 100644
--- a/xmlschema-core/pom.xml
+++ b/xmlschema-core/pom.xml
@@ -131,7 +131,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2</version>
+ <version>3.3.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
[ws-xmlschema] 02/04: Update a bunch of test-scope dependencies to
latest versions
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-xmlschema.git
commit 789b796070219a6e96ebe71c57482c381500ebd2
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Tue May 4 10:01:19 2021 -0400
Update a bunch of test-scope dependencies to latest versions
---
pom.xml | 4 ++--
xmlschema-bundle-test/pom.xml | 6 +++---
xmlschema-core/pom.xml | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5fe8711..fc55e4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -600,7 +600,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -612,7 +612,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
- <version>20.0</version>
+ <version>30.1.1-jre</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/xmlschema-bundle-test/pom.xml b/xmlschema-bundle-test/pom.xml
index a6529d9..4691778 100644
--- a/xmlschema-bundle-test/pom.xml
+++ b/xmlschema-bundle-test/pom.xml
@@ -52,7 +52,7 @@
</plugins>
</build>
<properties>
- <exam.version>4.9.1</exam.version>
+ <exam.version>4.13.1</exam.version>
<!-- don't deploy this as this is just test data and a large amount of it -->
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.11.0.v20160603-1336</version>
+ <version>3.13.0.v20180226-1711</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.26</version>
+ <version>1.7.30</version>
</dependency>
</dependencies>
</project>
diff --git a/xmlschema-core/pom.xml b/xmlschema-core/pom.xml
index 0c2c9b6..8ad8d47 100644
--- a/xmlschema-core/pom.xml
+++ b/xmlschema-core/pom.xml
@@ -172,7 +172,7 @@
<!-- Always test with a well defined DOM implementation -->
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.11.0</version>
+ <version>2.12.1</version>
<scope>test</scope>
</dependency>
</dependencies>
[ws-xmlschema] 04/04: [XMLSCHEMA-61] Update to be able to
build/test with Java 11 and Java 17
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-xmlschema.git
commit fa5671980c5a5ddcc1af7f69d6864413df9c65f4
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Tue May 4 10:44:03 2021 -0400
[XMLSCHEMA-61] Update to be able to build/test with Java 11 and Java 17
---
xmlschema-bundle-test/pom.xml | 18 ++++++++++++++++++
.../ws/xmlschema/bundletest/XmlSchemaBundleTest.java | 3 +++
2 files changed, 21 insertions(+)
diff --git a/xmlschema-bundle-test/pom.xml b/xmlschema-bundle-test/pom.xml
index e3039a0..a0acc4a 100644
--- a/xmlschema-bundle-test/pom.xml
+++ b/xmlschema-bundle-test/pom.xml
@@ -118,5 +118,23 @@
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.30</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-runtime</artifactId>
+ <version>2.3.2_1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>1.2.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java b/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java
index 2133afb..4db81d3 100644
--- a/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java
+++ b/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java
@@ -43,6 +43,9 @@ public class XmlSchemaBundleTest {
public static Option[] configuration() {
return CoreOptions.options(
junitBundles(),
+ url("link:classpath:com.sun.activation.jakarta.activation.link"),
+ url("link:classpath:jakarta.activation-api.link"),
+ url("link:classpath:jakarta.xml.bind-api.link"),
url("link:classpath:org.apache.ws.xmlschema.core.link"),
url("link:classpath:org.apache.ws.xmlschema.walker.link"));
}