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 2020/05/14 11:24:24 UTC
[maven-site-plugin] 01/02: [MSITE-828] [MSITE-829] Upgrade jetty to
recent version. Update to java 1.8 (required for jetty) (#3)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch MSITE-829
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 313086100cbfbbe74eb2ea45b5fedd2b9112a0c5
Author: Olaf Flebbe <of...@oflebbe.de>
AuthorDate: Thu Nov 15 11:55:30 2018 +0100
[MSITE-828] [MSITE-829] Upgrade jetty to recent version. Update to java 1.8 (required for jetty) (#3)
* Upgrade jetty to recent version. Update to java 1.8 (required for jetty)
* Make checkstyle happy
* Introduce jettyVersion property
* Update jettyVersion to 9.4.12.v20180830
* Work around compilation problem for site:run
* Fix obsolete servlet api on classpath
---
pom.xml | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 842e6fa..3f4441b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,7 +196,7 @@ under the License.
<properties>
<mavenVersion>3.0</mavenVersion>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<!-- for dependencies -->
<doxiaVersion>1.9.1</doxiaVersion>
<doxiaSitetoolsVersion>1.9.2</doxiaSitetoolsVersion>
@@ -211,6 +211,9 @@ under the License.
<projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
<surefirePluginVersion>2.22.1</surefirePluginVersion>
<project.build.outputTimestamp>2020-03-06T20:49:49Z</project.build.outputTimestamp>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <jettyVersion>9.4.12.v20180830</jettyVersion>
</properties>
<dependencies>
@@ -392,7 +395,6 @@ under the License.
<version>${doxiaVersion}</version>
<scope>runtime</scope>
</dependency>
-
<!-- Doxia Sitetools -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
@@ -471,6 +473,13 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-proxy</artifactId>
+ <version>${jettyVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.3</version>