You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2018/11/29 02:53:57 UTC
[maven-site-plugin] 02/02: we are not using svn anymore :)
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-site-plugin.git
commit 63ffec2d229574b2a408c353fa6f15c572f7b39b
Author: olivier lamy <ol...@apache.org>
AuthorDate: Thu Nov 29 12:53:43 2018 +1000
we are not using svn anymore :)
Signed-off-by: olivier lamy <ol...@apache.org>
---
pom.xml | 1 +
src/main/java/org/apache/maven/plugins/site/deploy/SiteDeployMojo.java | 2 +-
.../java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java | 2 +-
src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java | 2 +-
.../org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java | 2 +-
src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java | 2 +-
.../org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java | 2 +-
.../maven/plugins/site/descriptor/SiteDescriptorArtifactMetadata.java | 2 +-
.../apache/maven/plugins/site/descriptor/SiteDescriptorAttachMojo.java | 2 +-
.../org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java | 2 +-
src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java | 2 +-
src/main/java/org/apache/maven/plugins/site/render/SiteMap.java | 2 +-
src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java | 2 +-
src/main/java/org/apache/maven/plugins/site/run/DoxiaBean.java | 2 +-
src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java | 2 +-
.../apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java | 2 +-
.../org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java | 2 +-
.../org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java | 2 +-
.../java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java | 2 +-
.../java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java | 2 +-
20 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 502d7f1..2ef55b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,6 +195,7 @@ under the License.
</distributionManagement>
<properties>
+ <javaVersion>8</javaVersion>
<doxiaVersion>1.8</doxiaVersion>
<doxiaSitetoolsVersion>1.8.1</doxiaSitetoolsVersion>
<mavenVersion>3.0</mavenVersion>
diff --git a/src/main/java/org/apache/maven/plugins/site/deploy/SiteDeployMojo.java b/src/main/java/org/apache/maven/plugins/site/deploy/SiteDeployMojo.java
index 5ca80a4..93dca93 100644
--- a/src/main/java/org/apache/maven/plugins/site/deploy/SiteDeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/deploy/SiteDeployMojo.java
@@ -34,7 +34,7 @@ import org.apache.maven.plugins.annotations.Mojo;
* </p>
*
* @author <a href="mailto:michal@org.codehaus.org">Michal Maczka</a>
- * @version $Id$
+ *
* @since 2.0
*/
@Mojo( name = "deploy" )
diff --git a/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java b/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
index 5255520..173c502 100644
--- a/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
@@ -38,7 +38,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
* POM, using <a href="/wagon/">wagon supported protocols</a>
*
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
- * @version $Id$
+ *
* @since 2.0
*/
@Mojo( name = "stage-deploy", requiresDependencyResolution = ResolutionScope.TEST )
diff --git a/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java b/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java
index 3ecdd36..06e5367 100644
--- a/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java
@@ -40,7 +40,7 @@ import org.apache.maven.project.MavenProject;
* such as by calling <code>mvn site</code>.</p>
*
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
- * @version $Id$
+ *
* @since 2.0
*/
@Mojo( name = "stage", requiresDependencyResolution = ResolutionScope.TEST )
diff --git a/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java b/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java
index bcfbb10..4290299 100644
--- a/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java
+++ b/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java
@@ -34,7 +34,7 @@ import java.util.Properties;
* ie Maven >= 3.0.1.
*
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
- * @version $Id$
+ *
* @todo [BP] some things are specific to certain wagons (eg key stuff in authInfo, permissions)
*/
public class BugFixedRepository
diff --git a/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java b/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java
index 401d1fb..089210f 100644
--- a/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java
+++ b/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java
@@ -32,7 +32,7 @@ import java.util.StringTokenizer;
* ie Maven >= 3.0.1.
*
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
- * @version $Id$
+ *
*/
public final class PathUtils
{
diff --git a/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java b/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
index 5578fef..ac121ed 100644
--- a/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
@@ -43,7 +43,7 @@ import org.codehaus.plexus.util.xml.XmlWriterUtil;
* <code>site.xml</code>, for the first locale.
*
* @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
- * @version $Id$
+ *
* @since 2.2
*/
@Mojo( name = "effective-site", requiresReports = true )
diff --git a/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorArtifactMetadata.java b/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorArtifactMetadata.java
index bf72d1c..23c74cc 100644
--- a/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorArtifactMetadata.java
+++ b/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorArtifactMetadata.java
@@ -38,7 +38,7 @@ import org.codehaus.plexus.util.WriterFactory;
* Attach a POM to an artifact.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @version $Id$
+ *
*/
public class SiteDescriptorArtifactMetadata
extends AbstractArtifactMetadata
diff --git a/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorAttachMojo.java b/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorAttachMojo.java
index 4f1f0da..191b3dd 100644
--- a/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorAttachMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/descriptor/SiteDescriptorAttachMojo.java
@@ -42,7 +42,7 @@ import org.codehaus.plexus.util.FileUtils;
* define this goal execution to restore the intended behavior.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @version $Id$
+ *
* @since 2.0
*/
@Mojo( name = "attach-descriptor", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true )
diff --git a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
index d592b49..8126b3a 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
@@ -68,7 +68,7 @@ import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
* Base class for site rendering mojos.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @version $Id$
+ *
*/
public abstract class AbstractSiteRenderingMojo
extends AbstractSiteDescriptorMojo implements Contextualizable
diff --git a/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java b/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
index 7703989..65cdeef 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
@@ -42,7 +42,7 @@ import org.codehaus.plexus.archiver.jar.ManifestException;
* Bundles the site output into a JAR so that it can be deployed to a repository.
*
* @author <a href="mailto:mbeerman@yahoo.com">Matthew Beermann</a>
- * @version $Id$
+ *
* @since 2.0-beta-6
*/
// MSITE-665: requiresDependencyResolution workaround for MPLUGIN-253
diff --git a/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java b/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java
index 30e57d3..85ccc61 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/SiteMap.java
@@ -37,7 +37,7 @@ import org.codehaus.plexus.i18n.I18N;
* Generate a sitemap.
*
* @author ltheussl
- * @version $Id$
+ *
* @since 2.1
*/
public class SiteMap
diff --git a/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java b/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
index 3ba497c..e8097f3 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
@@ -55,7 +55,7 @@ import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
- * @version $Id$
+ *
*/
@Mojo( name = "site", requiresDependencyResolution = ResolutionScope.TEST, requiresReports = true )
public class SiteMojo
diff --git a/src/main/java/org/apache/maven/plugins/site/run/DoxiaBean.java b/src/main/java/org/apache/maven/plugins/site/run/DoxiaBean.java
index 5782e67..e9db47b 100644
--- a/src/main/java/org/apache/maven/plugins/site/run/DoxiaBean.java
+++ b/src/main/java/org/apache/maven/plugins/site/run/DoxiaBean.java
@@ -28,7 +28,7 @@ import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
* Bean to handle Doxia in a servlet context attribute
*
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
- * @version $Id$
+ *
*/
public class DoxiaBean
{
diff --git a/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java b/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
index d000964..13f290f 100644
--- a/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
@@ -46,7 +46,7 @@ import org.eclipse.jetty.webapp.WebAppContext;
* It uses Jetty as the web server.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @version $Id$
+ *
*/
@Mojo( name = "run", aggregator = true, requiresReports = true )
public class SiteRunMojo
diff --git a/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java b/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java
index b1dbd43..1af75b1 100644
--- a/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java
+++ b/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
/**
* @author Olivier Lamy
- * @version $Id$
+ *
*/
@RunWith( JUnit4.class )
public abstract class AbstractSiteDeployWebDavTest
diff --git a/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java b/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java
index 6eb87c3..09e8339 100644
--- a/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java
+++ b/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java
@@ -43,7 +43,7 @@ import org.apache.maven.plugins.site.deploy.HttpRequest;
/**
* @author Olivier Lamy
* @since
- * @version $Id$
+ *
*/
public class AuthAsyncProxyServlet
extends AsyncProxyServlet
diff --git a/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java b/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java
index ac87714..f2a50ff 100644
--- a/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java
+++ b/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
/**
* @author Olivier Lamy
* @since 3.0-beta-2
- * @version $Id$
+ *
*/
public class SimpleDavServerHandler
{
diff --git a/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java b/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java
index e0c96ab..53af294 100644
--- a/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java
+++ b/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java
@@ -27,7 +27,7 @@ import org.apache.maven.plugins.site.deploy.SiteDeployMojo;
/**
* @author Olivier Lamy
* @since 3.0-beta-2
- * @version $Id$
+ *
*/
public class SiteDeployWebDavTest
extends AbstractSiteDeployWebDavTest
diff --git a/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
index 96744e9..2b42dcf 100644
--- a/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
@@ -32,7 +32,7 @@ import org.codehaus.plexus.util.xml.XmlStreamReader;
/**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
- * @version $Id$
+ *
*/
public class SiteMavenProjectStub
extends MavenProjectStub