You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2024/05/19 14:16:53 UTC
(cxf-xjc-utils) branch main updated: Bump jaxb-runtime-version from 3.0.2 to 4.0.3 (#119)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git
The following commit(s) were added to refs/heads/main by this push:
new 6c43dd6 Bump jaxb-runtime-version from 3.0.2 to 4.0.3 (#119)
6c43dd6 is described below
commit 6c43dd607ebaee75bbad528ee6e3528f50712a31
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Sun May 19 10:16:48 2024 -0400
Bump jaxb-runtime-version from 3.0.2 to 4.0.3 (#119)
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
---
.github/workflows/codeql.yml | 6 ++++++
.github/workflows/pull-request-build.yml | 4 ++--
javadoc/pom.xml | 10 +++++-----
.../java/org/apache/cxf/xjc/javadoc/JavadocPluginTest.java | 2 +-
.../java/org/apache/cxf/xjc/javadoc/JavadocTestHelper.java | 12 +++++++-----
.../src/test/resources/anonymousEnum-javadoc-bindings.xjb | 2 +-
.../complexTypeWithDocumentedProperties-javadoc-bindings.xjb | 2 +-
.../src/test/resources/enumDocumented-javadoc-bindings.xjb | 2 +-
pom.xml | 4 ++--
runtime/pom.xml | 7 +++++++
10 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index e9005ad..a49eb9c 100644
--- 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
index e020343..9d73cdf 100644
--- 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
index 425bddf..f4b965d 100644
--- 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
index 6fa2ebf..b430019 100644
--- 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 class JavadocPluginTest extends Assert {
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
index 949e31d..d194ba6 100644
--- 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 final class JavadocTestHelper {
@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
index 64908dc..5af8d8d 100644
--- 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
index 7fec413..12f0a78 100644
--- 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
index 1dc563c..e039ce5 100644
--- 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
index 9796c9d..444dbe8 100644
--- 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
index 0084a1a..02750bd 100644
--- 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>