Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2015-07-15 18:10:04 -0400
committerJan Bartel2015-07-15 18:10:04 -0400
commit89cc024826a45af833047298b8edf571c51f3117 (patch)
tree9df12cb947716de4960f339fec52ddd1a44f6f12
parenta4c2b147405eda676bd2983a9f433c4f32e60ab2 (diff)
downloadorg.eclipse.jetty.toolchain-89cc024826a45af833047298b8edf571c51f3117.tar.gz
org.eclipse.jetty.toolchain-89cc024826a45af833047298b8edf571c51f3117.tar.xz
org.eclipse.jetty.toolchain-89cc024826a45af833047298b8edf571c51f3117.zip
Fix javadoc gen for jdk 8
-rw-r--r--eclipse-signing-maven-plugin/pom.xml109
-rw-r--r--eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/AbstractEclipseSigningMojo.java35
-rw-r--r--eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/ChecksumMojo.java8
-rw-r--r--eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/SignMojo.java8
4 files changed, 139 insertions, 21 deletions
diff --git a/eclipse-signing-maven-plugin/pom.xml b/eclipse-signing-maven-plugin/pom.xml
index 1f6a48a..0f10abd 100644
--- a/eclipse-signing-maven-plugin/pom.xml
+++ b/eclipse-signing-maven-plugin/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>jetty-toolchain</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
- <version>1.4</version>
+ <version>1.5</version>
<relativePath>../jetty-toolchain/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>eclipse-signing-maven-plugin</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1</version>
<name>Jetty :: Toolchain :: Eclipse Signing Maven Plugin</name>
<description>Plugin for signing code on the eclipse build servers.</description>
<packaging>maven-plugin</packaging>
@@ -17,6 +17,7 @@
<connection>scm:git:http://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.toolchain.git</connection>
<developerConnection>scm:git:ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.toolchain.git</developerConnection>
<url>http://git.eclipse.org/c/jetty/org.eclipse.jetty.toolchain.git/tree/eclipse-signing-maven-plugin</url>
+ <tag>eclipse-signing-maven-plugin-1.0.1</tag>
</scm>
<dependencies>
<dependency>
@@ -63,6 +64,79 @@
</dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <docfilessubdirs>true</docfilessubdirs>
+ <detectLinks>false</detectLinks>
+ <detectJavaApiLink>true</detectJavaApiLink>
+ <links>
+ <link>http://docs.oracle.com/javase/8/docs/api/</link>
+ <link>http://docs.oracle.com/javaee/7/api/</link>
+ <link>http://junit.org/javadoc/latest/</link>
+ <link>http://download.eclipse.org/jetty/stable-9/apidocs/</link>
+ </links>
+ <tags>
+ <tag>
+ <name>phase</name>
+ <placement>t</placement>
+ <head>Phase:</head>
+ </tag>
+ <tag>
+ <name>component</name>
+ <placement>t</placement>
+ <head>Component:</head>
+ </tag>
+ <tag>
+ <name>goal</name>
+ <placement>t</placement>
+ <head>Goal:</head>
+ </tag>
+ <tag>
+ <name>description</name>
+ <placement>a</placement>
+ <head>Description:</head>
+ </tag>
+ <tag>
+ <name>parameter</name>
+ <placement>f</placement>
+ <head>Parameter:</head>
+ </tag>
+ <tag>
+ <name>required</name>
+ <placement>f</placement>
+ <head>Required:</head>
+ </tag>
+ <tag>
+ <name>readonly</name>
+ <placement>f</placement>
+ <head>Read-Only:</head>
+ </tag>
+ <tag>
+ <name>execute</name>
+ <placement>X</placement>
+ <head />
+ </tag>
+ <tag>
+ <name>requiresDependencyResolution</name>
+ <placement>X</placement>
+ <head />
+ </tag>
+ <tag>
+ <name>requiresProject</name>
+ <placement>X</placement>
+ <head />
+ </tag>
+ <tag>
+ <name>threadSafe</name>
+ <placement>X</placement>
+ <head />
+ </tag>
+ </tags>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
@@ -80,7 +154,7 @@
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
<executions>
<execution>
<id>exec-plugin-doc</id>
@@ -93,13 +167,24 @@
</plugin>
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- </plugins>
- </reporting>
+ <profiles>
+ <profile>
+ <id>jdk8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/AbstractEclipseSigningMojo.java b/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/AbstractEclipseSigningMojo.java
index 0c0082f..f3852a7 100644
--- a/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/AbstractEclipseSigningMojo.java
+++ b/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/AbstractEclipseSigningMojo.java
@@ -1,7 +1,7 @@
package org.eclipse.dash.m4e.eclipse.signing;
//========================================================================
-//Copyright (c) 2010 Intalio, Inc.
+//Copyright (c) 2010-2015 Intalio, Inc.
//------------------------------------------------------------------------
//All rights reserved. This program and the accompanying materials
//are made available under the terms of the Eclipse Public License v1.0
@@ -24,6 +24,13 @@ import org.apache.maven.wagon.CommandExecutor;
import org.apache.maven.wagon.Wagon;
import org.codehaus.mojo.wagon.shared.WagonUtils;
+
+
+/**
+ * AbstractEclipseSigningMojo
+ *
+ *
+ */
public abstract class AbstractEclipseSigningMojo extends AbstractMojo
{
/**
@@ -79,7 +86,7 @@ public abstract class AbstractEclipseSigningMojo extends AbstractMojo
/**
*
- * @return
+ * @return whether or not we are running on an eclipse build machine
* @throws Exception
*/
protected boolean runningOnBuildMachine() throws Exception
@@ -94,11 +101,21 @@ public abstract class AbstractEclipseSigningMojo extends AbstractMojo
}
}
+ /**
+ * @param location of wagon target
+ * @return adjusted wagon path
+ */
protected String adjustToWagonPath(String location)
{
return wagonPath + File.separator + location;
}
+
+
+ /**
+ * @return synthesize the url for wagon
+ * @throws Exception
+ */
protected String getWagonUrl() throws Exception
{
if (wagonProtocol == null || wagonHost == null || wagonPath == null)
@@ -114,6 +131,14 @@ public abstract class AbstractEclipseSigningMojo extends AbstractMojo
return wagonProtocol + wagonHost + wagonPath;
}
+
+
+ /**
+ * @param id
+ * @param url
+ * @return wagon instance
+ * @throws MojoExecutionException
+ */
protected Wagon createWagon(String id, String url) throws MojoExecutionException
{
try
@@ -127,6 +152,12 @@ public abstract class AbstractEclipseSigningMojo extends AbstractMojo
}
+
+ /**
+ * @param wagon the wagon instance
+ * @return a commandexecutor
+ * @throws Exception
+ */
protected CommandExecutor getCommandExecutor(Wagon wagon) throws Exception
{
if (!(wagon instanceof CommandExecutor))
diff --git a/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/ChecksumMojo.java b/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/ChecksumMojo.java
index 26ab4b8..05ad9ce 100644
--- a/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/ChecksumMojo.java
+++ b/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/ChecksumMojo.java
@@ -1,7 +1,7 @@
package org.eclipse.dash.m4e.eclipse.signing;
//========================================================================
-//Copyright (c) 2010 Intalio, Inc.
+//Copyright (c) 2010-2015 Intalio, Inc.
//------------------------------------------------------------------------
//All rights reserved. This program and the accompanying materials
//are made available under the terms of the Eclipse Public License v1.0
@@ -43,13 +43,13 @@ import org.w3c.dom.NodeList;
/**
* This plugin walks through a p2 repository and repairs the artifacts.xml.
- * <br/>
+ * <p>
* It also insert the property <code>&lt;property name='publishPackFilesAsSiblings' value='true'/&gt;</code>
* and the mapping rules if they were not present already:
- * <br/>
+ * </p>
* <code>&lt;rule filter='(&amp; (classifier=osgi.bundle) (format=packed))'
* output='${repoUrl}/plugins/${id}_${version}.jar.pack.gz'/&gt;</code>
- * <br/><code>&lt;rule filter='(&amp; (classifier=org.eclipse.update.feature) (format=packed))'
+ * <code>&lt;rule filter='(&amp; (classifier=org.eclipse.update.feature) (format=packed))'
* output='${repoUrl}/features/${id}_${version}.jar.pack.gz'/&gt;</code>
* @goal fixCheckSums
* @phase package
diff --git a/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/SignMojo.java b/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/SignMojo.java
index 12f0f9b..feabaeb 100644
--- a/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/SignMojo.java
+++ b/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/SignMojo.java
@@ -1,7 +1,7 @@
package org.eclipse.dash.m4e.eclipse.signing;
//========================================================================
-//Copyright (c) 2010 Intalio, Inc.
+//Copyright (c) 2010-2015 Intalio, Inc.
//------------------------------------------------------------------------
//All rights reserved. This program and the accompanying materials
//are made available under the terms of the Eclipse Public License v1.0
@@ -69,7 +69,7 @@ public class SignMojo extends AbstractEclipseSigningMojo
/**
* directory to send artifact to be signed
*
- * should be akin to: /home/data/httpd/download-staging.priv/rt/<project>
+ * should be akin to: /home/data/httpd/download-staging.priv/rt/&lt;project&gt;
*
* @parameter
* @required
@@ -99,7 +99,9 @@ public class SignMojo extends AbstractEclipseSigningMojo
*/
protected int maxZipChecks;
- /** @component */
+ /**
+ * @component
+ */
protected PlexusContainer plexus;
public void execute() throws MojoExecutionException, MojoFailureException

Back to the top