Add v12 api changes for the new release code

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

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 4d6fad6..37edc5b 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -6,20 +6,22 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-core</artifactId>
     <name>aai-core</name>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
-        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+       <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <sonar.language>java</sonar.language>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
         <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
         <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
-        <gendoc.version>v11</gendoc.version>
+        <sonar.exclusions>org/onap/aai/domain/**</sonar.exclusions>
+        <gendoc.version>v12</gendoc.version>
         <aai.wiki.link>https://wiki.onap.org/</aai.wiki.link>
         <hbase.version>1.0.2</hbase.version>
     </properties>
@@ -39,7 +41,7 @@
                                     <goal>java</goal>
                                 </goals>
                                 <configuration>
-                                    <mainClass>org.openecomp.aai.util.GenerateXsd</mainClass>
+                                    <mainClass>org.onap.aai.util.GenerateXsd</mainClass>
                                     <systemProperties>
                                         <systemProperty>
                                             <key>gen_version</key>
@@ -80,7 +82,7 @@
                                     <goal>java</goal>
                                 </goals>
                                 <configuration>
-                                    <mainClass>org.openecomp.aai.util.GenerateXsd</mainClass>
+                                    <mainClass>org.onap.aai.util.GenerateXsd</mainClass>
                                     <systemProperties>
                                         <systemProperty>
                                             <key>gen_version</key>
@@ -121,7 +123,7 @@
                                     <goal>java</goal>
                                 </goals>
                                 <configuration>
-                                    <mainClass>org.openecomp.aai.util.swagger.GenerateSwagger</mainClass>
+                                    <mainClass>org.onap.aai.util.swagger.GenerateSwagger</mainClass>
                                     <systemProperties>
                                         <property>
                                             <key>aai.generate.version</key>
@@ -144,7 +146,7 @@
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-schema</artifactId>
-            <version>${aai.schema.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
@@ -326,11 +328,6 @@
             <artifactId>xml-apis</artifactId>
             <version>1.0.b2</version>
         </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
@@ -423,11 +420,6 @@
             <artifactId>freemarker</artifactId>
             <version>2.3.14</version>
         </dependency>
-        <dependency>
-            <groupId>com.bazaarvoice.jolt</groupId>
-            <artifactId>jolt-complete</artifactId>
-            <version>0.0.24</version>
-        </dependency>
         <dependency>
             <groupId>com.github.fge</groupId>
             <artifactId>json-patch</artifactId>
@@ -437,6 +429,12 @@
             <groupId>com.att.nsa</groupId>
             <artifactId>dmaapClient</artifactId>
             <version>0.2.12</version>
+            <exclusions>
+                               <exclusion>
+                                       <groupId>com.att.aft</groupId>
+                                       <artifactId>dme2</artifactId>
+                               </exclusion>
+                       </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
@@ -464,6 +462,9 @@
                 <version>0.7.7.201606060606</version>
                 <configuration>
                     <dumpOnExit>true</dumpOnExit>
+                    <excludes>
+                        <exclude>**/domain/**</exclude>
+                    </excludes>
                 </configuration>
                 <executions>
                     <execution>
@@ -482,10 +483,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -509,13 +506,6 @@
         </plugins>
     </build>
 
-    <distributionManagement>
-        <site>
-            <id>ecomp-site</id>
-            <url>dav:${onap.nexus.url}${sitePath}</url>
-        </site>
-    </distributionManagement>
-
     <!-- Plugins and repositories -->
     <pluginRepositories>
         <pluginRepository>