FINERACT-1418: Upgrade to Jersey 2

This commit is contained in:
Petri Tuomola
2021-11-04 07:43:46 +01:00
committed by Aleksandar Vidakovic
parent 4bcae92a3d
commit d3400888fa
88 changed files with 495 additions and 265 deletions
+14 -14
View File
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
dependencies {
providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
@@ -26,27 +27,21 @@ dependencies {
// implementation dependencies are directly used (compiled against) in src/main (and src/test)
//
implementation(
//'ch.vorburger.mariaDB4j:mariaDB4j:2.4.0',
'org.springframework.boot:spring-boot-starter-web',
'org.springframework.boot:spring-boot-starter-security',
'org.springframework.boot:spring-boot-starter-cache',
'org.glassfish.jersey.media:jersey-media-multipart:2.30.1',
'org.springframework:spring-jms',
'org.springframework:spring-context-support',
'org.springframework.security.oauth:spring-security-oauth2',
'com.sun.jersey:jersey-servlet',
'com.sun.jersey:jersey-server',
'com.sun.jersey.contribs:jersey-spring',
'com.sun.jersey.contribs:jersey-multipart',
'com.google.guava:guava',
'com.google.code.gson:gson',
'com.sun.jersey:jersey-core',
'jakarta.jms:jakarta.jms-api',
'jakarta.management.j2ee:jakarta.management.j2ee-api',
'jakarta.validation:jakarta.validation-api',
'com.squareup.retrofit2:retrofit',
'com.squareup.okhttp3:okhttp',
@@ -74,8 +69,13 @@ dependencies {
'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.4.0',
'com.squareup.retrofit2:converter-gson',
'com.sun.activation:jakarta.activation:1.2.2'
)
implementation('org.springframework.boot:spring-boot-starter-jersey') {
exclude group: 'org.glassfish.hk2.external', module: 'aopalliance-repackaged'
exclude group: 'org.glassfish.hk2', module: 'hk2-runlevel'
exclude group: 'org.hibernate.validator', module: 'hibernate-validator'
}
implementation('org.apache.commons:commons-email') {
exclude group: 'javax.activation'
}
@@ -85,9 +85,6 @@ dependencies {
implementation ('jakarta.xml.bind:jakarta.xml.bind-api') {
exclude group: 'jakarta.activation'
}
implementation ('com.sun.jersey:jersey-json') {
exclude group: 'com.sun.xml.bind'
}
implementation ('org.apache.activemq:activemq-broker') {
exclude group: 'org.apache.geronimo.specs'
}
@@ -113,12 +110,15 @@ dependencies {
exclude group: 'com.sun.activation'
}
runtimeOnly('org.glassfish.jaxb:jaxb-runtime') {
exclude group: 'com.sun.activation'
}
// runtimeOnly dependencies are things that Fineract code has no direct compile time dependency on, but which must be present at run-time
runtimeOnly(
'org.apache.bval:org.apache.bval.bundle',
'org.springframework.boot:spring-boot-starter-actuator',
'org.webjars.npm:swagger-ui-dist',
'org.glassfish.jaxb:jaxb-runtime',
// Although fineract (at the time of writing) doesn't have any compile time dep. on httpclient,
// it's useful to have this for the Spring Boot TestRestTemplate http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#boot-features-rest-templates-test-utility