ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [ws-xmlschema] branch master updated: Update to support build/test with Java17
Date Tue, 14 Sep 2021 17:29:35 GMT
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


The following commit(s) were added to refs/heads/master by this push:
     new 705ecef  Update to support build/test with Java17
705ecef is described below

commit 705ecef74731c6cd54c95d172da048245dafea75
Author: Daniel Kulp <dkulp@apache.org>
AuthorDate: Tue Sep 14 13:29:16 2021 -0400

    Update to support build/test with Java17
---
 pom.xml                                                    | 10 +++++-----
 xmlschema-bundle-test/pom.xml                              |  4 ++--
 .../ws/xmlschema/bundletest/XmlSchemaBundleTest.java       | 14 ++++++++------
 xmlschema-core/pom.xml                                     | 13 -------------
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index eea8e15..0ec1d06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,10 +63,10 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/ws-xmlschema.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/ws-xmlschema.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=ws-xmlschema.git;a=summary</url>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
     <prerequisites>
-        <maven>3.0</maven>
+        <maven>3.7</maven>
     </prerequisites>
     <distributionManagement>
         <site>
@@ -119,7 +119,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>2.5</version>
+                    <version>2.7.1</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.ws.xmlschema</groupId>
@@ -174,7 +174,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.12.1</version>
+                    <version>2.17</version>
                     <configuration>
                         <encoding>UTF-8</encoding>
                     </configuration>
diff --git a/xmlschema-bundle-test/pom.xml b/xmlschema-bundle-test/pom.xml
index a0acc4a..de2020a 100644
--- a/xmlschema-bundle-test/pom.xml
+++ b/xmlschema-bundle-test/pom.xml
@@ -54,7 +54,7 @@
         </plugins>
     </build>
     <properties>
-        <exam.version>4.13.1</exam.version>
+        <exam.version>4.13.4</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>
@@ -127,7 +127,7 @@
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.jaxb-runtime</artifactId>
-            <version>2.3.2_1</version>
+            <version>2.3.2_2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
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 4db81d3..e60a1fb 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
@@ -50,17 +50,19 @@ public class XmlSchemaBundleTest {
                 url("link:classpath:org.apache.ws.xmlschema.walker.link"));
     }
 
-    @Test(expected = java.lang.NoClassDefFoundError.class)
-    public void testInternalsExcluded() {
-        new DummyInternalClass();
-    }
-
     @Test
     public void testSchemaAvailable() {
         XmlSchemaCollection collection = new XmlSchemaCollection();
         Assert.assertNotNull(collection);
         XmlSchemaWalker walker = new XmlSchemaWalker(collection);
         Assert.assertNotNull(walker);
+
+        try {
+            DummyInternalClass d = new DummyInternalClass();
+            Assert.assertNull("Should not be able to create internal class", d);
+        } catch (java.lang.NoClassDefFoundError cnfe) {
+            //ignore
+        }
     }
-    
+
 }
diff --git a/xmlschema-core/pom.xml b/xmlschema-core/pom.xml
index c8ee1f0..5996850 100644
--- a/xmlschema-core/pom.xml
+++ b/xmlschema-core/pom.xml
@@ -168,18 +168,5 @@
             <artifactId>guava-testlib</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <!-- Always test with a well defined DOM implementation -->
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.12.1</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xml-apis</artifactId>
-                    <groupId>xml-apis</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
     </dependencies>
 </project>

Mime
View raw message