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 2020/09/17 21:03:56 UTC

[maven-javadoc-plugin] 01/02: Fixes to pass tests with Java 15

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 11aae3db46a5538d2f5ee5a4ff7a6fb1e0db485f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Sep 17 22:19:37 2020 +0200

    Fixes to pass tests with Java 15
---
 .../MJAVADOC-538/src/main/java/foo/bar/MyClass.java     |  4 +++-
 src/it/projects/MJAVADOC-591_release8/pom.xml           | 17 +++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/it/projects/MJAVADOC-538/src/main/java/foo/bar/MyClass.java b/src/it/projects/MJAVADOC-538/src/main/java/foo/bar/MyClass.java
index e5960e3..60b458b 100644
--- a/src/it/projects/MJAVADOC-538/src/main/java/foo/bar/MyClass.java
+++ b/src/it/projects/MJAVADOC-538/src/main/java/foo/bar/MyClass.java
@@ -18,7 +18,9 @@ package foo.bar;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+/**
+ * App class
+ */
 public class MyClass
 {
 }
diff --git a/src/it/projects/MJAVADOC-591_release8/pom.xml b/src/it/projects/MJAVADOC-591_release8/pom.xml
index 6cfc008..56a0176 100644
--- a/src/it/projects/MJAVADOC-591_release8/pom.xml
+++ b/src/it/projects/MJAVADOC-591_release8/pom.xml
@@ -27,7 +27,7 @@
   <groupId>testcase</groupId>
   <artifactId>javadoc-fails-with-release-and-not-source</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <url>https://issues.apache.org/jira/browse/MJAVADOC-591</url>
 
@@ -53,14 +53,15 @@
     </pluginManagement>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>4.1.0</version>
-        <extensions>true</extensions>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.2.0</version>
         <configuration>
-          <instructions>
-            <Automatic-Module-Name>com.example.testcase</Automatic-Module-Name>
-          </instructions>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.example.testcase</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
         </configuration>
       </plugin>
       <plugin>