Bump jaxb-runtime-version from 3.0.2 to 4.0.3

apache · May 19, 2024 · 52bb80b · 52bb80b
1 parent 6632432
commit 52bb80b
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 18 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -48,6 +48,12 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - name: Setup JDK 17
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3

diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml
@@ -16,10 +16,10 @@ jobs:
     timeout-minutes: 130
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: maven
       - name: Build with Apache Maven

diff --git a/javadoc/pom.xml b/javadoc/pom.xml
@@ -46,15 +46,15 @@
 			<scope>test</scope>
         </dependency>
 		<dependency>
-			<groupId>org.eclipse.equinox</groupId>
-			<artifactId>app</artifactId>
-			<version>1.3.200-v20130910-1609</version>
+            <groupId>org.eclipse.platform</groupId>
+            <artifactId>org.eclipse.equinox.app</artifactId>
+            <version>1.7.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>core</artifactId>
-			<version>3.3.0-v_771</version>
+			<artifactId>org.eclipse.jdt.core</artifactId>
+            <version>3.37.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/javadoc/src/test/java/org/apache/cxf/xjc/javadoc/JavadocPluginTest.java b/javadoc/src/test/java/org/apache/cxf/xjc/javadoc/JavadocPluginTest.java
@@ -127,8 +127,8 @@ public void testDocumentationOnPropertiesIsOverwrittenByJAXBBindings() throws Ex
         assertThat(fieldJavadoc, not(javadocContains("Some documentation of element")));
 
         Javadoc getterJavadoc = getJavadocOfMethod(compilationUnit, "getDocumentedElement");
-        assertThat(getterJavadoc, not(javadocContains("Some documentation of element")));
         assertThat(getterJavadoc, javadocContains("Documentation from JAXB binding customization"));
+        assertThat(getterJavadoc, not(javadocContains("Some documentation of element")));
     }
 
     @Test

diff --git a/javadoc/src/test/java/org/apache/cxf/xjc/javadoc/JavadocTestHelper.java b/javadoc/src/test/java/org/apache/cxf/xjc/javadoc/JavadocTestHelper.java
@@ -41,11 +41,13 @@ public static Matcher<Javadoc> javadocContains(final String comment) {
 
             @Override
             protected boolean matchesSafely(Javadoc javadoc) {
-                TagElement tagElement = (TagElement)javadoc.tags().get(0);
-                List<?> fragments = tagElement.fragments();
-                for (Object fragment : fragments) {
-                    if (fragment != null && fragment.toString().contains(comment)) {
-                        return true;
+                if (!javadoc.tags().isEmpty()) {
+                    TagElement tagElement = (TagElement)javadoc.tags().get(0);
+                    List<?> fragments = tagElement.fragments();
+                    for (Object fragment : fragments) {
+                        if (fragment != null && fragment.toString().contains(comment)) {
+                            return true;
+                        }
                     }
                 }
                 return false;

diff --git a/javadoc/src/test/resources/anonymousEnum-javadoc-bindings.xjb b/javadoc/src/test/resources/anonymousEnum-javadoc-bindings.xjb
@@ -19,7 +19,7 @@
  <jaxb:bindings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
 	xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
-	xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_2_0.xsd"
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd"
 	jaxb:version="3.0" schemaLocation="anonymousEnum.xsd"
 	node="/xs:schema">
 

diff --git a/javadoc/src/test/resources/complexTypeWithDocumentedProperties-javadoc-bindings.xjb b/javadoc/src/test/resources/complexTypeWithDocumentedProperties-javadoc-bindings.xjb
@@ -19,7 +19,7 @@
  <jaxb:bindings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
 	xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
-	xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_2_0.xsd"
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd"
 	jaxb:version="3.0" schemaLocation="complexTypeWithDocumentedProperties.xsd"
 	node="//xs:complexType[@name='ComplexTypeWithDocumentedProperties']/xs:sequence/xs:element[@name='documentedElement']">
 

diff --git a/javadoc/src/test/resources/enumDocumented-javadoc-bindings.xjb b/javadoc/src/test/resources/enumDocumented-javadoc-bindings.xjb
@@ -19,7 +19,7 @@
  <jaxb:bindings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
 	xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
-	xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_2_0.xsd"
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd"
 	jaxb:version="3.0" schemaLocation="enumDocumented.xsd"
 	node="//xs:simpleType[@name='enumDocumented']">
 

diff --git a/pom.xml b/pom.xml
@@ -45,9 +45,9 @@
 
     <properties>
         <cxf-buildtools-version>4.0.1</cxf-buildtools-version>
-        <jdk.version>11</jdk.version>
+        <jdk.version>17</jdk.version>
         <jaxb-version>4.0.2</jaxb-version>
-        <jaxb-runtime-version>3.0.2</jaxb-runtime-version>
+        <jaxb-runtime-version>4.0.3</jaxb-runtime-version>
 
         <eclipse.outputDirectory>${basedir}/target/classes</eclipse.outputDirectory>
         <downloadSources>true</downloadSources>

diff --git a/runtime/pom.xml b/runtime/pom.xml
@@ -36,6 +36,13 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>--add-opens java.base/java.util=ALL-UNNAMED</argLine>
+                </configuration>
+            </plugin>
         </plugins>
     </build>