[MSO-8] Second step of the rebase for MSO

Second rebase containing additional features for MSO + total reworking
of the BPMN structure + Notification flow can now be added at the end of
some BPMN flows

Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

1 files changed, 122 insertions, 122 deletions

diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index 7f948386a2..e0a620f8a9 100644
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -1,122 +1,122 @@
-<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.openecomp</groupId>
-		<artifactId>mso</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.openecomp.mso</groupId>
-	<artifactId>asdc-controller</artifactId>
-	<name>asdc-controller</name>
-	<description>ASDC CLient and Controller</description>
-	<packaging>war</packaging>
-
-	<build>
-		<finalName>${project.artifactId}-${project.version}</finalName>
-		<plugins>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<warSourceDirectory>WebContent</warSourceDirectory>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<attachClasses>true</attachClasses>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-             <groupId>org.evosuite</groupId>
-             <artifactId>evosuite-standalone-runtime</artifactId>
-             <version>${evosuiteVersion}</version>
-             <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.13</version>
-        </dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.mso</groupId>
-			<artifactId>mso-catalog-db</artifactId>
-			<version>${project.version}</version>
-		</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>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.ejb3</groupId>
-			<artifactId>jboss-ejb3-ext-api</artifactId>
-			<version>2.2.0.Final</version>
-			<scope>provided</scope>
-		</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.6-SNAPSHOT</version>
-			<exclusions>
-       		 <exclusion>  <!-- declare the exclusion here -->
-	         	 <groupId>org.slf4j</groupId>
-	         	 <artifactId>slf4j-log4j12</artifactId>
-       		 </exclusion>
-    	  </exclusions>
-		</dependency>
-
-		<dependency>
-		    <groupId>org.apache.httpcomponents</groupId>
-		    <artifactId>httpmime</artifactId>
-		    <version>4.5</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.openecomp.mso</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.openecomp.mso</groupId>
-			<artifactId>status-control</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
-	</dependencies>
-
-</project>
+<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.openecomp</groupId>

+		<artifactId>mso</artifactId>

+		<version>1.1.0-SNAPSHOT</version>

+	</parent>

+

+	<groupId>org.openecomp.mso</groupId>

+	<artifactId>asdc-controller</artifactId>

+	<name>asdc-controller</name>

+	<description>ASDC CLient and Controller</description>

+	<packaging>war</packaging>

+

+	<build>

+		<finalName>${project.artifactId}-${project.version}</finalName>

+		<plugins>

+			<plugin>

+				<artifactId>maven-war-plugin</artifactId>

+				<version>2.4</version>

+				<configuration>

+					<warSourceDirectory>WebContent</warSourceDirectory>

+					<failOnMissingWebXml>false</failOnMissingWebXml>

+					<attachClasses>true</attachClasses>

+				</configuration>

+			</plugin>

+		</plugins>

+	</build>

+

+	<dependencies>

+		<dependency>

+             <groupId>org.evosuite</groupId>

+             <artifactId>evosuite-standalone-runtime</artifactId>

+             <version>${evosuiteVersion}</version>

+             <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.codehaus.jackson</groupId>

+            <artifactId>jackson-mapper-asl</artifactId>

+            <version>1.9.13</version>

+        </dependency>

+		<dependency>

+			<groupId>org.mockito</groupId>

+			<artifactId>mockito-all</artifactId>

+			<version>1.10.19</version>

+			<scope>test</scope>

+		</dependency>

+		<dependency>

+			<groupId>org.openecomp.mso</groupId>

+			<artifactId>mso-catalog-db</artifactId>

+			<version>${project.version}</version>

+		</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>

+		</dependency>

+		<dependency>

+			<groupId>org.jboss.ejb3</groupId>

+			<artifactId>jboss-ejb3-ext-api</artifactId>

+			<version>2.2.0.Final</version>

+			<scope>provided</scope>

+		</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.6-SNAPSHOT</version>

+			<exclusions>

+       		 <exclusion>  <!-- declare the exclusion here -->

+	         	 <groupId>org.slf4j</groupId>

+	         	 <artifactId>slf4j-log4j12</artifactId>

+       		 </exclusion>

+    	  </exclusions>

+		</dependency>

+

+		<dependency>

+		    <groupId>org.apache.httpcomponents</groupId>

+		    <artifactId>httpmime</artifactId>

+		    <version>4.5</version>

+		</dependency>

+

+		<dependency>

+			<groupId>org.openecomp.mso</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.openecomp.mso</groupId>

+			<artifactId>status-control</artifactId>

+			<version>${project.version}</version>

+		</dependency>

+		<dependency>

+			<groupId>commons-io</groupId>

+			<artifactId>commons-io</artifactId>

+		</dependency>

+	</dependencies>

+

+</project>