This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new d772fce MJAVADOC-610 Add IT test for multirelease jar
d772fce is described below
commit d772fce836c44fb64bd67b103cb839c2de213bb4
Author: Olivier Lamy <[email protected]>
AuthorDate: Thu Mar 12 07:09:23 2020 +1000
MJAVADOC-610 Add IT test for multirelease jar
* [MJAVADOC-610] Support multirelease jar
* add more tests
Signed-off-by: olivier lamy <[email protected]>
* disable MJAVADOC-610_mrjar it for java 11 as it fail for oracle jdk
because do not have fix which is in adoptopenjdk
Signed-off-by: olivier lamy <[email protected]>
Co-authored-by: rfscholte <[email protected]>
---
.../projects/MJAVADOC-610_mrjar/invoker.properties | 21 +++++
src/it/projects/MJAVADOC-610_mrjar/pom.xml | 93 ++++++++++++++++++++++
.../src/main/java/com/foo/MyClass.java | 30 +++++++
.../src/main/java9/com/foo/MyClass.java | 39 +++++++++
.../src/main/java9/com/foo/OtherClass.java | 25 ++++++
.../src/main/java9/module-info.java | 22 +++++
src/it/projects/MJAVADOC-610_mrjar/verify.groovy | 24 ++++++
7 files changed, 254 insertions(+)
diff --git a/src/it/projects/MJAVADOC-610_mrjar/invoker.properties
b/src/it/projects/MJAVADOC-610_mrjar/invoker.properties
new file mode 100644
index 0000000..354c260
--- /dev/null
+++ b/src/it/projects/MJAVADOC-610_mrjar/invoker.properties
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals = package
+# disable again for java 11 as again it's a bug fixed in openjdk but reported
in oracle jdk
+# and it seems to be the java vendor we use as a source of trust in ASF build
machines and the rest of the team...
+invoker.java.version = 1.9+,!11
diff --git a/src/it/projects/MJAVADOC-610_mrjar/pom.xml
b/src/it/projects/MJAVADOC-610_mrjar/pom.xml
new file mode 100644
index 0000000..70adfa3
--- /dev/null
+++ b/src/it/projects/MJAVADOC-610_mrjar/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.javadoc.it</groupId>
+ <artifactId>mjavadoc610</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <url>https://issues.apache.org/jira/browse/MJAVADOC-610</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <executions>
+ <execution>
+ <id>jdk9</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <release>9</release>
+ <multiReleaseOutput>true</multiReleaseOutput>
+ <compileSourceRoots>
+
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
+ </compileSourceRoots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Multi-Release>true</Multi-Release>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <sourcepath>src/main/java9;src/main/java</sourcepath>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git
a/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java
b/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java
new file mode 100644
index 0000000..a698ec9
--- /dev/null
+++ b/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java
@@ -0,0 +1,30 @@
+package com.foo;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class MyClass
+{
+ /**
+ * foo method
+ */
+ public void foo(){
+
+ }
+}
diff --git
a/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/MyClass.java
b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/MyClass.java
new file mode 100644
index 0000000..5859585
--- /dev/null
+++ b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/MyClass.java
@@ -0,0 +1,39 @@
+package com.foo;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class MyClass
+{
+
+ /**
+ * bar method
+ */
+ public void foo(){
+
+ }
+
+ /**
+ * bar method
+ */
+ public void bar(){
+
+ }
+
+}
diff --git
a/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/OtherClass.java
b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/OtherClass.java
new file mode 100644
index 0000000..2b07d89
--- /dev/null
+++ b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/OtherClass.java
@@ -0,0 +1,25 @@
+package com.foo;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class OtherClass
+{
+
+}
diff --git a/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/module-info.java
b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/module-info.java
new file mode 100644
index 0000000..78ba6a6
--- /dev/null
+++ b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/module-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module com.foo
+{
+ exports com.foo;
+}
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-610_mrjar/verify.groovy
b/src/it/projects/MJAVADOC-610_mrjar/verify.groovy
new file mode 100644
index 0000000..bbed8f9
--- /dev/null
+++ b/src/it/projects/MJAVADOC-610_mrjar/verify.groovy
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+def file = new File( basedir, 'target/mjavadoc610-1.0-SNAPSHOT-javadoc.jar' )
+assert file.exists()
+
+assert new File( basedir,
'target/apidocs/com.foo/com/foo/MyClass.html').exists()
+assert new File( basedir,
'target/apidocs/com.foo/com/foo/OtherClass.html').exists()
