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 Jersey to 3.0.0-M6 and enable 'helloJersey' (fixes #163) #184

Merged
merged 1 commit into from
Nov 6, 2020
Merged

Upgrade Jersey to 3.0.0-M6 and enable 'helloJersey' (fixes #163) #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion integrationTests/helloJersey/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ apply plugin: 'org.gretty'
apply plugin: 'org.gretty.internal.integrationTests.IntegrationTestPlugin'

dependencies {
compile "org.glassfish.jersey.containers:jersey-container-servlet-core:$jersey_version"
compile "org.glassfish.jersey.containers:jersey-container-servlet:$jersey_version"
compile "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
compile 'javax.xml.bind:jaxb-api:2.3.1'
integrationTestCompile "jakarta.servlet:jakarta.servlet-api:$tomcat10_servlet_api_version"
}

war {
Expand Down
2 changes: 1 addition & 1 deletion integrationTests/helloJersey/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
jersey_version=3.0.0-M1
jersey_version=3.0.0-M6
1 change: 1 addition & 0 deletions ...integrationTest/groovy/org/akhikhl/examples/gretty/hellojersey/RequestResponseSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ package org.akhikhl.examples.gretty.hellojersey
import org.akhikhl.gretty.GrettyAjaxSpec
import static groovyx.net.http.ContentType.*
import static groovyx.net.http.Method.*
import static jakarta.servlet.http.HttpServletResponse.*

class RequestResponseSpec extends GrettyAjaxSpec {

Expand Down
2 changes: 1 addition & 1 deletion integrationTests/helloJersey/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<servlet-name>JerseyServletContainer</servlet-name>
<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-name>jakarta.ws.rs.Application</param-name>
<param-value>org.akhikhl.examples.gretty.hellojersey.JerseyApp</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
Expand Down
4 changes: 1 addition & 3 deletions integrationTests/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ include 'helloGrettyMultiproject'
include 'helloGrettyMultiproject:subproject'
include 'helloGrettySecure'
include 'helloGrettyOverlay'
// FIXME waits for Jakarta release of Jersey (#163)
// Jersey 3.0.0-M1 still depends on javax.servlet internally
// include 'helloJersey'
include 'helloJersey'
include 'extraResourceBases'
include 'filterWebApp'
include 'testAnnotations'
Expand Down