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 2023/02/11 20:21:05 UTC
[maven-site-plugin] branch master updated: [MSITE-928] Upgrade plugins and components
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
The following commit(s) were added to refs/heads/master by this push:
new b9167262 [MSITE-928] Upgrade plugins and components
b9167262 is described below
commit b9167262e82a0956fc6314441225fd916e10905d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Feb 11 21:07:52 2023 +0100
[MSITE-928] Upgrade plugins and components
---
pom.xml | 26 +++++++++++-----------
.../plugins/site/deploy/AuthAsyncProxyServlet.java | 3 +--
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8c001292..d9d8f846 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,22 +196,22 @@ under the License.
<mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
<!-- for dependencies -->
- <jettyVersion>9.4.49.v20220914</jettyVersion>
+ <jettyVersion>9.4.50.v20221201</jettyVersion>
<doxiaVersion>2.0.0-M5</doxiaVersion>
<doxiaSitetoolsVersion>2.0.0-M5</doxiaSitetoolsVersion>
- <wagonVersion>3.5.2</wagonVersion>
+ <wagonVersion>3.5.3</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<!-- for ITs -->
- <checkstylePluginVersion>3.2.0</checkstylePluginVersion>
- <javadocPluginVersion>3.3.2</javadocPluginVersion>
- <pmdPluginVersion>3.19.0</pmdPluginVersion>
+ <checkstylePluginVersion>3.2.1</checkstylePluginVersion>
+ <javadocPluginVersion>3.4.1</javadocPluginVersion>
+ <pmdPluginVersion>3.20.0</pmdPluginVersion>
<jxrPluginVersion>3.3.0</jxrPluginVersion>
- <projectInfoReportsPluginVersion>3.4.1</projectInfoReportsPluginVersion>
- <surefirePluginVersion>3.0.0-M7</surefirePluginVersion>
- <mavenPluginPluginVersion>3.6.4</mavenPluginPluginVersion>
- <mavenReportingImplVersion>4.0.0-M3</mavenReportingImplVersion>
- <fluidoSkinVersion>1.11.1</fluidoSkinVersion>
- <surefire.version>2.22.2</surefire.version>
+ <projectInfoReportsPluginVersion>3.4.2</projectInfoReportsPluginVersion>
+ <surefirePluginVersion>3.0.0-M8</surefirePluginVersion>
+ <mavenPluginPluginVersion>3.7.1</mavenPluginPluginVersion>
+ <mavenReportingImplVersion>4.0.0-M4</mavenReportingImplVersion>
+ <fluidoSkinVersion>2.0.0-M2</fluidoSkinVersion>
+ <surefire.version>3.0.0-M8</surefire.version>
<project.build.outputTimestamp>2022-12-02T20:25:50Z</project.build.outputTimestamp>
</properties>
@@ -307,7 +307,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>4.6.0</version>
+ <version>4.6.1</version>
</dependency>
<dependency>
@@ -529,7 +529,7 @@ under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>mrm-maven-plugin</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0</version>
<configuration>
<repositories>
<mockRepo>
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 0276630b..509158ba 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
@@ -31,7 +31,6 @@ import java.util.*;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.eclipse.jetty.proxy.AsyncProxyServlet;
-import org.eclipse.jetty.util.B64Code;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -92,7 +91,7 @@ public class AuthAsyncProxyServlet extends AsyncProxyServlet {
String proxyAuthorization = request.getHeader("Proxy-Authorization");
if (proxyAuthorization != null && proxyAuthorization.startsWith("Basic ")) {
String proxyAuth = proxyAuthorization.substring(6);
- String authorization = new String(B64Code.decode(proxyAuth));
+ String authorization = new String(Base64.getDecoder().decode(proxyAuth));
String[] authTokens = authorization.split(":");
String user = authTokens[0];
String password = authTokens[1];