You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/05/01 12:50:57 UTC
[maven-javadoc-plugin] branch MJAVADOC-625 updated: Fix IT
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-625
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/MJAVADOC-625 by this push:
new 509ce13 Fix IT
509ce13 is described below
commit 509ce1343292926efa965849215cebb9c26e341c
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat May 1 14:50:34 2021 +0200
Fix IT
---
.../invoker.properties | 1 -
.../{MJAVADOC-625 => MJAVADOC-625_addstylesheet}/pom.xml | 6 +++---
.../src/main/java/com/example/MJavaDoc625.java | 0
.../src/main/javadoc/resources/addstylesheet.css | 0
.../src/main/javadoc/resources/addstylesheets1.css | 0
.../src/main/javadoc/resources/addstylesheets2.css | 0
.../verify.groovy | 14 +++++++++++---
7 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/it/projects/MJAVADOC-625/invoker.properties b/src/it/projects/MJAVADOC-625_addstylesheet/invoker.properties
similarity index 92%
rename from src/it/projects/MJAVADOC-625/invoker.properties
rename to src/it/projects/MJAVADOC-625_addstylesheet/invoker.properties
index 1258430..b60ab5b 100644
--- a/src/it/projects/MJAVADOC-625/invoker.properties
+++ b/src/it/projects/MJAVADOC-625_addstylesheet/invoker.properties
@@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.java.version = 10+
invoker.goals=compile javadoc:javadoc
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-625/pom.xml b/src/it/projects/MJAVADOC-625_addstylesheet/pom.xml
similarity index 87%
rename from src/it/projects/MJAVADOC-625/pom.xml
rename to src/it/projects/MJAVADOC-625_addstylesheet/pom.xml
index 4216ad1..1b96a29 100644
--- a/src/it/projects/MJAVADOC-625/pom.xml
+++ b/src/it/projects/MJAVADOC-625_addstylesheet/pom.xml
@@ -33,10 +33,10 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>@project.version@</version>
<configuration>
- <addStylesheet>src/main/javadoc/resources/addstylesheet.css</addStylesheet>
<addStylesheets>
- <addStylesheet>src/main/javadoc/resources/addstylesheets1.css</addStylesheet>
- <addStylesheet>src/main/javadoc/resources/addstylesheets2.css</addStylesheet>
+ <addStylesheet>resources/addstylesheet.css</addStylesheet>
+ <addStylesheet>resources/addstylesheets1.css</addStylesheet>
+ <addStylesheet>resources/addstylesheets2.css</addStylesheet>
</addStylesheets>
</configuration>
</plugin>
diff --git a/src/it/projects/MJAVADOC-625/src/main/java/com/example/MJavaDoc625.java b/src/it/projects/MJAVADOC-625_addstylesheet/src/main/java/com/example/MJavaDoc625.java
similarity index 100%
rename from src/it/projects/MJAVADOC-625/src/main/java/com/example/MJavaDoc625.java
rename to src/it/projects/MJAVADOC-625_addstylesheet/src/main/java/com/example/MJavaDoc625.java
diff --git a/src/it/projects/MJAVADOC-625/src/main/javadoc/resources/addstylesheet.css b/src/it/projects/MJAVADOC-625_addstylesheet/src/main/javadoc/resources/addstylesheet.css
similarity index 100%
rename from src/it/projects/MJAVADOC-625/src/main/javadoc/resources/addstylesheet.css
rename to src/it/projects/MJAVADOC-625_addstylesheet/src/main/javadoc/resources/addstylesheet.css
diff --git a/src/it/projects/MJAVADOC-625/src/main/javadoc/resources/addstylesheets1.css b/src/it/projects/MJAVADOC-625_addstylesheet/src/main/javadoc/resources/addstylesheets1.css
similarity index 100%
rename from src/it/projects/MJAVADOC-625/src/main/javadoc/resources/addstylesheets1.css
rename to src/it/projects/MJAVADOC-625_addstylesheet/src/main/javadoc/resources/addstylesheets1.css
diff --git a/src/it/projects/MJAVADOC-625/src/main/javadoc/resources/addstylesheets2.css b/src/it/projects/MJAVADOC-625_addstylesheet/src/main/javadoc/resources/addstylesheets2.css
similarity index 100%
rename from src/it/projects/MJAVADOC-625/src/main/javadoc/resources/addstylesheets2.css
rename to src/it/projects/MJAVADOC-625_addstylesheet/src/main/javadoc/resources/addstylesheets2.css
diff --git a/src/it/projects/MJAVADOC-625/verify.groovy b/src/it/projects/MJAVADOC-625_addstylesheet/verify.groovy
similarity index 69%
rename from src/it/projects/MJAVADOC-625/verify.groovy
rename to src/it/projects/MJAVADOC-625_addstylesheet/verify.groovy
index 8cd0936..8a20228 100644
--- a/src/it/projects/MJAVADOC-625/verify.groovy
+++ b/src/it/projects/MJAVADOC-625_addstylesheet/verify.groovy
@@ -21,6 +21,14 @@ def file = new File( basedir, 'target/site/apidocs/com/example/MJavaDoc625.html'
assert file.exists()
-assert 1 == file.text.count('addstylesheet.css')
-assert 1 == file.text.count('addstylesheets1.css')
-assert 1 == file.text.count('addstylesheets2.css')
+def javaVersion = System.getProperty( 'java.specification.version' )
+if( javaVersion ==~ /(1\..+|9\..+)/ )
+{
+ assert new File(basedir, 'build.log').text.contains('--add-stylesheet option is not supported on Java version < 10')
+}
+else
+{
+ assert 1 == file.text.count('addstylesheet.css')
+ assert 1 == file.text.count('addstylesheets1.css')
+ assert 1 == file.text.count('addstylesheets2.css')
+}