X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=asdc-controller%2Fpom.xml;h=50fbdd447b0578b61b44cae2239833bd3e0d085a;hb=e2a3995dd8dba9b9a18635ce37e4805dadcdb0fd;hp=94a8dd52491e5d9a0e5c3c20e0789eb7ec9e7385;hpb=ecc98a038909d1f9f18753706b77178f14abd8b4;p=so.git

diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index 94a8dd5249..50fbdd447b 100644
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -4,90 +4,184 @@
 	<parent>
 		<groupId>org.onap.so</groupId>
 		<artifactId>so</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
+		<version>1.4.0-SNAPSHOT</version>
+	</parent>                  
 
+	<groupId>org.onap.so</groupId>
 	<artifactId>asdc-controller</artifactId>
 	<name>asdc-controller</name>
 	<description>ASDC CLient and Controller</description>
-	<packaging>war</packaging>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<antlr.version>4.7.1</antlr.version>
+		<java.version>1.8</java.version>
+	</properties>
 
 	<build>
 		<finalName>${project.artifactId}-${project.version}</finalName>
 		<plugins>
 			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.4</version>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.7.7.201606060606</version>
+				 <configuration>
+                     <excludes>                        
++                        <exclude>**/resource-examples/**</exclude>
+                     </excludes>
+                 </configuration>
+				<executions>
+					<execution>
+						<id>default-prepare-agent</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>default-report</id>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>default-check</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<rule implementation="org.jacoco.maven.RuleConfiguration">
+									<element>BUNDLE</element>
+									<limits>
+										<limit implementation="org.jacoco.report.check.Limit">
+											<counter>INSTRUCTION</counter>
+											<value>COVEREDRATIO</value>											
+										</limit>
+									</limits>
+								</rule>
+							</rules>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.antlr</groupId>
+				<artifactId>antlr4-maven-plugin</artifactId>
+				<version>${antlr.version}</version>
+				<executions>
+					<execution>
+						<id>antlr</id>
+						<phase>generate-test-resources</phase>
+						<goals>
+							<goal>antlr4</goal>
+						</goals>
+						<configuration>
+							<visitor>true</visitor>
+							<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-testCompile</id>
+						<phase>test-compile</phase>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+						<configuration>
+							<generatedTestSourcesDirectory>${project.build.directory}/generated-sources</generatedTestSourcesDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
-					<warSourceDirectory>WebContent</warSourceDirectory>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<attachClasses>true</attachClasses>
-				</configuration>
+                    <mainClass>org.onap.so.asdc.Application</mainClass>
+                </configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>extract-docker-file</id>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>fabric8-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>start</id>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>					
+					<execution>
+						<id>original</id>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
-
 	<dependencies>
-        	<dependency>
-                	<groupId>org.jmockit</groupId>
-                	<artifactId>jmockit</artifactId>
-                	<version>1.8</version>
-                	<scope>test</scope>
-        	</dependency>  
 		<dependency>
-			<groupId>org.onap.so</groupId>
-			<artifactId>mso-catalog-db</artifactId>
-			<version>${project.version}</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.jboss.spec.javax.ejb</groupId>
-			<artifactId>jboss-ejb-api_3.2_spec</artifactId>
-			<version>1.0.0.Final</version>
-			<scope>provided</scope>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-jersey2-jaxrs</artifactId>
+			<version>1.5.16</version>
 		</dependency>
 		<dependency>
-			<groupId>org.jboss.ejb3</groupId>
-			<artifactId>jboss-ejb3-ext-api</artifactId>
-			<version>2.2.0.Final</version>
-			<scope>provided</scope>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jersey</artifactId>
 		</dependency>
-
 		<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>javax.servlet-api</artifactId>
-				<version>3.1.0</version>
-				<scope>test</scope>
-		</dependency>
-		
-	<!-- 	<dependency>
-  				<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
-  				<artifactId>sdc-distribution-client</artifactId>
-  				<version>1.1.16</version>
-  				<exclusions>
-       		 		<exclusion>  
-	         	 		<groupId>org.slf4j</groupId>
-	         	 		<artifactId>slf4j-log4j12</artifactId>
-       		 		</exclusion>
-    	  		</exclusions> 
-		</dependency>  -->
-		
-		<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpclient</artifactId>
-				<scope>compile</scope>
-				<exclusions>
-       		 		<exclusion>  
-	         	 		<groupId>org.apache.httpcomponents</groupId>
-	         	 		<artifactId>httpclient</artifactId>
-       		 		</exclusion>
-    	  		</exclusions>
-		</dependency>
-		
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.tomcat</groupId>
+					<artifactId>tomcat-jdbc</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>	
+		<dependency>
+			<groupId>org.onap.so</groupId>
+			<artifactId>mso-catalog-db</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 	 	<dependency>
-  			<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+  			<groupId>org.onap.sdc.sdc-distribution-client</groupId>
   			<artifactId>sdc-distribution-client</artifactId>
- 			 <version>1.2.2</version>
+ 			 <version>1.3.0</version>
  			<exclusions>
        		 	<exclusion>  
 	         	 	<groupId>org.slf4j</groupId>
@@ -95,56 +189,24 @@
        		 	</exclusion>
     	  </exclusions>
 		</dependency>
-
-
 		<dependency>
-			<!-- This version should be upgraded in Beijing -->
-  			<groupId>org.openecomp.sdc.sdc-tosca</groupId>
-  			<artifactId>sdc-tosca</artifactId>
-  			<version>1.2.3</version>
-			<exclusions>
-				<exclusion>  
-					<groupId>org.openecomp.sdc.jtosca</groupId>
-					<artifactId>jtosca</artifactId>
-  					<!-- <version>1.2.2-SNAPSHOT</version> -->
-				</exclusion>
-			</exclusions>
+  			<groupId>org.onap.sdc.sdc-tosca</groupId>
+			<artifactId>sdc-tosca</artifactId>
+			<version>1.4.8</version>
 		</dependency> 
-		<dependency>  
-			<!-- When the sdc-tosca version is upgraded from 1.2.3,
-			     this dependency should be removed entirely -->
-			<groupId>org.openecomp.sdc.jtosca</groupId>
-			<artifactId>jtosca</artifactId>
-  			<version>1.2.1</version>
-		</dependency>
-
 		<dependency>
-		    <groupId>org.apache.httpcomponents</groupId>
-		    <artifactId>httpmime</artifactId>
-		    <version>4.5</version>
-		</dependency>
-
+  			<groupId>org.onap.sdc.jtosca</groupId>
+  			<artifactId>jtosca</artifactId>
+  			<version>1.4.8</version>
+		</dependency> 
 		<dependency>
 			<groupId>org.onap.so</groupId>
 			<artifactId>common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>org.yaml</groupId>
-			<artifactId>snakeyaml</artifactId>
-			<version>1.15</version>
-		</dependency>
-
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-web-api</artifactId>
-			<version>6.0</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.onap.so</groupId>
-			<artifactId>status-control</artifactId>
+			<artifactId>mso-api-handler-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -155,7 +217,49 @@
 			<groupId>org.onap.so</groupId>
 			<artifactId>mso-requests-db</artifactId>
 			<version>${project.version}</version>
+		</dependency>		
+		<dependency>
+			<groupId>org.onap.so</groupId>
+			<artifactId>mso-requests-db-repositories</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.antlr</groupId>
+			<artifactId>antlr4</artifactId>
+			<version>${antlr.version}</version>
+			<scope>test</scope>
+			</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+		</dependency>		
+		<dependency>
+            <groupId>ch.vorburger.mariaDB4j</groupId>
+            <artifactId>mariaDB4j</artifactId>
+            <version>2.2.3</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-wiremock</artifactId>
+			<version>1.2.4.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-core</artifactId>		
+		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-prometheus</artifactId>			
+		</dependency>
+		<dependency>
+			<groupId>javax.interceptor</groupId>
+			<artifactId>javax.interceptor-api</artifactId>
 		</dependency>
 	</dependencies>
-
 </project>