Merge remote-tracking branch 'origin/master' into MJAVADOC-743

apache · Feb 27, 2023 · a87c5d7 · a87c5d7
2 parents 23cec45 + 9040d0d
commit a87c5d7
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 30 deletions.
diff --git 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
@@ -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
diff --git a/pom.xml b/pom.xml
@@ -551,26 +551,6 @@ under the License.
               </locales>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-changes-plugin</artifactId>
-            <configuration>
-              <!-- For JIRA-report -->
-              <columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix Version</columnNames>
-              <onlyCurrentVersion>true</onlyCurrentVersion>
-              <resolutionIds>Fixed</resolutionIds>
-              <sortColumnNames>Type,Key</sortColumnNames>
-              <maxEntries>1000</maxEntries>
-              <!-- MCHANGES-124 -->
-            </configuration>
-            <reportSets>
-              <reportSet>
-                <reports>
-                  <report>jira-report</report>
-                </reports>
-              </reportSet>
-            </reportSets>
-          </plugin>
         </plugins>
       </reporting>
     </profile>

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
@@ -35,7 +35,7 @@
 	<dependency>
 	    <groupId>org.springframework.security</groupId>
 	    <artifactId>spring-security-acl</artifactId>
-	    <version>2.0.4</version>
+	    <version>5.5.8</version>
 	    <scope>runtime</scope>
 	</dependency>
   </dependencies>
@@ -45,7 +45,7 @@
   		<dependency>
   			<groupId>org.springframework.security</groupId>
   			<artifactId>spring-security-core</artifactId>
-  			<version>2.0.4</version>
+  			<version>5.5.8</version>
   			<!-- Overriding the runtime scope -->
   			<scope>compile</scope>
   		</dependency>

diff --git a/..._aggr-managedDeps/javadoc-child/src/main/java/com/leokom/javadoc/JavadocMavenBugDemo.java b/..._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 {
 	/**

diff --git 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 &#169; All rights reserved.")
-                .contains("Header - Copyright &#169; All rights reserved.")
-                .contains("Footer - Copyright &#169; All rights reserved.");
+                .contains("Header - Copyright &#169; 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 &#169; All rights reserved.");
+        }
 
         Path packageSummary = apidocs.resolve("jdk6/test/package-summary.html");
         assertThat(packageSummary).exists();
         content = readFile(packageSummary);
         assertThat(content)
                 .contains("Top - Copyright &#169; All rights reserved.")
-                .contains("Header - Copyright &#169; All rights reserved.")
-                .contains("Footer - Copyright &#169; All rights reserved.");
+                .contains("Header - Copyright &#169; 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 &#169; All rights reserved.");
+        }
     }
 
     /**