You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/04/16 19:18:14 UTC
[maven-site-plugin] branch master updated (af097dce -> d1bfb429)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
from af097dce Bump slf4jVersion from 1.7.32 to 1.7.36
new 8382743c [MSITE-884] Drop/replace usage of Commons Lang 3
new 628f5b3a [MSITE-885] Upgrade Commons IO to 2.11.0
new 7a3ed19c [MSITE-886] Upgrade Maven Wagon to 3.5.1
new 73df7bb9 Remove unused properties
new 6c42df38 Add undeclared dependency
new d1bfb429 [MSITE-887] Deprecate templateFile parameter
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:
pom.xml | 21 ++++++++++-----------
.../plugins/site/deploy/AbstractStagingMojo.java | 2 +-
.../plugins/site/deploy/SiteStageDeployMojo.java | 2 +-
.../plugins/site/descriptor/EffectiveSiteMojo.java | 5 +----
.../site/render/AbstractSiteRenderingMojo.java | 2 ++
.../maven/plugins/site/deploy/HttpRequest.java | 8 +++-----
6 files changed, 18 insertions(+), 22 deletions(-)
[maven-site-plugin] 05/06: Add undeclared dependency
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 6c42df388a5b8f50fe6e35ec4d74cb5981a13831
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 16 21:13:57 2022 +0200
Add undeclared dependency
---
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pom.xml b/pom.xml
index aaafb629..ece8805a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -424,6 +424,13 @@ under the License.
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
[maven-site-plugin] 01/06: [MSITE-884] Drop/replace usage of Commons Lang 3
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 8382743ceaf55dc1f4695e12ed8d3a1e2917a2c9
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 16 20:35:47 2022 +0200
[MSITE-884] Drop/replace usage of Commons Lang 3
---
pom.xml | 6 ------
.../org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java | 2 +-
.../org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java | 2 +-
.../apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java | 5 +----
.../java/org/apache/maven/plugins/site/deploy/HttpRequest.java | 8 +++-----
5 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 338988d8..dbf8e2cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -486,12 +486,6 @@ under the License.
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
- </dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git a/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java b/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java
index f51e9eb4..7070b530 100644
--- a/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java
@@ -19,10 +19,10 @@ package org.apache.maven.plugins.site.deploy;
* under the License.
*/
-import org.apache.commons.lang3.StringUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.utils.StringUtils;
/**
* Abstract base class for staging mojos.
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 173c5025..e31c7513 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
@@ -20,7 +20,6 @@ package org.apache.maven.plugins.site.deploy;
*/
import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
import org.apache.maven.model.Build;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
@@ -30,6 +29,7 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
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 879a5b6f..556f6bfb 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
@@ -19,7 +19,6 @@ package org.apache.maven.plugins.site.descriptor;
* under the License.
*/
-import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Writer;
import org.apache.maven.plugin.MojoExecutionException;
@@ -117,9 +116,7 @@ public class EffectiveSiteMojo
{
XmlWriterUtil.writeCommentLineBreak( writer );
XmlWriterUtil.writeComment( writer, " " );
- // Use ISO 8601 format for date and time
- String formattedDateTime = DateFormatUtils.ISO_DATETIME_FORMAT.format( System.currentTimeMillis() );
- XmlWriterUtil.writeComment( writer, "Generated by Maven Site Plugin on " + formattedDateTime );
+ XmlWriterUtil.writeComment( writer, "Generated by Maven Site Plugin" );
XmlWriterUtil.writeComment( writer, "See: http://maven.apache.org/plugins/maven-site-plugin/" );
XmlWriterUtil.writeComment( writer, " " );
XmlWriterUtil.writeCommentLineBreak( writer );
diff --git a/src/test/java/org/apache/maven/plugins/site/deploy/HttpRequest.java b/src/test/java/org/apache/maven/plugins/site/deploy/HttpRequest.java
index b1491a4f..b7d5cd8f 100644
--- a/src/test/java/org/apache/maven/plugins/site/deploy/HttpRequest.java
+++ b/src/test/java/org/apache/maven/plugins/site/deploy/HttpRequest.java
@@ -19,8 +19,6 @@ package org.apache.maven.plugins.site.deploy;
* under the License.
*/
-import org.apache.commons.lang3.SystemUtils;
-
import java.util.HashMap;
import java.util.Map;
@@ -41,12 +39,12 @@ class HttpRequest
public String toString()
{
StringBuilder sb = new StringBuilder( method ).append( " path " ).append( path )
- .append( SystemUtils.LINE_SEPARATOR );
+ .append( System.lineSeparator() );
for ( Map.Entry<String, String> entry : headers.entrySet() )
{
sb.append( entry.getKey() ).append( " : " ).append( entry.getValue() )
- .append( SystemUtils.LINE_SEPARATOR );
+ .append( System.lineSeparator() );
}
return sb.toString();
}
-}
\ No newline at end of file
+}
[maven-site-plugin] 03/06: [MSITE-886] Upgrade Maven Wagon to 3.5.1
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 7a3ed19c5ff6339615b997d97dcfbae926dfbad1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 16 20:38:44 2022 +0200
[MSITE-886] Upgrade Maven Wagon to 3.5.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e41bfad3..2b4b6f6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,7 +205,7 @@ under the License.
<plexusVersion>1.5.4</plexusVersion>
<scmVersion>1.4</scmVersion>
- <wagonVersion>3.3.1</wagonVersion>
+ <wagonVersion>3.5.1</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<!-- for ITs -->
<checkstylePluginVersion>2.9.1</checkstylePluginVersion>
[maven-site-plugin] 04/06: Remove unused properties
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 73df7bb9e0f9c2e421e79a8733302d557fa1b0ad
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 16 20:38:56 2022 +0200
Remove unused properties
---
pom.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2b4b6f6c..aaafb629 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,9 +202,6 @@ under the License.
<doxiaVersion>1.11.1</doxiaVersion>
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
<jettyVersion>9.4.44.v20210927</jettyVersion>
-
- <plexusVersion>1.5.4</plexusVersion>
- <scmVersion>1.4</scmVersion>
<wagonVersion>3.5.1</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<!-- for ITs -->
[maven-site-plugin] 02/06: [MSITE-885] Upgrade Commons IO to 2.11.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 628f5b3a315ddd3431dd00bee5d0d81b666e353d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 16 20:36:58 2022 +0200
[MSITE-885] Upgrade Commons IO to 2.11.0
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index dbf8e2cf..e41bfad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -489,7 +489,8 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.11.0</version>
+ <scope>test</scope>
</dependency>
<!-- test -->
[maven-site-plugin] 06/06: [MSITE-887] Deprecate templateFile parameter
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit d1bfb429cc41a79fbbeaed3fa725fbcb9cd9285d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 16 21:15:24 2022 +0200
[MSITE-887] Deprecate templateFile parameter
---
.../org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java | 2 ++
1 file changed, 2 insertions(+)
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 16398c85..3fceab25 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
@@ -90,8 +90,10 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo
* are disabled. It is highly recommended that you package this as a skin instead.
*
* @since 2.0-beta-5
+ * @deprecated Upcoming major Doxia version removes support for template files in favor of skins.
*/
@Parameter( property = "templateFile" )
+ @Deprecated
private File templateFile;
/**