From ca2975150256bcfe4466f94297fe30dc76b2c757 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 26 Feb 2023 14:21:44 +0100 Subject: [PATCH 1/4] (doc) Remove deprecated maven-changes-plugin (MPOM-348) --- pom.xml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pom.xml b/pom.xml index af7002db..f6ee4218 100644 --- a/pom.xml +++ b/pom.xml @@ -551,26 +551,6 @@ under the License. - - org.apache.maven.plugins - maven-changes-plugin - - - Type,Key,Summary,Assignee,Status,Resolution,Fix Version - true - Fixed - Type,Key - 1000 - - - - - - jira-report - - - - From 509a391d93b7774987746cafe7ca3356d097c14b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 03:58:31 +0000 Subject: [PATCH 2/4] Bump apache/maven-gh-actions-shared from 2 to 3 Closes: #184 --- .github/workflows/maven.yml | 2 +- .github/workflows/release-drafter.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e5c93cb7..b0b4e3b3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -24,7 +24,7 @@ on: jobs: build: name: Verify - uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2 + uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3 with: jdk-distribution-matrix: '[ "temurin", "zulu", "microsoft", "liberica", "adopt-openj9" ]' matrix-exclude: '[{ "jdk": "8", "distribution": "microsoft"}]' diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 58e5ee49..b44872cf 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -22,4 +22,4 @@ on: - master jobs: update_release_draft: - uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v2 + uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v3 From adc0f07ad1b5eb004ff8a3a7cd6b8f3c0a08b63c Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 26 Feb 2023 15:45:04 +0100 Subject: [PATCH 3/4] tests: Bump spring-security-core to 5.5.8 to fix vulnerabilities Closes: #146 --- .../MJAVADOC-526_aggr-managedDeps/javadoc-child/pom.xml | 4 ++-- .../src/main/java/com/leokom/javadoc/JavadocMavenBugDemo.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/it/projects/MJAVADOC-526_aggr-managedDeps/javadoc-child/pom.xml b/src/it/projects/MJAVADOC-526_aggr-managedDeps/javadoc-child/pom.xml index 70164156..8f9a3112 100644 --- a/src/it/projects/MJAVADOC-526_aggr-managedDeps/javadoc-child/pom.xml +++ b/src/it/projects/MJAVADOC-526_aggr-managedDeps/javadoc-child/pom.xml @@ -35,7 +35,7 @@ org.springframework.security spring-security-acl - 2.0.4 + 5.5.8 runtime @@ -45,7 +45,7 @@ org.springframework.security spring-security-core - 2.0.4 + 5.5.8 compile diff --git a/src/it/projects/MJAVADOC-526_aggr-managedDeps/javadoc-child/src/main/java/com/leokom/javadoc/JavadocMavenBugDemo.java b/src/it/projects/MJAVADOC-526_aggr-managedDeps/javadoc-child/src/main/java/com/leokom/javadoc/JavadocMavenBugDemo.java index cccdbd5a..9e1c7bde 100644 --- a/src/it/projects/MJAVADOC-526_aggr-managedDeps/javadoc-child/src/main/java/com/leokom/javadoc/JavadocMavenBugDemo.java +++ b/src/it/projects/MJAVADOC-526_aggr-managedDeps/javadoc-child/src/main/java/com/leokom/javadoc/JavadocMavenBugDemo.java @@ -19,7 +19,7 @@ * under the License. */ -import org.springframework.security.BadCredentialsException; +import org.springframework.security.authentication.BadCredentialsException; public class JavadocMavenBugDemo { /** From 9040d0da32d4582f64bb57f7978ada507be61a2b Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 26 Feb 2023 13:40:26 +0100 Subject: [PATCH 4/4] ci fix: adopt-openj9 does not support the footer param Closes: #188 --- .../plugins/javadoc/JavadocReportTest.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java index 502e6d66..ecce0934 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java @@ -429,7 +429,8 @@ public void testCustomConfiguration() throws Exception { assertTrue(str.toUpperCase().contains("MAVEN JAVADOC PLUGIN TEST")); // footer - if (JavaVersion.JAVA_VERSION.isBefore("16-ea")) { + if (JavaVersion.JAVA_VERSION.isBefore("16-ea") + && !System.getProperty("java.vm.name").contains("OpenJ9")) { assertTrue(str.toUpperCase().contains("MAVEN JAVADOC PLUGIN TEST FOOTER")); } @@ -871,16 +872,23 @@ public void testJdk6() throws Exception { String content = readFile(overview); assertThat(content) .contains("Top - Copyright © All rights reserved.") - .contains("Header - Copyright © All rights reserved.") - .contains("Footer - Copyright © All rights reserved."); + .contains("Header - Copyright © All rights reserved."); + // IBM dist of adopt-openj9 does not support the footer param + if (!System.getProperty("java.vm.name").contains("OpenJ9")) { + assertThat(content).contains("Footer - Copyright © All rights reserved."); + } Path packageSummary = apidocs.resolve("jdk6/test/package-summary.html"); assertThat(packageSummary).exists(); content = readFile(packageSummary); assertThat(content) .contains("Top - Copyright © All rights reserved.") - .contains("Header - Copyright © All rights reserved.") - .contains("Footer - Copyright © All rights reserved."); + .contains("Header - Copyright © All rights reserved."); + + // IBM dist of adopt-openj9 does not support the footer param + if (!System.getProperty("java.vm.name").contains("OpenJ9")) { + assertThat(content).contains("Footer - Copyright © All rights reserved."); + } } /**