Skip to content

Commit

Permalink
[MSITE-829] [MSITE-828] Upgrade Jetty to 9.4.x implicit java8 require…
Browse files Browse the repository at this point in the history
…ment now (#21)

* [MSITE-829] use jetty 9.4.43.v20210629
* [MSITE-828]  Upgrade to Java 8
Signed-off-by: Olivier Lamy <olamy@apache.org>
  • Loading branch information
olamy authored Feb 23, 2022
1 parent 6c53dfc commit 0b1c775
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
* under the License.
*/

asfMavenTlpPlgnBuild()
asfMavenTlpPlgnBuild(jdk:['8','11','14'], maven:['3.3.x', '3.5.x', '3.8.x'])
9 changes: 6 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,13 @@ under the License.

<properties>
<mavenVersion>3.0.5</mavenVersion>
<javaVersion>7</javaVersion>
<javaVersion>8</javaVersion>

<!-- for dependencies -->
<doxiaVersion>1.11.1</doxiaVersion>
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
<jettyVersion>9.2.29.v20191105</jettyVersion>
<jettyVersion>9.4.44.v20210927</jettyVersion>

<plexusVersion>1.5.4</plexusVersion>
<scmVersion>1.4</scmVersion>
<wagonVersion>3.3.1</wagonVersion>
Expand All @@ -214,6 +216,7 @@ under the License.
<surefirePluginVersion>2.22.2</surefirePluginVersion>
<surefire.version>2.22.2</surefire.version>
<project.build.outputTimestamp>2022-02-13T11:25:26Z</project.build.outputTimestamp>

</properties>

<dependencies>
Expand Down Expand Up @@ -384,7 +387,6 @@ under the License.
<version>${doxiaVersion}</version>
<scope>runtime</scope>
</dependency>

<!-- Doxia Sitetools -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
Expand Down Expand Up @@ -533,6 +535,7 @@ under the License.
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
</properties>
<javaHome>${java.home}</javaHome>
</configuration>
</plugin>
<plugin>
Expand Down
1 change: 1 addition & 0 deletions src/it/projects/MSITE-497/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>@javadocPluginVersion@</version>
</plugin>
</plugins>
</reporting>
Expand Down

0 comments on commit 0b1c775

Please # to comment.