vLAN Tagging - Support Tosca Groups

Change-Id: If6aaaa49d33ae93b571296f989ebb2b00774c8c3
Issue-ID: SDC-1196
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 297 insertions, 297 deletions

diff --git a/pom.xml b/pom.xml
index 65e4383..7091b7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,297 +1,297 @@
-<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.sdc.sdc-tosca</groupId>

-	<artifactId>sdc-tosca</artifactId>

-	<name>sdc-sdc-tosca</name>

-	<description>SDC Tosca Parser JAR file for use by consumers</description>

-	<version>1.3.2</version>

-	<packaging>jar</packaging>

-

-	<properties>

-

-		<!-- ==================== -->

-		<!-- Generic properties -->

-		<!-- ==================== -->

-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-

-		<!-- ==================== -->

-		<!-- Versions -->

-		<!-- ==================== -->

-		<!-- Global project version -->

-

-		<!-- Dependencies projects version -->

-		<!--<sonar.skipDesign>true</sonar.skipDesign>-->

-		<!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>-->

-		<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>

-		<nexus.proxy>https://nexus.onap.org</nexus.proxy>

-		<sitePath>/content/sites/site/org/onap/sdc/sdc-tosca/${project.version}</sitePath>

-		<snapshots.path>snapshots</snapshots.path>

-		<releases.path>releases</releases.path>

-		<staging.profile.id>176c31dfe190a</staging.profile.id>

-		<!-- Sonar properties -->

-		<sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>

-		<sonar.skipDesign>true</sonar.skipDesign>

-		<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>

-		<sonar.sources>.</sonar.sources>

-		<sonar.exclusions>**/scripts/**/*</sonar.exclusions>

-		<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>

-		<sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>

-		<sonar.branch>${project.version}</sonar.branch>

-

-	</properties>

-

-	<dependencies>

-

-		<dependency>

-			<groupId>org.slf4j</groupId>

-			<artifactId>slf4j-api</artifactId>

-			<version>1.7.10</version>

-			<scope>compile</scope>

-		</dependency>

-		<dependency>

-			<groupId>com.google.code.gson</groupId>

-			<artifactId>gson</artifactId>

-			<version>2.3.1</version>

-			<scope>compile</scope>

-		</dependency>

-

-		<dependency>

-			<groupId>org.functionaljava</groupId>

-			<artifactId>functionaljava</artifactId>

-			<version>4.2</version>

-			<scope>compile</scope>

-		</dependency>

-

-		<dependency>

-			<groupId>commons-io</groupId>

-			<artifactId>commons-io</artifactId>

-			<version>2.5</version>

-			<scope>compile</scope>

-		</dependency>

-

-		<dependency>

-			<groupId>commons-codec</groupId>

-			<artifactId>commons-codec</artifactId>

-			<version>1.9</version>

-			<scope>compile</scope>

-		</dependency>

-

-		<!-- YAML parser -->

-		<dependency>

-			<groupId>org.yaml</groupId>

-			<artifactId>snakeyaml</artifactId>

-			<version>1.14</version>

-			<scope>compile</scope>

-		</dependency>

-

-		<!-- Apache Commons -->

-		<dependency>

-			<groupId>org.apache.commons</groupId>

-			<artifactId>commons-lang3</artifactId>

-			<version>3.5</version>

-			<scope>compile</scope>

-		</dependency>

-		

-		<dependency>

-			<groupId>com.google.guava</groupId>

-			<artifactId>guava</artifactId>

-			<version>21.0</version>

-			<scope>compile</scope>

-		</dependency>

-		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->

-		<dependency>

-		    <groupId>com.fasterxml.jackson.core</groupId>

-		    <artifactId>jackson-databind</artifactId>

-		    <version>2.9.4</version>

-		</dependency>

-

-		<!-- jtosca Tosca Parser -->

-		<dependency>

-			<groupId>org.onap.sdc.jtosca</groupId>

-			<artifactId>jtosca</artifactId>

-			<version>1.3.4-SNAPSHOT</version>

-		</dependency>

-

-

-		<!-- TEST -->

-		<dependency>

-			<groupId>org.eclipse.jetty</groupId>

-			<artifactId>jetty-servlet</artifactId>

-			<scope>test</scope>

-			<version>9.2.10.v20150310</version>

-		</dependency>

-

-		<dependency>

-			<groupId>org.eclipse.jetty</groupId>

-			<artifactId>jetty-webapp</artifactId>

-			<version>9.2.10.v20150310</version>

-			<scope>test</scope>

-		</dependency>

-

-		<!--<dependency> -->

-		<!--<groupId>junit</groupId> -->

-		<!--<artifactId>junit</artifactId> -->

-		<!--<version>4.12</version> -->

-		<!--<scope>test</scope> -->

-		<!--</dependency> -->

-

-		<dependency>

-			<groupId>org.testng</groupId>

-			<artifactId>testng</artifactId>

-			<version>6.11</version>

-			<scope>test</scope>

-		</dependency>

-

-		<dependency>

-			<groupId>org.mockito</groupId>

-			<artifactId>mockito-all</artifactId>

-			<version>1.10.19</version>

-			<scope>test</scope>

-		</dependency>

-

-		<!-- <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> 

-			<version>1.1.2</version> <scope>test</scope> </dependency> -->

-

-	</dependencies>

-	

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

-

-	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-site-plugin</artifactId>

-				<version>3.4</version>

-				<dependencies>

-					<dependency>

-						<groupId>org.apache.maven.wagon</groupId>

-						<artifactId>wagon-webdav-jackrabbit</artifactId>

-						<version>2.10</version>

-					</dependency>

-				</dependencies>

-			</plugin>

-

-			<plugin>

-				<groupId>org.jacoco</groupId>

-				<artifactId>jacoco-maven-plugin</artifactId>

-				<version>0.7.8</version>

-				<executions>

-					<!-- Unit-Tests -->

-					<execution>

-						<id>prepare-agent</id>

-						<goals>

-							<goal>prepare-agent</goal>

-						</goals>

-						<configuration>

-							<destFile>${sonar.jacoco.reportPath}</destFile>

-						</configuration>

-					</execution>

-				</executions>

-			</plugin>

-

-			<!-- Staging Plugin -->

-			<plugin>

-				<groupId>org.sonatype.plugins</groupId>

-				<artifactId>nexus-staging-maven-plugin</artifactId>

-				<version>1.6.7</version>

-				<extensions>true</extensions>

-				<configuration>

-					<nexusUrl>${nexus.proxy}</nexusUrl>

-					<stagingProfileId>${staging.profile.id}</stagingProfileId>

-					<serverId>onap-staging</serverId>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-compiler-plugin</artifactId>

-				<version>2.5.1</version>

-				<inherited>true</inherited>

-				<configuration>

-					<source>1.8</source>

-					<target>1.8</target>

-				</configuration>

-			</plugin>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-javadoc-plugin</artifactId>

-				<version>2.10.3</version>

-				<configuration />

-			</plugin>

-			<!-- Test -->

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-surefire-plugin</artifactId>

-				<version>2.19.1</version>

-				<configuration>

-					<includes>

-						<include>**/ToscaParser***Test.class</include>

-					</includes>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<groupId>org.sonarsource.scanner.maven</groupId>

-				<artifactId>sonar-maven-plugin</artifactId>

-				<version>3.0.2</version>

-			</plugin>

-		</plugins>

-	</build>

-

-	<repositories>

-		<repository>

-			<id>central</id>

-			<name>Official Maven repository</name>

-			<url>http://repo2.maven.org/maven2/</url>

-		</repository>

-		<repository>

-			<id>onap-releases</id>

-			<name>Release Repository</name>

-			<url>${nexus.proxy}/content/repositories/releases/</url>

-		</repository>

-		<repository>

-			<id>onap-snapshots</id>

-			<name>Snapshots Repository</name>

-			<url>${nexus.proxy}/content/repositories/snapshots/</url>

-		</repository>

-	</repositories>

-

-	<distributionManagement>

-		<repository>

-			<id>onap-releases</id>

-			<name>Release Repository</name>

-			<url>${nexus.proxy}/content/repositories/${releases.path}/</url>

-		</repository>

-		<snapshotRepository>

-			<id>onap-snapshots</id>

-			<name>Snapshot Repository</name>

-			<url>${nexus.proxy}/content/repositories/${snapshots.path}/</url>

-		</snapshotRepository>

-		<site>

-			<id>onap-site</id>

-			<url>dav:${nexus.proxy}${sitePath}</url>

-		</site>

-	</distributionManagement>

-</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>
+	
+	<groupId>org.onap.sdc.sdc-tosca</groupId>
+	<artifactId>sdc-tosca</artifactId>
+	<name>sdc-sdc-tosca</name>
+	<description>SDC Tosca Parser JAR file for use by consumers</description>
+	<version>1.3.4-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<properties>
+
+		<!-- ==================== -->
+		<!-- Generic properties -->
+		<!-- ==================== -->
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+		<!-- ==================== -->
+		<!-- Versions -->
+		<!-- ==================== -->
+		<!-- Global project version -->
+
+		<!-- Dependencies projects version -->
+		<!--<sonar.skipDesign>true</sonar.skipDesign>-->
+		<!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>-->
+		<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
+		<nexus.proxy>https://nexus.onap.org</nexus.proxy>
+		<sitePath>/content/sites/site/org/onap/sdc/sdc-tosca/${project.version}</sitePath>
+		<snapshots.path>snapshots</snapshots.path>
+		<releases.path>releases</releases.path>
+		<staging.profile.id>176c31dfe190a</staging.profile.id>
+		<!-- Sonar properties -->
+		<sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
+		<sonar.skipDesign>true</sonar.skipDesign>
+		<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
+		<sonar.sources>.</sonar.sources>
+		<sonar.exclusions>**/scripts/**/*</sonar.exclusions>
+		<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
+		<sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
+		<sonar.branch>${project.version}</sonar.branch>
+
+	</properties>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.10</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.3.1</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.functionaljava</groupId>
+			<artifactId>functionaljava</artifactId>
+			<version>4.2</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.5</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.9</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<!-- YAML parser -->
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+			<version>1.14</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<!-- Apache Commons -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.5</version>
+			<scope>compile</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>21.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+		<dependency>
+		    <groupId>com.fasterxml.jackson.core</groupId>
+		    <artifactId>jackson-databind</artifactId>
+		    <version>2.9.4</version>
+		</dependency>
+
+		<!-- jtosca Tosca Parser -->
+		<dependency>
+			<groupId>org.onap.sdc.jtosca</groupId>
+			<artifactId>jtosca</artifactId>
+			<version>1.3.4-SNAPSHOT</version>
+		</dependency>
+
+
+		<!-- TEST -->
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<scope>test</scope>
+			<version>9.2.10.v20150310</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-webapp</artifactId>
+			<version>9.2.10.v20150310</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!--<dependency> -->
+		<!--<groupId>junit</groupId> -->
+		<!--<artifactId>junit</artifactId> -->
+		<!--<version>4.12</version> -->
+		<!--<scope>test</scope> -->
+		<!--</dependency> -->
+
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<version>6.11</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> 
+			<version>1.1.2</version> <scope>test</scope> </dependency> -->
+
+	</dependencies>
+	
+	<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>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.4</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.wagon</groupId>
+						<artifactId>wagon-webdav-jackrabbit</artifactId>
+						<version>2.10</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.7.8</version>
+				<executions>
+					<!-- Unit-Tests -->
+					<execution>
+						<id>prepare-agent</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<destFile>${sonar.jacoco.reportPath}</destFile>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- Staging Plugin -->
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<version>1.6.7</version>
+				<extensions>true</extensions>
+				<configuration>
+					<nexusUrl>${nexus.proxy}</nexusUrl>
+					<stagingProfileId>${staging.profile.id}</stagingProfileId>
+					<serverId>onap-staging</serverId>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.5.1</version>
+				<inherited>true</inherited>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.3</version>
+				<configuration />
+			</plugin>
+			<!-- Test -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.19.1</version>
+				<configuration>
+					<includes>
+						<include>**/ToscaParser***Test.class</include>
+					</includes>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.sonarsource.scanner.maven</groupId>
+				<artifactId>sonar-maven-plugin</artifactId>
+				<version>3.0.2</version>
+			</plugin>
+		</plugins>
+	</build>
+
+	<repositories>
+		<repository>
+			<id>central</id>
+			<name>Official Maven repository</name>
+			<url>http://repo2.maven.org/maven2/</url>
+		</repository>
+		<repository>
+			<id>onap-releases</id>
+			<name>Release Repository</name>
+			<url>${nexus.proxy}/content/repositories/releases/</url>
+		</repository>
+		<repository>
+			<id>onap-snapshots</id>
+			<name>Snapshots Repository</name>
+			<url>${nexus.proxy}/content/repositories/snapshots/</url>
+		</repository>
+	</repositories>
+
+	<distributionManagement>
+		<repository>
+			<id>onap-releases</id>
+			<name>Release Repository</name>
+			<url>${nexus.proxy}/content/repositories/${releases.path}/</url>
+		</repository>
+		<snapshotRepository>
+			<id>onap-snapshots</id>
+			<name>Snapshot Repository</name>
+			<url>${nexus.proxy}/content/repositories/${snapshots.path}/</url>
+		</snapshotRepository>
+		<site>
+			<id>onap-site</id>
+			<url>dav:${nexus.proxy}${sitePath}</url>
+		</site>
+	</distributionManagement>
+</project>