You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/02/26 15:41:30 UTC
[maven-javadoc-plugin] branch master updated (0329124b -> 9040d0da)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
from 0329124b [maven-release-plugin] prepare for next development iteration
new ca297515 (doc) Remove deprecated maven-changes-plugin (MPOM-348)
new 509a391d Bump apache/maven-gh-actions-shared from 2 to 3
new adc0f07a tests: Bump spring-security-core to 5.5.8 to fix vulnerabilities
new 9040d0da ci fix: adopt-openj9 does not support the footer param
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/maven.yml | 2 +-
.github/workflows/release-drafter.yml | 2 +-
pom.xml | 20 --------------------
.../javadoc-child/pom.xml | 4 ++--
.../java/com/leokom/javadoc/JavadocMavenBugDemo.java | 2 +-
.../maven/plugins/javadoc/JavadocReportTest.java | 18 +++++++++++++-----
6 files changed, 18 insertions(+), 30 deletions(-)
[maven-javadoc-plugin] 03/04: tests: Bump spring-security-core to 5.5.8 to fix vulnerabilities
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit adc0f07ad1b5eb004ff8a3a7cd6b8f3c0a08b63c
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Feb 26 15:45:04 2023 +0100
tests: Bump spring-security-core to 5.5.8 to fix vulnerabilities
Closes: #146
---
src/it/projects/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 @@
<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/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 @@ package com.leokom.javadoc;
* under the License.
*/
-import org.springframework.security.BadCredentialsException;
+import org.springframework.security.authentication.BadCredentialsException;
public class JavadocMavenBugDemo {
/**
[maven-javadoc-plugin] 04/04: ci fix: adopt-openj9 does not support the footer param
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 9040d0da32d4582f64bb57f7978ada507be61a2b
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Feb 26 13:40:26 2023 +0100
ci fix: adopt-openj9 does not support the footer param
Closes: #188
---
.../maven/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 class JavadocReportTest extends AbstractMojoTestCase {
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 class JavadocReportTest extends AbstractMojoTestCase {
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.");
+ }
}
/**
[maven-javadoc-plugin] 02/04: Bump apache/maven-gh-actions-shared from 2 to 3
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 509a391d93b7774987746cafe7ca3356d097c14b
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Feb 20 03:58:31 2023 +0000
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
[maven-javadoc-plugin] 01/04: (doc) Remove deprecated maven-changes-plugin (MPOM-348)
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit ca2975150256bcfe4466f94297fe30dc76b2c757
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Feb 26 14:21:44 2023 +0100
(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.
</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>