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

Upgrade Jetty to version 10.x. #34

Merged
merged 2 commits into from
Aug 9, 2022
Merged

Upgrade Jetty to version 10.x. #34

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0626edc
Upgrade Jetty to version 10.x. Other libraries were upgraded to their…
Jul 21, 2022
fa26bf6
Merge remote-tracking branch 'origin/master' into jetty-10-upgrade
Aug 8, 2022
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
24 changes: 12 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>io.logz</groupId>
<artifactId>guice-jersey</artifactId>
<version>1.0.16-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I incremented the minor version since this uses a newer version of Jetty.


<packaging>jar</packaging>
<name>guice-jersey</name>
Expand All @@ -18,8 +18,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>11</source>
<target>11</target>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This "could" be left at 8 but I updated it to 11 since Jetty 10+ requires Java 11+.

</configuration>
</plugin>
<plugin>
Expand All @@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>3.4.0</version>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Needed to upgrade this plugin otherwise when building on new JVMs it generated the following error.

Execution attach-javadocs of goal org.apache.maven.plugins:maven-javadoc-plugin:2.10.4:jar failed: An API incompatibility was encountered while executing org.apache.maven.plugins:maven-javadoc-plugin:2.10.4:jar: java.lang.ExceptionInInitializerError: null

Caused by: java.lang.StringIndexOutOfBoundsException: begin 0, end 3, length 2
    at java.lang.String.checkBoundsBeginEnd (String.java:3319)
    at java.lang.String.substring (String.java:1874)
    at org.apache.commons.lang.SystemUtils.getJavaVersionAsFloat (SystemUtils.java:1133)
    at org.apache.commons.lang.SystemUtils.<clinit> (SystemUtils.java:818)

<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -121,12 +121,12 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hk2-bridge.version>2.6.0</hk2-bridge.version>
<jersey.version>2.29</jersey.version>
<jetty.version>9.4.28.v20200408</jetty.version>
<guice.version>4.2.2</guice.version>
<slf4j.version>1.7.26</slf4j.version>
<jackson.version>2.10.2</jackson.version>
<hk2-bridge.version>2.6.1</hk2-bridge.version>
<jersey.version>2.36</jersey.version>
<jetty.version>10.0.11</jetty.version>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did not upgrade to Jetty 11+ since that requires JakartaEE instead of javax. Guice does not support that yet.

<guice.version>5.1.0</guice.version>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Guice did not need to be upgraded as all tests passed without upgrading it. So it could be downgraded if older version would be preferred.

<slf4j.version>1.7.36</slf4j.version>
<jackson.version>2.13.3</jackson.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -175,7 +175,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -227,7 +227,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.2.11</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down