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 20:37:17 UTC
[maven-site-plugin] branch master updated (522eddd7 -> bf434e5d)
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 522eddd7 [MSITE-889] Upgrade Plexus Utils to 3.3.1
new 606a3270 [MSITE-857] Jetty engine fails to resolve web.xml DTD behind corporate proxy
new 5f10ad14 [MSITE-890] Upgrade Jetty to 9.4.46.v20220331
new bf434e5d [MSITE-891] Upgrade plugins in ITs
The 3 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 | 10 +++++-----
src/it/projects/full-reporting/pom.xml | 6 ++++++
src/main/resources/run/web.xml | 10 +++++-----
3 files changed, 16 insertions(+), 10 deletions(-)
[maven-site-plugin] 01/03: [MSITE-857] Jetty engine fails to resolve web.xml DTD behind corporate proxy
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 606a327097202f3f90bfd60e66a7c4cb6a53d004
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 16 21:52:38 2022 +0200
[MSITE-857] Jetty engine fails to resolve web.xml DTD behind corporate proxy
Upgrade web.xml to Servlet 3.1 which Jetty will serve its schema from a bundled
catalog and avoid outbound connections.
---
src/main/resources/run/web.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/run/web.xml b/src/main/resources/run/web.xml
index 66bf8ee9..9b8e3325 100644
--- a/src/main/resources/run/web.xml
+++ b/src/main/resources/run/web.xml
@@ -17,11 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
-<web-app>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
<filter>
<filter-name>doxia</filter-name>
<filter-class>org.apache.maven.plugins.site.run.DoxiaFilter</filter-class>
[maven-site-plugin] 02/03: [MSITE-890] Upgrade Jetty to 9.4.46.v20220331
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 5f10ad146fec988f892a56b82b83e5c41ede3604
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 16 21:54:55 2022 +0200
[MSITE-890] Upgrade Jetty to 9.4.46.v20220331
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 31d4173c..23422c7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,7 +201,7 @@ under the License.
<!-- for dependencies -->
<doxiaVersion>1.11.1</doxiaVersion>
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
- <jettyVersion>9.4.44.v20210927</jettyVersion>
+ <jettyVersion>9.4.46.v20220331</jettyVersion>
<wagonVersion>3.5.1</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<!-- for ITs -->
[maven-site-plugin] 03/03: [MSITE-891] Upgrade plugins in ITs
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 bf434e5d0e37ce85392a96587ad2f4ec58c63641
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 16 22:35:50 2022 +0200
[MSITE-891] Upgrade plugins in ITs
---
pom.xml | 8 ++++----
src/it/projects/full-reporting/pom.xml | 6 ++++++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 23422c7e..27cc1546 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,11 +205,11 @@ under the License.
<wagonVersion>3.5.1</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<!-- for ITs -->
- <checkstylePluginVersion>2.9.1</checkstylePluginVersion>
+ <checkstylePluginVersion>3.1.2</checkstylePluginVersion>
<javadocPluginVersion>3.3.2</javadocPluginVersion>
- <pmdPluginVersion>3.11.0</pmdPluginVersion>
- <jxrPluginVersion>3.1.1</jxrPluginVersion>
- <projectInfoReportsPluginVersion>3.2.1</projectInfoReportsPluginVersion>
+ <pmdPluginVersion>3.16.0</pmdPluginVersion>
+ <jxrPluginVersion>3.2.0</jxrPluginVersion>
+ <projectInfoReportsPluginVersion>3.2.2</projectInfoReportsPluginVersion>
<surefirePluginVersion>2.22.2</surefirePluginVersion>
<surefire.version>2.22.2</surefire.version>
<project.build.outputTimestamp>2022-02-13T11:25:26Z</project.build.outputTimestamp>
diff --git a/src/it/projects/full-reporting/pom.xml b/src/it/projects/full-reporting/pom.xml
index f5399a67..25e958e8 100644
--- a/src/it/projects/full-reporting/pom.xml
+++ b/src/it/projects/full-reporting/pom.xml
@@ -69,6 +69,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@checkstylePluginVersion@</version>
+ <configuration>
+ <configLocation>sun_checks.xml</configLocation>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -128,6 +131,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@checkstylePluginVersion@</version>
+ <configuration>
+ <configLocation>sun_checks.xml</configLocation>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>