Merge pull request #20009 from dreis2211
* pr/20009: Use Spring 5 module of Jersey Closes gh-20009
This commit is contained in:
		
						commit
						ae169a3617
					
				| 
						 | 
				
			
			@ -119,7 +119,7 @@ dependencies {
 | 
			
		|||
	testImplementation("org.aspectj:aspectjrt")
 | 
			
		||||
	testImplementation("org.assertj:assertj-core")
 | 
			
		||||
	testImplementation("org.eclipse.jetty:jetty-webapp")
 | 
			
		||||
	testImplementation("org.glassfish.jersey.ext:jersey-spring4")
 | 
			
		||||
	testImplementation("org.glassfish.jersey.ext:jersey-spring5")
 | 
			
		||||
	testImplementation("org.glassfish.jersey.media:jersey-media-json-jackson")
 | 
			
		||||
	testImplementation("org.hamcrest:hamcrest")
 | 
			
		||||
	testImplementation("org.hsqldb:hsqldb")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -83,7 +83,7 @@ dependencies {
 | 
			
		|||
	testRuntimeOnly("io.projectreactor.netty:reactor-netty")
 | 
			
		||||
	testRuntimeOnly("javax.xml.bind:jaxb-api")
 | 
			
		||||
	testRuntimeOnly("org.apache.tomcat.embed:tomcat-embed-el")
 | 
			
		||||
	testRuntimeOnly("org.glassfish.jersey.ext:jersey-spring4")
 | 
			
		||||
	testRuntimeOnly("org.glassfish.jersey.ext:jersey-spring5")
 | 
			
		||||
	testRuntimeOnly("org.hsqldb:hsqldb")
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,7 +17,7 @@ dependencies {
 | 
			
		|||
		exclude group: "jakarta.el", module: "jakarta.el-api"
 | 
			
		||||
		exclude group: "org.glassfish", module: "jakarta.el"
 | 
			
		||||
	}
 | 
			
		||||
	api("org.glassfish.jersey.ext:jersey-spring4")
 | 
			
		||||
	api("org.glassfish.jersey.ext:jersey-spring5")
 | 
			
		||||
	api("org.glassfish.jersey.media:jersey-media-json-jackson")
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue