Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MSITE-829] Upgrade Jetty to 9.4.x implicit java8 requirement now #21

Merged
merged 2 commits into from
Feb 23, 2022
Merged

[MSITE-829] Upgrade Jetty to 9.4.x implicit java8 requirement now #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18fc90d
[MSITE-829] use jetty 9.4.43.v20210629
olamy Jun 7, 2020
27d26cd
use last jetty 9.4.44
olamy Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
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
View file
Open in desktop
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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change should probably be made, if at all, in its own PR, not as a driveby of a minor version dependency update

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need 8 for the change so let's do it all together
except having a sort of bureaucratic own PR I cannot see the technical need :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@olamy I am the bureaucratic person. This needs to be changelog visible.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's ALREADY there https://issues.apache.org/jira/browse/MSITE-828 and the git comment will clearly says that

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good, let's re-merge MSITE-828 first.


<!-- 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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is that necessary?

</configuration>
</plugin>
<plugin>
Expand Down
1 change: 1 addition & 0 deletions src/it/projects/MSITE-497/pom.xml
View file
Open in desktop
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