X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=955ce588618a4215b6cf3aa73c7fca1d15d6beca;hb=0eb7bd9264c4fb537ada19f02fd8047447b1a9d2;hp=11c6a35ba4be12c875a9cca644a89ee6650001ff;hpb=8d5d886f9290aec88300cd8daf4cbada292dcfbf;p=aai%2Fmodel-loader.git

diff --git a/pom.xml b/pom.xml
index 11c6a35..955ce58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,23 +17,71 @@
      limitations under the License.
      ============LICENSE_END=========================================================
    -->
-
 <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.openecomp.aai.model-loader</groupId>
+
+	<parent>
+		<artifactId>ajsc-archetype-parent</artifactId>
+		<groupId>com.att.ajsc</groupId>
+		<version>2.0.0</version>
+	</parent>
+
+	<groupId>org.onap.aai.model-loader</groupId>
 	<artifactId>model-loader</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>war</packaging>
-	
+	<version>1.2.0-SNAPSHOT</version>
+	<name>aai-model-loader</name>
+
 	<properties>
 		<docker.location>${basedir}/target</docker.location>
+		<module.ajsc.namespace.name>model-loader</module.ajsc.namespace.name>
+		<module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
+		<ajscRuntimeVersion>2.0.0</ajscRuntimeVersion>
+		<absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot>
+		<distFilesRoot>/appl/${project.artifactId}/${project.version}</distFilesRoot>
+		<runAjscHome>${basedir}/target/swm/package/nix/dist_files${distFilesRoot}</runAjscHome>
+
+		<!-- Port Selection. A value of 0 will allow for dynamic port selection. 
+			For local testing, you may choose to hardcode this value to something like 
+			8080 -->
+		<serverPort>0</serverPort>
+		<sslport>0</sslport>
+
+
+		<!-- For SOA Cloud Installation -->
+		<installOwnerUser>aaiadmin</installOwnerUser>
+		<installOwnerGroup>aaiadmin</installOwnerGroup>
+		<ownerManagementGroup>org.openecomp.aai.dev</ownerManagementGroup>
+
+		<testRouteOffer>workstation</testRouteOffer>
+		<testEnv>DEV</testEnv>
+
 		<dependency.scope>provided</dependency.scope>
 		<checkstyle.config.location>google_checks.xml</checkstyle.config.location>
 		<maven.compiler.source>1.8</maven.compiler.source>
-    	<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<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>
+		<nexusproxy>https://nexus.onap.org</nexusproxy>
 	</properties>
 
+	<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>
+	</distributionManagement>
+	
 	<dependencies>
 		<dependency>
 			<groupId>org.mockito</groupId>
@@ -53,17 +101,17 @@
 			<version>1.6.2</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-javaagent</artifactId>
-			<version>1.6.2</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-module-junit4-rule-agent</artifactId>
 			<version>1.6.2</version>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>powermock-module-javaagent</artifactId>
+					<groupId>org.powermock</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- xjc dependencies -->
 		<dependency>
@@ -99,78 +147,196 @@
 		</dependency>
 		<!-- Common logging framework -->
 		<dependency>
-			<groupId>org.openecomp.aai.logging-service</groupId>
+			<groupId>org.onap.aai.logging-service</groupId>
 			<artifactId>common-logging</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>1.1.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+			<artifactId>sdc-distribution-client</artifactId>
+			<version>1.1.32</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.sdc</groupId>
-		    <artifactId>sdc-distribution-client</artifactId>
-			<version>0.9.0</version>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
 			<version>20131018</version>
 		</dependency>
-		
 		<dependency>
-		    <groupId>org.eclipse.jetty</groupId>
-		    <artifactId>jetty-security</artifactId>
-		    <version>9.3.8.RC0</version>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-security</artifactId>
+			<version>9.3.8.RC0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>4.0.0.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>jline</groupId>
+			<artifactId>jline</artifactId>
+			<version>2.12.1</version>
 		</dependency>
-		
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>4.0.0.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
-            <version>2.12.1</version>
-        </dependency>
-        
 	</dependencies>
-	
-	<!-- Plugins and repositories -->
-          <pluginRepositories>
-                <pluginRepository>
-                           <id>central</id>
-                          <url>http://repo1.maven.org/maven2</url>
-                   </pluginRepository>
-                  <pluginRepository>
-                          <id>EvoSuite</id>
-                        <name>EvoSuite Repository</name>
-                         <url>http://www.evosuite.org/m2</url>
-                  </pluginRepository>
-          </pluginRepositories>
-           <repositories>
-                   <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>https://nexus.openecomp.org/content/repositories/releases/</url>
-                  </repository>
-                  <repository>
-                         <id>ecomp-snapshots</id>
-                          <name>ECOMP Snapshot Repository</name>
-                         <url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
-                          <snapshots>
-            <updatePolicy>always</updatePolicy>
-        </snapshots>
-        <releases>
-            <updatePolicy>always</updatePolicy>
-        </releases>
-                  </repository>
 
-          </repositories>
-	
+	<!-- Plugins and repositories -->
+	<pluginRepositories>
+		<pluginRepository>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>EvoSuite</id>
+			<name>EvoSuite Repository</name>
+			<url>http://www.evosuite.org/m2</url>
+		</pluginRepository>
+	</pluginRepositories>
 	
+	<repositories>
+		<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>${nexusproxy}/content/repositories/releases/</url>
+		</repository>
+		<repository>
+			<id>ecomp-snapshots</id>
+			<name>ECOMP Snapshot Repository</name>
+			<url>${nexusproxy}/content/repositories/snapshots/</url>
+		</repository>
+		<repository>
+			<id>ecomp-staging</id>
+			<name>ECOMP Staging Repository</name>
+			<url>${nexusproxy}/content/repositories/staging/</url>
+		</repository>
+	</repositories>
+
+	<profiles>
+		<profile>
+			<id>runAjsc</id>
+			<build>
+				<defaultGoal>initialize</defaultGoal>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>1.3.2</version>
+						<executions>
+							<execution>
+								<phase>initialize</phase>
+								<goals>
+									<goal>java</goal>
+								</goals>
+								<configuration>
+									<includeProjectDependencies>false</includeProjectDependencies>
+									<includePluginDependencies>true</includePluginDependencies>
+									<executable>java</executable>
+									<mainClass>com.att.ajsc.runner.Runner</mainClass>
+									<executableDependency>
+										<groupId>com.att.ajsc</groupId>
+										<artifactId>ajsc-runner</artifactId>
+									</executableDependency>
+									<additionalClasspathElements>
+										<additionalClasspathElement>${basedir}/ajsc-shared-config/etc</additionalClasspathElement>
+									</additionalClasspathElements>
+
+									<environmentVariables>
+										<AJSC_HOME>${runAjscHome}</AJSC_HOME>
+									</environmentVariables>
+
+									<!-- Main AJSC System Properties below (necessary for proper startup) -->
+									<systemProperties>
+										<systemProperty>
+											<key>AJSC_HOME</key>
+											<value>${runAjscHome}</value>
+										</systemProperty>
+										<systemProperty>
+											<key>CONFIG_HOME</key>
+											<value>${basedir}/appconfig-local/</value>
+										</systemProperty>
+										<systemProperty>
+											<key>AJSC_CONF_HOME</key>
+											<value>${basedir}/bundleconfig-local</value>
+										</systemProperty>
+										<systemProperty>
+											<key>logback.configurationFile</key>
+											<value>${basedir}/ajsc-shared-config/etc/logback.xml</value>
+										</systemProperty>
+										<systemProperty>
+											<key>AJSC_SHARED_CONFIG</key>
+											<value>${basedir}/ajsc-shared-config</value>
+										</systemProperty>
+
+										<sysproperty>
+											<key>AJSC_EXTERNAL_LIB_FOLDERS</key>
+											<value>${basedir}/target/commonLibs</value>
+										</sysproperty>
+										<sysproperty>
+											<key>AJSC_EXTERNAL_PROPERTIES_FOLDERS</key>
+											<value>${basedir}/ajsc-shared-config/etc</value>
+										</sysproperty>
+										<systemProperty>
+											<key>AJSC_SERVICE_NAMESPACE</key>
+											<value>${module.ajsc.namespace.name}</value>
+										</systemProperty>
+										<systemProperty>
+											<key>AJSC_SERVICE_VERSION</key>
+											<value>${module.ajsc.namespace.version}</value>
+										</systemProperty>
+										<systemProperty>
+											<key>SOACLOUD_SERVICE_VERSION</key>
+											<value>${project.version}</value>
+										</systemProperty>
+										<systemProperty>
+											<key>server.port</key>
+											<value>${serverPort}</value>
+										</systemProperty>
+									</systemProperties>
+
+									<!-- Command Line Arguments to add to the java command. Here, you 
+										can specify the port as well as the Context you want your service to run 
+										in. Use context=/ to run in an unnamed Context (Root Context). The default 
+										configuration of the AJSC is to run under the / Context. Setting the port 
+										here can aid during the development phase of your service. However, you can 
+										leave this argument out entirely, and the AJSC will default to using an Ephemeral 
+										port. -->
+									<arguments>
+										<argument>context=//</argument>
+										<argument>port=${serverPort}</argument>
+										<argument>sslport=${sslport}</argument>
+									</arguments>
+								</configuration>
+							</execution>
+						</executions>
+						<configuration>
+							<executable>java</executable>
+						</configuration>
+						<dependencies>
+							<dependency>
+								<groupId>com.att.ajsc</groupId>
+								<artifactId>ajsc-runner</artifactId>
+								<version>${ajscRuntimeVersion}</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -195,6 +361,9 @@
 										<include>**/*</include>
 									</includes>
 								</resource>
+								<resource>
+									<directory>${basedir}/src/main/bin/</directory>
+								</resource>
 							</resources>
 						</configuration>
 					</execution>
@@ -204,12 +373,12 @@
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
 				<version>0.4.11</version>
-				<configuration>		
-					<serverId>nexus3.openecomp.org:10003</serverId>
-					<imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>					
+				<configuration>
+					<verbose>true</verbose>
+					<serverId>docker-hub</serverId>
+					<imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
 					<dockerDirectory>${docker.location}</dockerDirectory>
 					<imageTags>
-						<imageTag>${docker.imagetag}</imageTag>
 						<imageTag>latest</imageTag>
 					</imageTags>
 					<forceTags>true</forceTags>
@@ -218,7 +387,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.5.1</version>
+				<version>2.8</version>
 				<executions>
 					<execution>
 						<id>copy-agent</id>
@@ -245,8 +414,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.12.4</version>
 				<configuration>
-					<argLine>-javaagent:${project.build.directory}/agents/powermock-javaagent.jar
-						-noverify</argLine>
+					<argLine>-noverify ${argLine}</argLine>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -275,7 +443,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version>
 			</plugin>
-		
+
 			<!-- Checkstyle plugin - used to report on compliance with -->
 			<!-- the Google style guide. -->
 			<plugin>
@@ -299,61 +467,74 @@
 					</reportPlugins>
 				</configuration>
 			</plugin>
-                        
-            <!-- license plugin -->
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>license-maven-plugin</artifactId>
-              <version>1.10</version>
-              <configuration>
-                <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-                <excludes>
-                  <exclude>**.json</exclude>
-                  <exclude>**.properties</exclude>
-                </excludes>
-                <processStartTag>============LICENSE_START=======================================================</processStartTag>
-                <processEndTag>============LICENSE_END=========================================================</processEndTag>
-                <sectionDelimiter>================================================================================</sectionDelimiter>
-                <licenseName>apache_v2</licenseName>
-                <inceptionYear>2017</inceptionYear>
-                <organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
-                <projectName>MODEL LOADER SERVICE</projectName>
-                <canUpdateCopyright>true</canUpdateCopyright>
-                <canUpdateDescription>true</canUpdateDescription>
-                <canUpdateLicense>true</canUpdateLicense>
-                <emptyLineAfterHeader>true</emptyLineAfterHeader>
-                <roots>
-                  <root>.</root>
-                </roots>
-                <excludes>
-                  <exclude>**/*.json</exclude>
-                </excludes>
-                <extraExtensions>
-                  <route>xml</route>
-                  <props>properties</props>
-                  <xsd>xml</xsd>
-                  <txt>java</txt>
-                </extraExtensions>
-              </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>             	
-             	<configuration>
-             	<skip>true</skip>
-             	</configuration>
-             </plugin>
-		</plugins>		
+
+			<!-- license plugin -->
+			<plugin>
+				<groupId>com.mycila</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>3.0</version>
+				<configuration>
+					<header>License.txt</header>
+					<includes>
+						<include>src/main/java/**</include>
+						<include>src/test/java/**</include>
+					</includes>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>format</goal>
+						</goals>
+						<phase>process-sources</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>sonar-maven-plugin</artifactId>
+				<version>3.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.7.7.201606060606</version>
+				<configuration>
+					<dumpOnExit>true</dumpOnExit>
+				</configuration>
+				<executions>
+					<execution>
+						<id>jacoco-initialize-unit-tests</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+							<!-- <append>true</append> -->
+						</configuration>
+					</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>
+
+		</plugins>
 	</build>
-	
-	
+
 </project>