X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=a792b0885ae3a0150656dd8c62039f04872d9fdc;hb=HEAD;hp=9253a49d5f597368f638e89691818bf36f82c5c8;hpb=8df22f7515ee76a2eb49f722d4ff260113ea7494;p=aai%2Faai-common.git

diff --git a/pom.xml b/pom.xml
index 9253a49d..5f3b2314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
     ============LICENSE_END=========================================================
 
 -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.oparent</groupId>
@@ -30,20 +30,23 @@
 
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
-    <version>1.6.5-SNAPSHOT</version>
+    <version>1.14.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-common</name>
     <description>Contains all of the common code for resources and traversal repos</description>
 
     <modules>
-    	<module>aai-parent</module>
-		<module>aai-rest</module>
-		<module>aai-schema-ingest</module>
-		<module>aai-annotations</module>
-		<module>aai-core</module>
-		<module>aai-auth</module>
-		<module>aai-utils</module>
-		<module>aai-schema-abstraction</module>
+        <module>aai-parent</module>
+        <module>aai-rest</module>
+        <module>aai-schema-ingest</module>
+        <module>aai-annotations</module>
+        <module>aai-aaf-auth</module>
+        <module>aai-core</module>
+        <module>aai-auth</module>
+        <module>aai-els-onap-logging</module>
+        <module>aai-failover</module>
+        <module>aai-utils</module>
+        <module>aai-schema-abstraction</module>
     </modules>
 
     <profiles>
@@ -56,6 +59,7 @@
     </profiles>
 
     <properties>
+        <aai.common.version>${project.version}</aai.common.version>
         <aai.generate.schema>true</aai.generate.schema>
         <sitePath>/content/sites/site/org/onap/aai/aai-common/${project.artifactId}/${project.version}</sitePath>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
@@ -95,6 +99,7 @@
                             <importOrder>
                                 <order>com,java,javax,org</order>
                             </importOrder>
+                            <removeUnusedImports/>
                         </java>
                     </configuration>
                     <!-- https://github.com/diffplug/spotless/tree/master/plugin-maven
@@ -150,30 +155,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.6</version>
-                <configuration>
-                    <reportPlugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-project-info-reports-plugin</artifactId>
-                            <version>2.4</version>
-                            <configuration>
-                                <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-                                <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-                            </configuration>
-                            <reports>
-                                <report>dependencies</report>
-                            </reports>
-                        </plugin>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-javadoc-plugin</artifactId>
-                            <version>2.8</version>
-                            <configuration>
-                                <additionalparam>-Xdoclint:none</additionalparam>
-                            </configuration>
-                        </plugin>
-                    </reportPlugins>
-                </configuration>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.maven.wagon</groupId>
@@ -224,11 +205,33 @@
                     <useStandardDocletOptions>true</useStandardDocletOptions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <additionalparam>-Xdoclint:none</additionalparam>
+                </configuration>
+            </plugin>
         </plugins>
     </reporting>
 
     <!-- Start of ONAP Specific Repositories -->
     <repositories>
+        <repository>
+            <id>Log4j</id>
+            <name>Log4J repository</name>
+            <url>https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j</url>
+        </repository>
         <repository>
             <id>AJSC</id>
             <name>AJSC repository</name>
@@ -239,12 +242,6 @@
             <name>maven reslet</name>
             <url>https://maven.restlet.com/</url>
         </repository>
-
-        <repository>
-            <id>central</id>
-            <name>Maven 2 repository 2</name>
-            <url>http://repo2.maven.org/maven2/</url>
-        </repository>
         <repository>
             <id>ecomp-releases</id>
             <name>ECOMP Release Repository</name>
@@ -258,3 +255,4 @@
     </repositories>
     <!-- End of ONAP Specific Repositories -->
 </project>
+<!-- noop for release -->