X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=965168efff325b7ed8d13abecd62cae4326288dd;hb=refs%2Fchanges%2F53%2F16453%2F3;hp=f82cd3dfbd265bbf89bf4c6d8d969d4c09c3c053;hpb=a9320e7933bc04954264d9f3f34b9cb904b61353;p=aai%2Faai-common.git

diff --git a/pom.xml b/pom.xml
index f82cd3df..965168ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,30 +1,36 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
-  <groupId>org.onap.aai.aai-common</groupId>
-  <artifactId>aai-common</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>aai-common</name>
-  
-  <modules>
-  	<module>aai-schema</module>
-  	<module>aai-annotations</module>
-  	<module>aai-core</module>
-	<module>aai-auth</module>
-  </modules>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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>
+        <artifactId>oparent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
 
-	<properties>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<sitePath>/content/sites/site/org/onap/aai/aai-common/${project.artifactId}/${project.version}</sitePath>
-		<aai.annotations.version>1.1.0-SNAPSHOT</aai.annotations.version>
-		<aai.schema.version>1.1.0-SNAPSHOT</aai.schema.version>
-		<aai.core.version>1.1.0-SNAPSHOT</aai.core.version>
-	</properties>
+    <groupId>org.onap.aai.aai-common</groupId>
+    <artifactId>aai-common</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>aai-aai-common</name>
+    <description>Contains all of the common code for resources and traversal repos</description>
 
-  <build>
+    <modules>
+        <module>aai-schema</module>
+        <module>aai-annotations</module>
+        <module>aai-core</module>
+        <module>aai-auth</module>
+	    <module>aai-utils</module>
+    </modules>
+
+    <properties>
+        <sitePath>/content/sites/site/org/onap/aai/aai-common/${project.artifactId}/${project.version}</sitePath>
+	<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+        <aai.annotations.version>1.1.0-SNAPSHOT</aai.annotations.version>
+        <aai.schema.version>1.1.0-SNAPSHOT</aai.schema.version>
+        <aai.core.version>1.1.0-SNAPSHOT</aai.core.version>
+    </properties>
+
+    <build>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -36,121 +42,138 @@
                     </configuration>
                 </plugin>
                 <plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>license-maven-plugin</artifactId>
-					<version>1.12</version>
-					<configuration>
-						<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-						<licenseName>apache_v2</licenseName>
-						<inceptionYear>2017</inceptionYear>
-						<organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
-						<projectName>org.openecomp.aai</projectName>
-						<canUpdateCopyright>true</canUpdateCopyright>
-						<canUpdateDescription>true</canUpdateDescription>
-						<canUpdateLicense>true</canUpdateLicense>
-						<emptyLineAfterHeader>true</emptyLineAfterHeader>
-						<processStartTag>============LICENSE_START=======================================================</processStartTag>
-						<processEndTag>============LICENSE_END=========================================================</processEndTag>
-						<sectionDelimiter>================================================================================</sectionDelimiter>
-						<includes>
-							<include>**/*.java</include>
-							<include>**/*.ksh</include>
-							<include>**/*.sh</include>
-							<include>**/*.ftl</include>
-							<include>**/*.xsd</include>
-							<include>**/*.xjb</include>
-							<include>**/aai*.xml</include>
-							<include>**/*logback*.xml</include>
-							<include>**/*aaiconfig*.properties</include>
-							<include>**/*titan*.properties</include>
-						</includes>
-						<excludes>
-							<exclude>ecomp-auth/*</exclude>
-						</excludes>
-					</configuration>
-					<executions>
-						<execution>
-							<id>first</id> 
-							<goals>
-								<goal>update-file-header</goal>
-							</goals>
-							<phase>process-sources</phase>
-						</execution>
-					</executions>
-				</plugin>
-        <plugin>
-    		<groupId>org.apache.maven.plugins</groupId>
-    		<artifactId>maven-deploy-plugin</artifactId>
-    		<executions>
-        		<execution>
-            		<id>default-deploy</id>
-            		<phase>none</phase>
-        		</execution>
-   			</executions>
-		</plugin>        
-		<plugin>
-		    <groupId>org.sonatype.plugins</groupId>
-		    <artifactId>nexus-staging-maven-plugin</artifactId>
-		    <version>1.6.7</version>
-		    <extensions>true</extensions>
-		    <configuration>
-			<nexusUrl>${nexusproxy}</nexusUrl>
-			<stagingProfileId>176c31dfe190a</stagingProfileId>
-			<serverId>ecomp-staging</serverId>
-		    </configuration>
-		</plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                    <executions>
+                        <execution>
+                            <id>default-deploy</id>
+                            <phase>none</phase>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.sonatype.plugins</groupId>
+                    <artifactId>nexus-staging-maven-plugin</artifactId>
+                    <version>1.6.7</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <nexusUrl>${onap.nexus.url}</nexusUrl>
+                        <stagingProfileId>176c31dfe190a</stagingProfileId>
+                        <serverId>ecomp-staging</serverId>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
-	<plugins>
-		<plugin>
-		  <groupId>org.apache.maven.plugins</groupId>
-		  <artifactId>maven-site-plugin</artifactId>
-		  <version>3.6</version>
-		  <dependencies>
-		    <dependency>
-		      <groupId>org.apache.maven.wagon</groupId>
-		      <artifactId>wagon-webdav-jackrabbit</artifactId>
-		      <version>2.10</version>
-		    </dependency>
-		  </dependencies>
-		</plugin>
-	</plugins>
+        <plugins>
+            <plugin>
+                <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>
+                        <artifactId>wagon-webdav-jackrabbit</artifactId>
+                        <version>2.10</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
     </build>
 
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>ECOMP Release Repository</name>
-			<url>${nexusproxy}/content/repositories/releases/</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>ECOMP Snapshot Repository</name>
-			<url>${nexusproxy}/content/repositories/snapshots/</url>
-		</snapshotRepository>
-		<site>
-			<id>ecomp-site</id>
-			<url>dav:${nexusproxy}${sitePath}</url>
-		</site>
-	</distributionManagement>
-	<reporting>
-	  <plugins>
-	    <plugin>
-	      <groupId>org.apache.maven.plugins</groupId>
-	      <artifactId>maven-javadoc-plugin</artifactId>
-	      <version>2.10.4</version>
-	      <configuration>
-	        <failOnError>false</failOnError>
-	        <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-	        <docletArtifact>
-	          <groupId>org.umlgraph</groupId>
-	          <artifactId>umlgraph</artifactId>
-	          <version>5.6</version>
-	        </docletArtifact>
-	        <additionalparam>-views</additionalparam>
-	        <useStandardDocletOptions>true</useStandardDocletOptions>
-	      </configuration>
-	    </plugin>
-	  </plugins>
-	</reporting>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>ECOMP Release Repository</name>
+            <url>${onap.nexus.url}/content/repositories/releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>ECOMP Snapshot Repository</name>
+            <url>${onap.nexus.url}/content/repositories/snapshots/</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${onap.nexus.url}${sitePath}</url>
+        </site>
+    </distributionManagement>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+                    <docletArtifact>
+                        <groupId>org.umlgraph</groupId>
+                        <artifactId>umlgraph</artifactId>
+                        <version>5.6</version>
+                    </docletArtifact>
+                    <additionalparam>-views -Xdoclint:none</additionalparam>
+                    <excludePackageNames>org.onap.aai.domain.yang.*:org.onap.aai.util.*</excludePackageNames>
+                    <useStandardDocletOptions>true</useStandardDocletOptions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <repositories>
+        <repository>
+            <id>AJSC</id>
+            <name>AJSC repository</name>
+            <url>https://mvnrepository.com/artifact/com.att.ajsc</url>
+        </repository>
+        <repository>
+            <id>restlet</id>
+            <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>
+            <url>${onap.nexus.url}/content/repositories/releases/</url>
+        </repository>
+        <repository>
+            <id>ecomp-staging</id>
+            <name>ECOMP Staging Repository</name>
+            <url>${onap.nexus.url}/content/repositories/staging/</url>
+        </repository>
+        <repository>
+            <id>ecomp-snapshots</id>
+            <name>ECOMP Snapshot Repository</name>
+            <url>${onap.nexus.url}/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
 </project>