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/05/21 12:34:29 UTC
[maven-javadoc-plugin] branch MJAVADOC-520 updated (5d3bdb9 ->
e097445)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MJAVADOC-520
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.
from 5d3bdb9 [MJAVADOC-520] Upgrade dependencies plexus-java
new dab0d9f [MJAVADOC-519] - IT detectLinks fails on Windows
new 7ca3238 [MJAVADOC-512] - Even when <javadocVersion>1.8.0</javadocVersion> matches there still is a warning.
new ffb0e50 [MJAVADOC-512] - Even when <javadocVersion>1.8.0</javadocVersion> matches there still is a warning.
new 045e325 [MNGSITE-332] - Changed download templates of plugins not to reference .md5 anymore
new 987b496 Skip Java 10 due to com.sun.tools.doclets removal in Java 10 which causes failing tests, must be fixed later
new e097445 [MJAVADOC-520] Update dependencies revert plexus-utils upgrade because it generates an invalid javadoc.bat, exposed by the failing testProxy()
The 6 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:
Jenkinsfile | 2 +-
pom.xml | 2 +-
src/it/projects/detectLinks/pom.xml | 5 +++--
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 2 +-
.../apache/maven/plugins/javadoc/JavadocUtil.java | 26 +++++++---------------
src/site/xdoc/download.xml.vm | 2 +-
6 files changed, 15 insertions(+), 24 deletions(-)
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.
[maven-javadoc-plugin] 02/06: [MJAVADOC-512] - Even when
1.8.0 matches there still is a warning.
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-520
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 7ca32388988352dc6c656de8af8787ececbe2ec1
Author: Jene Jasper <je...@shadowland.demon.nl>
AuthorDate: Sat Mar 24 18:41:30 2018 +0100
[MJAVADOC-512] - Even when <javadocVersion>1.8.0</javadocVersion> matches there still is a warning.
Signed-off-by: Karl Heinz Marbaise <kh...@apache.org>
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.
[maven-javadoc-plugin] 04/06: [MNGSITE-332] - Changed download
templates of plugins not to reference .md5 anymore
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-520
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 045e325b0cc462bc05228f3536fa2b488cd86fe0
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Tue Apr 10 18:06:02 2018 +0200
[MNGSITE-332] - Changed download templates of plugins not to reference .md5 anymore
---
src/site/xdoc/download.xml.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index 09d4f42..cf13dc9 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -108,7 +108,7 @@ under the License.
<tr>
<td>${project.name} ${project.version} (Source zip)</td>
<td><a href="[preferred]maven/plugins/${project.artifactId}-${project.version}-source-release.zip">maven/plugins/${project.artifactId}-${project.version}-source-release.zip</a></td>
- <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5</a></td>
+ <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.sha1">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.sha1</a></td>
<td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
</tr>
</tbody>
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.
[maven-javadoc-plugin] 03/06: [MJAVADOC-512] - Even when
1.8.0 matches there still is a warning.
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-520
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit ffb0e5012397aa70e3237d64b0669906c283426a
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Mar 24 20:38:12 2018 +0100
[MJAVADOC-512] - Even when <javadocVersion>1.8.0</javadocVersion> matches there still is a warning.
o Followup seemed to be that I have missed something during the merge.
Signed-off-by: Karl Heinz Marbaise <kh...@apache.org>
---
src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 24ea1b9..487bb0f 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -3782,7 +3782,7 @@ public abstract class AbstractJavadocMojo
throw new MavenReportException( "Unable to parse javadoc version: " + e.getMessage(), e );
}
- if ( javadocRuntimeVersion != jVersion && getLog().isWarnEnabled() )
+ if ( javadocRuntimeVersion.compareTo( jVersion ) != 0 && getLog().isWarnEnabled() )
{
getLog().warn( "Are you sure about the <javadocVersion/> parameter? It seems to be " + jVersion );
}
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.
[maven-javadoc-plugin] 01/06: [MJAVADOC-519] - IT detectLinks fails
on Windows
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-520
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit dab0d9f2f90b196272a962ed02cafd7fe9c47629
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Mar 24 13:56:26 2018 +0100
[MJAVADOC-519] - IT detectLinks fails on Windows
---
src/it/projects/detectLinks/pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/it/projects/detectLinks/pom.xml b/src/it/projects/detectLinks/pom.xml
index 2211198..ed387e8 100644
--- a/src/it/projects/detectLinks/pom.xml
+++ b/src/it/projects/detectLinks/pom.xml
@@ -53,8 +53,9 @@
<!-- unknown apidocs link -->
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-script-marmalade</artifactId>
- <version>2.0-beta-2</version>
+ <artifactId>maven-script</artifactId>
+ <version>2.2.1</version>
+ <type>pom</type>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.
[maven-javadoc-plugin] 06/06: [MJAVADOC-520] Update dependencies
revert plexus-utils upgrade because it generates an invalid javadoc.bat,
exposed by the failing testProxy()
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-520
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit e097445a2bb92007dd8cf3b1e72fb2831909cd5b
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon May 21 14:34:22 2018 +0200
[MJAVADOC-520] Update dependencies
revert plexus-utils upgrade because it generates an invalid javadoc.bat, exposed by the failing testProxy()
---
pom.xml | 2 +-
.../apache/maven/plugins/javadoc/JavadocUtil.java | 26 +++++++---------------
2 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8fa3696..9188aee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,7 +244,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.1.0</version>
+ <version>3.0.24</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
index e49a792..82cc0ed 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -1178,24 +1178,14 @@ public class JavadocUtil
InvocationOutputHandler outputHandler = new PrintStreamHandler( ps, false );
request.setOutputHandler( outputHandler );
- try
- {
- outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with "
- + ( properties == null ? "no properties" : "properties=" + properties ) );
- outputHandler.consumeLine( "" );
- outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) );
- outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) );
- outputHandler.consumeLine( "JAVA_HOME=" + getJavaHome( log ) );
- outputHandler.consumeLine( "JAVA_OPTS=" + getJavaOpts( log ) );
- outputHandler.consumeLine( "" );
- }
- catch ( IOException e )
- {
- if ( log != null && log.isDebugEnabled() )
- {
- log.debug( "Failure during outputHandler consumeLine." );
- }
- }
+ outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with "
+ + ( properties == null ? "no properties" : "properties=" + properties ) );
+ outputHandler.consumeLine( "" );
+ outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) );
+ outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) );
+ outputHandler.consumeLine( "JAVA_HOME=" + getJavaHome( log ) );
+ outputHandler.consumeLine( "JAVA_OPTS=" + getJavaOpts( log ) );
+ outputHandler.consumeLine( "" );
try
{
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.
[maven-javadoc-plugin] 05/06: Skip Java 10 due to
com.sun.tools.doclets removal in Java 10 which causes failing tests,
must be fixed later
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-520
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 987b4969df707853798e98f224ddc79dc7ff1178
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon May 21 13:46:45 2018 +0200
Skip Java 10 due to com.sun.tools.doclets removal in Java 10 which causes failing tests, must be fixed later
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 09ac70f..a8bd6ff 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpStdBuild()
+asfMavenTlpStdBuild(jdk:[7,8,9])
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.