Release aai/aai-common

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

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 886c728..e4abfb7 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
 ============LICENSE_START======================================================
 org.onap.aai
 ===============================================================================
@@ -18,7 +17,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ===========LICENSE_END=========================================================
-
 -->
 <project
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
@@ -28,7 +26,7 @@ limitations under the License.
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-parent</artifactId>
-               <version>1.6.5-SNAPSHOT</version>
+               <version>1.9.6</version>
                <relativePath>../aai-parent/pom.xml</relativePath>
        </parent>
        <artifactId>aai-core</artifactId>
@@ -37,14 +35,9 @@ limitations under the License.
        <properties>
                <springframework.version>4.3.24.RELEASE</springframework.version>
 
-               <!-- <httpclient.version>4.5.5</httpclient.version> <jackson.version>2.2.3</jackson.version> 
-                       <eelf.core.version>1.0.1-oss</eelf.core.version> <logback.version>1.2.3</logback.version> 
-                       <freemarker.version>2.3.21</freemarker.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> 
-               <!--    <jetty.version>9.4.11.v20180605</jetty.version> -->
+               <groovy.version>2.5.15</groovy.version>
                <!-- Start of Default ONAP Schema Properties -->
                <aai.wiki.link>https://wiki.onap.org/</aai.wiki.link>
                <gendoc.version>v15</gendoc.version>
@@ -91,7 +84,6 @@ limitations under the License.
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>
                                <configuration>
-                                       <argLine>${argLine}</argLine>
                                        <systemPropertyVariables>
                                                <AJSC_HOME>.</AJSC_HOME>
                                                <BUNDLECONFIG_DIR>bundleconfig-local</BUNDLECONFIG_DIR>
@@ -104,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>
@@ -121,6 +113,10 @@ limitations under the License.
                        <groupId>org.onap.aai.aai-common</groupId>
                        <artifactId>aai-schema-ingest</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.onap.aai.aai-common</groupId>
+                       <artifactId>aai-aaf-auth</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.onap.aai.aai-common</groupId>
                        <artifactId>aai-annotations</artifactId>
@@ -137,6 +133,13 @@ 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>
                </dependency>
                <dependency>
                        <groupId>org.codehaus.jackson</groupId>
@@ -167,13 +170,8 @@ limitations under the License.
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-module-junit4</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-api-mockito</artifactId>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-core</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
@@ -206,6 +204,14 @@ limitations under the License.
                        <groupId>javax.xml.bind</groupId>
                        <artifactId>jaxb-api</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>com.sun.xml.bind</groupId>
+                       <artifactId>jaxb-impl</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>com.sun.xml.bind</groupId>
+                       <artifactId>jaxb-core</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.eclipse.persistence</groupId>
                        <artifactId>eclipselink</artifactId>
@@ -218,6 +224,11 @@ limitations under the License.
                        <groupId>com.jayway.jsonpath</groupId>
                        <artifactId>json-path</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>com.jayway.jsonpath</groupId>
+                       <artifactId>json-path-assert</artifactId>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>org.eclipse.jetty</groupId>
                        <artifactId>jetty-util</artifactId>
@@ -238,10 +249,6 @@ limitations under the License.
                        <groupId>com.sun.jersey</groupId>
                        <artifactId>jersey-json</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>javax.ws.rs</groupId>
-                       <artifactId>javax.ws.rs-api</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.apache.tinkerpop</groupId>
                        <artifactId>gremlin-core</artifactId>
@@ -280,10 +287,6 @@ limitations under the License.
                        <artifactId>json</artifactId>
 
                </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-               </dependency>
                <dependency>
                        <groupId>com.bazaarvoice.jolt</groupId>
                        <artifactId>jolt-complete</artifactId>
@@ -323,6 +326,7 @@ limitations under the License.
                <dependency>
                        <groupId>org.codehaus.groovy</groupId>
                        <artifactId>groovy</artifactId>
+            <version>${groovy.version}</version>
                        <classifier>indy</classifier>
                </dependency>
                <dependency>
@@ -395,10 +399,12 @@ limitations under the License.
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-annotations</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+            <type>pom</type>
+        </dependency>
        </dependencies>
 
        <!-- Plugins and repositories -->