From 52bb80b540869b49a815eac7188e194f29cd2c19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 May 2024 22:10:21 +0000 Subject: [PATCH] Bump jaxb-runtime-version from 3.0.2 to 4.0.3 --- .github/workflows/codeql.yml | 6 ++++++ .github/workflows/pull-request-build.yml | 4 ++-- javadoc/pom.xml | 10 +++++----- .../apache/cxf/xjc/javadoc/JavadocPluginTest.java | 2 +- .../apache/cxf/xjc/javadoc/JavadocTestHelper.java | 12 +++++++----- .../resources/anonymousEnum-javadoc-bindings.xjb | 2 +- ...TypeWithDocumentedProperties-javadoc-bindings.xjb | 2 +- .../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 e9005ada..a49eb9cd 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 e020343d..9d73cdf3 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 425bddf8..f4b965d9 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -46,15 +46,15 @@ test - org.eclipse.equinox - app - 1.3.200-v20130910-1609 + org.eclipse.platform + org.eclipse.equinox.app + 1.7.0 test org.eclipse.jdt - core - 3.3.0-v_771 + org.eclipse.jdt.core + 3.37.0 test 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 6fa2ebf3..b430019b 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 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 index 949e31d7..d194ba67 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 static Matcher 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 index 64908dcc..5af8d8de 100644 --- a/javadoc/src/test/resources/anonymousEnum-javadoc-bindings.xjb +++ b/javadoc/src/test/resources/anonymousEnum-javadoc-bindings.xjb @@ -19,7 +19,7 @@ diff --git a/javadoc/src/test/resources/complexTypeWithDocumentedProperties-javadoc-bindings.xjb b/javadoc/src/test/resources/complexTypeWithDocumentedProperties-javadoc-bindings.xjb index 7fec4134..12f0a783 100644 --- a/javadoc/src/test/resources/complexTypeWithDocumentedProperties-javadoc-bindings.xjb +++ b/javadoc/src/test/resources/complexTypeWithDocumentedProperties-javadoc-bindings.xjb @@ -19,7 +19,7 @@ diff --git a/javadoc/src/test/resources/enumDocumented-javadoc-bindings.xjb b/javadoc/src/test/resources/enumDocumented-javadoc-bindings.xjb index 1dc563c5..e039ce58 100644 --- a/javadoc/src/test/resources/enumDocumented-javadoc-bindings.xjb +++ b/javadoc/src/test/resources/enumDocumented-javadoc-bindings.xjb @@ -19,7 +19,7 @@ diff --git a/pom.xml b/pom.xml index 9796c9d5..444dbe83 100644 --- a/pom.xml +++ b/pom.xml @@ -45,9 +45,9 @@ 4.0.1 - 11 + 17 4.0.2 - 3.0.2 + 4.0.3 ${basedir}/target/classes true diff --git a/runtime/pom.xml b/runtime/pom.xml index 0084a1af..02750bdb 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -36,6 +36,13 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + --add-opens java.base/java.util=ALL-UNNAMED + +