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 2018/12/26 09:48:19 UTC
[maven-javadoc-plugin] branch MJAVADOC-554 created (now 89b1222)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MJAVADOC-554
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.
at 89b1222 Updated fix and removed integration test in response to PR comments.
This branch includes the following new commits:
new 962e28b Added integration test for MJAVADOC-554 but haven't figured out how to make it fail.
new e62fbaf Fixed typo.
new 89b1222 Updated fix and removed integration test in response to PR comments.
The 3 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.
[maven-javadoc-plugin] 01/03: Added integration test for
MJAVADOC-554 but haven't figured out how to make it fail.
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-554
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 962e28bfd5459e0c300b83d5b10b7f6484e6fc77
Author: Gili Tzabari <a-...@expedia.com>
AuthorDate: Mon Dec 24 12:38:07 2018 -0500
Added integration test for MJAVADOC-554 but haven't figured out how to make it fail.
---
src/it/projects/MJAVADOC-554/invoker.properties | 19 ++++++++++
src/it/projects/MJAVADOC-554/pom.xml | 44 ++++++++++++++++++++++
.../MJAVADOC-554/src/main/module-info.java | 23 +++++++++++
.../MJAVADOC-554/src/main/module1/Main.java | 24 ++++++++++++
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 6 ++-
5 files changed, 115 insertions(+), 1 deletion(-)
diff --git a/src/it/projects/MJAVADOC-554/invoker.properties b/src/it/projects/MJAVADOC-554/invoker.properties
new file mode 100644
index 0000000..040c67f
--- /dev/null
+++ b/src/it/projects/MJAVADOC-554/invoker.properties
@@ -0,0 +1,19 @@
+# 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.1=clean install javadoc::aggregate
+invoker.goals.2=javadoc::aggregate
diff --git a/src/it/projects/MJAVADOC-554/pom.xml b/src/it/projects/MJAVADOC-554/pom.xml
new file mode 100644
index 0000000..6eacbca
--- /dev/null
+++ b/src/it/projects/MJAVADOC-554/pom.xml
@@ -0,0 +1,44 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>MJAVADOC-551</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <url>https://issues.apache.org/jira/browse/MJAVADOC-551</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/src/it/projects/MJAVADOC-554/src/main/module-info.java b/src/it/projects/MJAVADOC-554/src/main/module-info.java
new file mode 100644
index 0000000..0dd7ad2
--- /dev/null
+++ b/src/it/projects/MJAVADOC-554/src/main/module-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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 module1
+{
+ exports module1;
+}
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-554/src/main/module1/Main.java b/src/it/projects/MJAVADOC-554/src/main/module1/Main.java
new file mode 100644
index 0000000..e60dbdb
--- /dev/null
+++ b/src/it/projects/MJAVADOC-554/src/main/module1/Main.java
@@ -0,0 +1,24 @@
+package module1;
+
+/*
+ * 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 final class Main
+{
+}
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index d1560cf..3312939 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -4754,7 +4754,11 @@ public abstract class AbstractJavadocMojo
addArgIfNotEmpty( arguments, "--patch-module", moduleName + '='
+ JavadocUtil.quotedPathArgument( getSourcePath( projectSourcepaths.getValue() ) ) );
- Files.createDirectories( moduleSourceDir.resolve( moduleName ) );
+ Path modulePath = moduleSourceDir.resolve( moduleName );
+// if ( !Files.isDirectory( modulePath ) )
+// {
+ Files.createDirectory( modulePath );
+// }
}
catch ( IOException e )
{
[maven-javadoc-plugin] 03/03: Updated fix and removed integration
test in response to PR comments.
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-554
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 89b12221902df3e44d636b7c8c20211d779fc76c
Author: Gili Tzabari <a-...@expedia.com>
AuthorDate: Mon Dec 24 19:06:05 2018 -0500
Updated fix and removed integration test in response to PR comments.
---
src/it/projects/MJAVADOC-554/invoker.properties | 19 ----------
src/it/projects/MJAVADOC-554/pom.xml | 44 ----------------------
.../MJAVADOC-554/src/main/module-info.java | 23 -----------
.../MJAVADOC-554/src/main/module1/Main.java | 24 ------------
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 8 ++--
5 files changed, 4 insertions(+), 114 deletions(-)
diff --git a/src/it/projects/MJAVADOC-554/invoker.properties b/src/it/projects/MJAVADOC-554/invoker.properties
deleted file mode 100644
index 76def79..0000000
--- a/src/it/projects/MJAVADOC-554/invoker.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.1=clean install javadoc:aggregate
-invoker.goals.2=javadoc:aggregate
diff --git a/src/it/projects/MJAVADOC-554/pom.xml b/src/it/projects/MJAVADOC-554/pom.xml
deleted file mode 100644
index 6eacbca..0000000
--- a/src/it/projects/MJAVADOC-554/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
- <artifactId>MJAVADOC-551</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <url>https://issues.apache.org/jira/browse/MJAVADOC-551</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>@project.version@</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
diff --git a/src/it/projects/MJAVADOC-554/src/main/module-info.java b/src/it/projects/MJAVADOC-554/src/main/module-info.java
deleted file mode 100644
index 0dd7ad2..0000000
--- a/src/it/projects/MJAVADOC-554/src/main/module-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 module1
-{
- exports module1;
-}
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-554/src/main/module1/Main.java b/src/it/projects/MJAVADOC-554/src/main/module1/Main.java
deleted file mode 100644
index e60dbdb..0000000
--- a/src/it/projects/MJAVADOC-554/src/main/module1/Main.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package module1;
-
-/*
- * 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 final class Main
-{
-}
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 3312939..1e79932 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -4755,10 +4755,10 @@ public abstract class AbstractJavadocMojo
+ JavadocUtil.quotedPathArgument( getSourcePath( projectSourcepaths.getValue() ) ) );
Path modulePath = moduleSourceDir.resolve( moduleName );
-// if ( !Files.isDirectory( modulePath ) )
-// {
- Files.createDirectory( modulePath );
-// }
+ if ( !Files.isDirectory( modulePath ) )
+ {
+ Files.createDirectory( modulePath );
+ }
}
catch ( IOException e )
{
[maven-javadoc-plugin] 02/03: Fixed typo.
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-554
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit e62fbaf7084e15157efc6b40ec7884c0394b417d
Author: Gili Tzabari <a-...@expedia.com>
AuthorDate: Mon Dec 24 12:44:20 2018 -0500
Fixed typo.
---
src/it/projects/MJAVADOC-554/invoker.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/it/projects/MJAVADOC-554/invoker.properties b/src/it/projects/MJAVADOC-554/invoker.properties
index 040c67f..76def79 100644
--- a/src/it/projects/MJAVADOC-554/invoker.properties
+++ b/src/it/projects/MJAVADOC-554/invoker.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals.1=clean install javadoc::aggregate
-invoker.goals.2=javadoc::aggregate
+invoker.goals.1=clean install javadoc:aggregate
+invoker.goals.2=javadoc:aggregate