From a339f93a736c9503888d05e47d79b173229042fc Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Tue, 5 Mar 2019 16:56:09 -0500
Subject: improvements to audit inventory feature

Adjust test data to add tenant mapping
Remove unused unit test already renamed
Update logic, to pass hostname not pservername
remove unused file that has been refactored
Add project to ignore, remove class
Address issues in comments on pull request
Remove logging that is not needed, used
UPdate BPMN to use Boolean Value, change timings
Adjust BPMN to not hit deadlock scenario
put error message in execution before checking rollback
- removed extra code for vnf resource processing found in onap
environment.
Fix improper use of inclusive gateway causing deadlock
Fix flakey unit tests from ONAP
Remove qualifier on bean, as it breaks callbacks
Adjust pom version of external camunda client
Fix polling timers to be more reasonable
Updated Junit test for delete vf module in onap.
Changed auditInventoryNeeded variable to a boolean to prevent
bpmn from erroring out in the event this variable is not found
on the execution.
Update logic to support writing of self link

Change-Id: I2f784a0a58a09f303775282c9be6019031668570
Issue-ID: SO-1597
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 adapters/mso-openstack-adapters/pom.xml | 142 +++++++++++++++++++++-----------
 1 file changed, 96 insertions(+), 46 deletions(-)

(limited to 'adapters/mso-openstack-adapters/pom.xml')

diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml
index f2f411d5b6..cb35e90860 100644
--- a/adapters/mso-openstack-adapters/pom.xml
+++ b/adapters/mso-openstack-adapters/pom.xml
@@ -13,8 +13,8 @@
 
 	<build>
 		<finalName>${project.artifactId}-${project.version}</finalName>
-
-		<plugins>
+		
+		<plugins>			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -36,25 +36,75 @@
 				</executions>
 			</plugin>
 
-			<!-- run the following plugin only when there's a wsdl change and you 
-				need to recompile the java classes <plugin> <groupId>org.codehaus.mojo</groupId> 
-				<artifactId>jaxws-maven-plugin</artifactId> <version>2.4.1</version> <executions> 
-				<execution> <id>generate-network-async-stubs</id> <phase>process-classes</phase> 
-				<goals> <goal>wsimport</goal> </goals> <configuration> <vmArgs> <vmArg>-Djavax.xml.accessExternalSchema=all</vmArg> 
-				</vmArgs> <wsdlDirectory>src/main/resources/wsdl</wsdlDirectory> <wsdlFiles> 
-				<wsdlFile>NetworkAdapterNotify.wsdl</wsdlFile> </wsdlFiles> <wsdlLocation>/NetworkAdapterNotify.wsdl</wsdlLocation> 
-				<packageName>org.onap.so.adapters.network.async.client</packageName> <xnocompile>false</xnocompile> 
-				<keep>true</keep> </configuration> </execution> <execution> <id>generate-vnf-async-stubs</id> 
-				<phase>process-classes</phase> <goals> <goal>wsimport</goal> </goals> <configuration> 
-				<vmArgs> <vmArg>-Djavax.xml.accessExternalSchema=all</vmArg> </vmArgs> <wsdlDirectory>src/main/resources/wsdl</wsdlDirectory> 
-				<wsdlFiles> <wsdlFile>VnfAdapterNotify.wsdl</wsdlFile> </wsdlFiles> <wsdlLocation>/VnfAdapterNotify.wsdl</wsdlLocation> 
-				<packageName>org.onap.so.adapters.vnf.async.client</packageName> <xnocompile>false</xnocompile> 
-				<keep>true</keep> </configuration> </execution> </executions> </plugin> <plugin> 
-				<groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> 
-				<version>3.0.0</version> <executions> <execution> <id>add-source</id> <phase>generate-sources</phase> 
-				<goals> <goal>add-source</goal> </goals> <configuration> <sources> <source>${project.build.directory}/generated-sources/wsimport/</source> 
-				</sources> </configuration> </execution> </executions> </plugin> -->
+<!--  run the following plugin only when there's a wsdl change and you need to recompile the java classes
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jaxws-maven-plugin</artifactId>
+				<version>2.4.1</version>
+				<executions>
+					<execution>
+						<id>generate-network-async-stubs</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>wsimport</goal>
+						</goals>
+						<configuration>
+                            <vmArgs>
+                                <vmArg>-Djavax.xml.accessExternalSchema=all</vmArg>
+                            </vmArgs>
+							<wsdlDirectory>src/main/resources/wsdl</wsdlDirectory>
+							<wsdlFiles>
+								<wsdlFile>NetworkAdapterNotify.wsdl</wsdlFile>
+							</wsdlFiles>
+							<wsdlLocation>/NetworkAdapterNotify.wsdl</wsdlLocation>
+							<packageName>org.onap.so.adapters.network.async.client</packageName>
+							<xnocompile>false</xnocompile>
+							<keep>true</keep>
+						</configuration>
+					</execution>
+					
+					<execution>
+						<id>generate-vnf-async-stubs</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>wsimport</goal>
+						</goals>
+						<configuration>
+					        <vmArgs>
+					            <vmArg>-Djavax.xml.accessExternalSchema=all</vmArg>
+					        </vmArgs>
+							<wsdlDirectory>src/main/resources/wsdl</wsdlDirectory>
+							<wsdlFiles>
+								<wsdlFile>VnfAdapterNotify.wsdl</wsdlFile>
+							</wsdlFiles>
+							<wsdlLocation>/VnfAdapterNotify.wsdl</wsdlLocation>
+							<packageName>org.onap.so.adapters.vnf.async.client</packageName>
+							<xnocompile>false</xnocompile>
+							<keep>true</keep>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
+			    <groupId>org.codehaus.mojo</groupId>
+			    <artifactId>build-helper-maven-plugin</artifactId>
+			    <version>3.0.0</version>
+			    <executions>
+			        <execution>
+			            <id>add-source</id>
+			            <phase>generate-sources</phase>
+			            <goals>
+			                <goal>add-source</goal>
+			            </goals>
+			            <configuration>
+			                <sources>
+			                    <source>${project.build.directory}/generated-sources/wsimport/</source>
+			                </sources>
+			            </configuration>
+			        </execution>
+			    </executions>
+			 </plugin>			
+ -->		<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
 			</plugin>
@@ -76,12 +126,12 @@
 					</execution>
 				</executions>
 			</plugin>
-		</plugins>
-
-
+		</plugins>		
+		
+		
 		<pluginManagement>
 			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
+				<!--This plugin's configuration is used to store Eclipse m2e settings
 					only. It has no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
@@ -118,10 +168,10 @@
 	</build>
 
 	<dependencies>
-		<!-- added for spring boot support -->
+	<!-- added for spring boot support -->	
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
+    		<groupId>org.springframework.boot</groupId>
+    		<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -134,7 +184,7 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
-			<version>${cxf.version}</version>
+   		 	<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
@@ -142,9 +192,9 @@
 			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-			<version>${cxf.version}</version>
+    		<groupId>org.apache.cxf</groupId>
+    		<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
+    		<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
@@ -157,16 +207,16 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>janino</groupId>
-			<artifactId>janino</artifactId>
-			<version>2.5.15</version>
+    		<groupId>janino</groupId>
+    		<artifactId>janino</artifactId>
+    		<version>2.5.15</version>
 		</dependency>
-
-		<!-- end added for spring boot support -->
-
-
-
-		<!-- added for unit testing -->
+        
+	<!-- end added for spring boot support -->	
+	
+	
+	
+	<!-- added for unit testing -->		
 		<dependency>
 			<groupId>org.onap.so.adapters</groupId>
 			<artifactId>mso-adapter-utils</artifactId>
@@ -181,11 +231,11 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 			<scope>test</scope>
-		</dependency>
+		</dependency>		
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
-		</dependency>
+		</dependency>		
 		<dependency>
 			<groupId>org.onap.so</groupId>
 			<artifactId>common</artifactId>
@@ -214,9 +264,9 @@
 			<version>${openstack.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.camunda.bpm</groupId>
-			<artifactId>camunda-external-task-client</artifactId>
-			<version>1.0.0</version>
-		</dependency>
+  			<groupId>org.camunda.bpm</groupId>
+  			<artifactId>camunda-external-task-client</artifactId>
+  			<version>1.1.1</version>
+		</dependency>	
 	</dependencies>
 </project>
-- 
cgit 1.2.3-korg