Skip to content

Commit

Permalink
Upgrade Jersey and disable test for now (#144)
Browse files Browse the repository at this point in the history
While a recent Jersey version provides "jakarta"-ified APIs,
we are still unable to deploy it because Jersey depends on
the javax.servlet classes internally (for instance in
org.glassfish.jersey.servlet.ServletContainer).
We'll have to wait for a compatible release of Jersey.
  • Loading branch information
f4lco committed Sep 15, 2020
1 parent b64c6a6 commit afa5332
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
2 changes: 0 additions & 2 deletions integrationTests/helloJersey/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ dependencies {
compile "org.glassfish.jersey.containers:jersey-container-servlet-core:$jersey_version"
compile "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
compile 'javax.xml.bind:jaxb-api:2.3.1'
// FIXME
//integrationTestCompile "javax.servlet:servlet-api:$jetty7_servlet_api_version"
}

war {
Expand Down
2 changes: 1 addition & 1 deletion integrationTests/helloJersey/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
jersey_version=2.27
jersey_version=3.0.0-M1
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ 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 javax.servlet.http.HttpServletResponse.*

class RequestResponseSpec extends GrettyAjaxSpec {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
*/
package org.akhikhl.examples.gretty.hellojersey;

import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;
import jakarta.ws.rs.ApplicationPath;
import jakarta.ws.rs.core.Application;
import java.util.HashSet;
import java.util.Set;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
*/
package org.akhikhl.examples.gretty.hellojersey;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;

@Path("testresource")
public class TestResource {
Expand Down
4 changes: 3 additions & 1 deletion integrationTests/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ rootProject.name = rootProjectName
include 'helloGretty'
include 'helloGrettySecure'
include 'helloGrettyOverlay'
include 'helloJersey'
// FIXME waits for Jakarta release of Jersey (#163)
// Jersey 3.0.0-M1 still depends on javax.servlet internally
// include 'helloJersey'
include 'extraResourceBases'
include 'filterWebApp'
include 'testAnnotations'
Expand Down

0 comments on commit afa5332

Please sign in to comment.