Springboot 2.0 upgrade

[so.git] / mso-api-handlers / mso-api-handler-infra / pom.xml

diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index 2b2bec9..1d64927 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -18,6 +18,8 @@
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
                <swagger-version>1.3.0</swagger-version>
                <jax-rs-version>1.1.1</jax-rs-version>
+               <json4s-jackson-version>3.6.0</json4s-jackson-version>
+               <json4s-core-version>3.6.0</json4s-core-version>
                <reflections-version>0.9.9-RC1</reflections-version>
                <paranamer-version>2.5.2</paranamer-version>
                <scannotation-version>1.0.3</scannotation-version>
@@ -63,27 +65,13 @@
                </dependency>
                <dependency>
                        <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-data-jpa</artifactId>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.apache.tomcat</groupId>
-                                       <artifactId>tomcat-jdbc</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-dbcp2</artifactId>
-               </dependency>
+                       <artifactId>spring-boot-starter-data-jpa</artifactId>                   
+               </dependency>           
                <dependency>
                        <groupId>commons-lang</groupId>
                        <artifactId>commons-lang</artifactId>
                        <version>2.6</version>
-               </dependency>
-               <dependency>
-                       <groupId>antlr</groupId>
-                       <artifactId>antlr</artifactId>
-               </dependency>
+               </dependency>           
                <dependency>
                        <groupId>javax.activation</groupId>
                        <artifactId>activation</artifactId>
@@ -97,23 +85,21 @@
                <dependency>
                        <groupId>org.json4s</groupId>
                        <artifactId>json4s-jackson_2.12</artifactId>
+                       <version>${json4s-jackson-version}</version>
                </dependency>
                <dependency>
                        <groupId>org.json4s</groupId>
                        <artifactId>json4s-core_2.12</artifactId>
+                       <version>${json4s-core-version}</version>
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
                        <artifactId>servlet-api</artifactId>
                        <version>2.5</version>
-               </dependency>
+               </dependency>   
                <dependency>
-                       <groupId>org.javassist</groupId>
-                       <artifactId>javassist</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.json</groupId>
-                       <artifactId>json</artifactId>
+                       <groupId>javax.interceptor</groupId>
+                       <artifactId>javax.interceptor-api</artifactId>
                </dependency>
 
                <!-- Dependencies on other MSO Projects -->
@@ -175,12 +161,7 @@
                        <groupId>com.github.java-json-tools</groupId>
                        <artifactId>json-schema-validator</artifactId>
                        <version>2.2.8</version>
-               </dependency>
-               <dependency>
-                       <groupId>janino</groupId>
-                       <artifactId>janino</artifactId>
-                       <version>2.5.15</version>
-               </dependency>
+               </dependency>           
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-test</artifactId>
@@ -219,13 +200,11 @@
                </dependency>
                <dependency>
                        <groupId>io.micrometer</groupId>
-                       <artifactId>micrometer-spring-legacy</artifactId>
-                       <version>1.0.5</version>
+                       <artifactId>micrometer-core</artifactId>
                </dependency>
                <dependency>
                        <groupId>io.micrometer</groupId>
                        <artifactId>micrometer-registry-prometheus</artifactId>
-                       <version>1.0.5</version>
                </dependency>
        </dependencies>