Switch aai-common baseimage back to java 8

[aai/aai-common.git] / aai-core / pom.xml

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 60ef462..348d4eb 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -8,9 +8,9 @@ Copyright © 2019 AT&T Intellectual Property. All rights reserved.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
-               
+
 http://www.apache.org/licenses/LICENSE-2.0
-               
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@ limitations under the License.
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-parent</artifactId>
-               <version>1.7.2-SNAPSHOT</version>
+               <version>1.13.4-SNAPSHOT</version>
                <relativePath>../aai-parent/pom.xml</relativePath>
        </parent>
        <artifactId>aai-core</artifactId>
@@ -36,8 +36,8 @@ limitations under the License.
                <springframework.version>4.3.24.RELEASE</springframework.version>
 
                <jacoco.line.coverage.limit>0.50</jacoco.line.coverage.limit>
-               <gremlin.version>3.2.2</gremlin.version>
-               <groovy.version>2.4.15</groovy.version>
+               <groovy.version>2.5.15</groovy.version>
+               <mockito.core.version>3.4.0</mockito.core.version>
                <!-- Start of Default ONAP Schema Properties -->
                <aai.wiki.link>https://wiki.onap.org/</aai.wiki.link>
                <gendoc.version>v15</gendoc.version>
@@ -96,7 +96,7 @@ limitations under the License.
                                <version>2.8</version>
                        </plugin>
                        <plugin>
-                               <!-- explicitly define maven-deploy-plugin after other to force exec 
+                               <!-- explicitly define maven-deploy-plugin after other to force exec
                                        order -->
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-deploy-plugin</artifactId>
@@ -122,9 +122,14 @@ limitations under the License.
                        <artifactId>aai-annotations</artifactId>
                </dependency>
                <dependency>
-                       <groupId>commons-lang</groupId>
-                       <artifactId>commons-lang</artifactId>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>commons-lang3</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>commons-cli</groupId>
+                       <artifactId>commons-cli</artifactId>
+                       <version>1.5.0</version>
+       </dependency>
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-text</artifactId>
@@ -133,13 +138,7 @@ limitations under the License.
                <dependency>
                        <groupId>com.att.eelf</groupId>
                        <artifactId>eelf-core</artifactId>
-                       <exclusions><!-- excluding transitive dependency coming from this artifact, 
-                                       as we would need powermock-api-mockito2 -->
-                               <exclusion>
-                                       <groupId>org.powermock</groupId>
-                                       <artifactId>powermock-api-mockito</artifactId>
-                               </exclusion>
-                       </exclusions>
+                       <version>2.0.0-oss</version>
                </dependency>
                <dependency>
                        <groupId>org.codehaus.jackson</groupId>
@@ -164,11 +163,6 @@ limitations under the License.
                        <artifactId>hamcrest-core</artifactId>
                        <scope>test</scope>
                </dependency>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-all</artifactId>
-                       <scope>test</scope>
-               </dependency>
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
@@ -261,22 +255,10 @@ limitations under the License.
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-annotations</artifactId>
-
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.dataformat</groupId>
-                       <artifactId>jackson-dataformat-yaml</artifactId>
-               </dependency>
                <dependency>
                        <groupId>xml-apis</groupId>
                        <artifactId>xml-apis</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>commons-cli</groupId>
-                       <artifactId>commons-cli</artifactId>
+                       <version>1.4.01</version>
                </dependency>
                <dependency>
                        <groupId>com.beust</groupId>
@@ -285,7 +267,6 @@ limitations under the License.
                <dependency>
                        <groupId>org.json</groupId>
                        <artifactId>json</artifactId>
-
                </dependency>
                <dependency>
                        <groupId>com.bazaarvoice.jolt</groupId>
@@ -326,6 +307,7 @@ limitations under the License.
                <dependency>
                        <groupId>org.codehaus.groovy</groupId>
                        <artifactId>groovy</artifactId>
+            <version>${groovy.version}</version>
                        <classifier>indy</classifier>
                </dependency>
                <dependency>
@@ -358,11 +340,6 @@ limitations under the License.
                        <artifactId>spring-boot-test</artifactId>
                        <scope>test</scope>
                </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-module-javaagent</artifactId>
-                       <scope>test</scope>
-               </dependency>
                <dependency>
                        <groupId>org.skyscreamer</groupId>
                        <artifactId>jsonassert</artifactId>
@@ -399,8 +376,14 @@ limitations under the License.
                        <artifactId>jackson-annotations</artifactId>
                </dependency>
                <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
+                       <groupId>com.fasterxml.jackson.dataformat</groupId>
+                       <artifactId>jackson-dataformat-yaml</artifactId>
+               </dependency>
+               <dependency>
+                               <groupId>org.apache.logging.log4j</groupId>
+                               <artifactId>log4j</artifactId>
+                               <version>${log4j.version}</version>
+                               <type>pom</type>
                </dependency>
        </dependencies>
 
@@ -408,12 +391,12 @@ limitations under the License.
        <pluginRepositories>
                <pluginRepository>
                        <id>central</id>
-                       <url>http://repo1.maven.org/maven2</url>
+                       <url>https://repo1.maven.org/maven2</url>
                </pluginRepository>
                <pluginRepository>
                        <id>EvoSuite</id>
                        <name>EvoSuite Repository</name>
-                       <url>http://www.evosuite.org/m2</url>
+                       <url>https://www.evosuite.org/m2</url>
                </pluginRepository>
        </pluginRepositories>