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 14:00:48 UTC
[maven-javadoc-plugin] branch openj9-footer updated (55f4f7fc -> 9d15b335)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch openj9-footer
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
discard 55f4f7fc (doc) ci fix: adopt-openj9 does not support the footer param
new 9d15b335 (doc) ci fix: adopt-openj9 does not support the footer param
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (55f4f7fc)
\
N -- N -- N refs/heads/openj9-footer (9d15b335)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[maven-javadoc-plugin] 01/01: (doc) 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 openj9-footer
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 9d15b33565b7cb6db4b72113b167332822d9e3c7
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Feb 26 13:40:26 2023 +0100
(doc) ci fix: adopt-openj9 does not support the footer param
---
.../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.");
+ }
}
/**