Prepare for release build0.4.0

Prepare for release of early ODL-Oxygen based CCSDK Dublin

Change-Id: I322ccb15e1064a9acc7f2060c744623895766a87
Issue-ID: CCSDK-870
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

4 files changed, 382 insertions, 393 deletions

diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index 776a10f5e..7fbce4507 100644
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -1,47 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Copyright © 2017-2018 AT&T Intellectual Property.

-  Modifications Copyright © 2018 IBM.

-  

-  Licensed under the Apache License, Version 2.0 (the "License");

-  you may not use this file except in compliance with the License.

-  You may obtain a copy of the License at

-  

-      http://www.apache.org/licenses/LICENSE-2.0

-  

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-

-<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.onap.ccsdk.parent</groupId>

-		<artifactId>binding-parent</artifactId>

-		<version>1.2.0-SNAPSHOT</version>

-		<relativePath />

-	</parent>

-

-	<groupId>org.onap.ccsdk.features</groupId>

-	<version>0.4.0-SNAPSHOT</version>

-	<artifactId>blueprints-assignment-provider</artifactId>

-	<packaging>bundle</packaging>

-	<name>Blueprints Assignment - Provider</name>

-	<url>http://maven.apache.org</url>

-

-	<dependencies>

-		<dependency>

-			<groupId>org.onap.ccsdk.features</groupId>

-			<artifactId>blueprints-generator-provider</artifactId>

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

-		</dependency>

-		<dependency>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright © 2017-2018 AT&T Intellectual Property.
+  Modifications Copyright © 2018 IBM.
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+      http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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.onap.ccsdk.parent</groupId>
+		<artifactId>binding-parent</artifactId>
+		<version>1.2.0</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>org.onap.ccsdk.features</groupId>
+	<version>0.4.0-SNAPSHOT</version>
+	<artifactId>blueprints-assignment-provider</artifactId>
+	<packaging>bundle</packaging>
+	<name>Blueprints Assignment - Provider</name>
+	<url>http://maven.apache.org</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.onap.ccsdk.features</groupId>
+			<artifactId>blueprints-generator-provider</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
 			<version>${jackson.version}</version>
@@ -62,58 +59,58 @@
 			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>${junit.version}</version>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

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

-			<artifactId>org.apache.sling.testing.osgi-mock</artifactId>

-			<version>2.3.2</version>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.powermock</groupId>

-			<artifactId>powermock-api-mockito</artifactId>

-			<version>1.6.6</version>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.powermock</groupId>

-			<artifactId>powermock-module-junit4</artifactId>

-			<version>1.6.6</version>

-			<scope>test</scope>

-		</dependency>

-	</dependencies>

-

-	<build>

-		<plugins>

-			<plugin>

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

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

-				<configuration>

-					<additionalparam>-Xdoclint:none</additionalparam>

-				</configuration>

-			</plugin>

-			<plugin>

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

-				<artifactId>maven-bundle-plugin</artifactId>

-				<version>${maven.bundle.version}</version>

-				<extensions>true</extensions>

-				<configuration>

-					<instructions>

+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
+			<version>2.3.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>1.6.6</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>1.6.6</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${maven.bundle.version}</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
 						<Bundle-Name>${project.artifactId}</Bundle-Name>
 						<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
 						<Export-Package>org.onap.ccsdk.features.assignment,
 							org.onap.ccsdk.features.assignment.data,
 							org.onap.ccsdk.features.assignment.service,
 							org.onap.ccsdk.features.assignment.processor,
-							org.onap.ccsdk.features.assignment.processor.custom

-						</Export-Package>

-					</instructions>

-				</configuration>

-			</plugin>

-		</plugins>

-	</build>

-</project>

+							org.onap.ccsdk.features.assignment.processor.custom
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml
index 87203884c..17daad8d3 100644
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -1,121 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Copyright © 2017-2018 AT&T Intellectual Property.

-  Modifications Copyright © 2018 IBM.

-  

-  Licensed under the Apache License, Version 2.0 (the "License");

-  you may not use this file except in compliance with the License.

-  You may obtain a copy of the License at

-  

-      http://www.apache.org/licenses/LICENSE-2.0

-  

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-

-<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.onap.ccsdk.parent</groupId>

-		<artifactId>binding-parent</artifactId>

-		<version>1.2.0-SNAPSHOT</version>

-		<relativePath />

-	</parent>

-

-	<groupId>org.onap.ccsdk.features</groupId>

-	<version>0.4.0-SNAPSHOT</version>

-	<artifactId>blueprints-generator-provider</artifactId>

-	<packaging>bundle</packaging>

-	<name>Blueprints Generator - Provider</name>

-	<url>http://maven.apache.org</url>

-

-	<dependencies>

-		<dependency>

-			<groupId>org.onap.ccsdk.features</groupId>

-			<artifactId>blueprints-model-provider</artifactId>

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

-		</dependency>

-		<dependency>

-			<groupId>org.onap.ccsdk.features</groupId>

-			<artifactId>blueprints-data-adaptor-provider</artifactId>

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

-		</dependency>

-		<dependency>

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

-			<artifactId>jackson-core</artifactId>

-			<version>${jackson.version}</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>jackson-databind</artifactId>

-			<version>${jackson.version}</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>jackson-annotations</artifactId>

-			<version>${jackson.version}</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>jackson-module-jsonSchema</artifactId>

-			<version>${jackson.version}</version>

-		</dependency>

-		<dependency>

-			<groupId>commons-io</groupId>

-			<artifactId>commons-io</artifactId>

-			<version>2.5</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>velocity</artifactId>

-			<version>1.7</version>

-		</dependency>

-		<dependency>

-			<groupId>org.powermock</groupId>

-			<artifactId>powermock-api-mockito</artifactId>

-			<version>1.6.6</version>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.powermock</groupId>

-			<artifactId>powermock-module-junit4</artifactId>

-			<version>1.6.6</version>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>${junit.version}</version>

-			<scope>test</scope>

-		</dependency>

-	</dependencies>

-

-	<build>

-		<plugins>

-			<plugin>

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

-				<artifactId>maven-bundle-plugin</artifactId>

-				<version>${maven.bundle.version}</version>

-				<extensions>true</extensions>

-				<configuration>

-					<instructions>

-						<Bundle-Name>${project.artifactId}</Bundle-Name>

-						<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>

-						<Export-Package>

-							org.onap.ccsdk.features.generator,

-							org.onap.ccsdk.features.generator.data,

-							org.onap.ccsdk.features.generator.service,

-							org.onap.ccsdk.features.generator.tool

-						</Export-Package>

-					</instructions>

-				</configuration>

-			</plugin>

-		</plugins>

-	</build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright © 2017-2018 AT&T Intellectual Property.
+  Modifications Copyright © 2018 IBM.
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+      http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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.onap.ccsdk.parent</groupId>
+		<artifactId>binding-parent</artifactId>
+		<version>1.2.0</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>org.onap.ccsdk.features</groupId>
+	<version>0.4.0-SNAPSHOT</version>
+	<artifactId>blueprints-generator-provider</artifactId>
+	<packaging>bundle</packaging>
+	<name>Blueprints Generator - Provider</name>
+	<url>http://maven.apache.org</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.onap.ccsdk.features</groupId>
+			<artifactId>blueprints-model-provider</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.features</groupId>
+			<artifactId>blueprints-data-adaptor-provider</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jsonSchema</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.velocity</groupId>
+			<artifactId>velocity</artifactId>
+			<version>1.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>1.6.6</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>1.6.6</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${maven.bundle.version}</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Name>${project.artifactId}</Bundle-Name>
+						<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+						<Export-Package>
+							org.onap.ccsdk.features.generator,
+							org.onap.ccsdk.features.generator.data,
+							org.onap.ccsdk.features.generator.service,
+							org.onap.ccsdk.features.generator.tool
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml
index 0b9b4ded3..2fbb0f074 100644
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -1,137 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Copyright © 2017-2018 AT&T Intellectual Property.

-  Modifications Copyright © 2018 IBM.

-  

-  Licensed under the Apache License, Version 2.0 (the "License");

-  you may not use this file except in compliance with the License.

-  You may obtain a copy of the License at

-  

-      http://www.apache.org/licenses/LICENSE-2.0

-  

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-

-<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.onap.ccsdk.parent</groupId>

-		<artifactId>binding-parent</artifactId>

-		<version>1.2.0-SNAPSHOT</version>

-		<relativePath />

-	</parent>

-

-	<groupId>org.onap.ccsdk.features</groupId>

-	<version>0.4.0-SNAPSHOT</version>

-	<artifactId>blueprints-model-provider</artifactId>

-	<packaging>bundle</packaging>

-	<name>Blueprints Model - Provider</name>

-	<url>http://maven.apache.org</url>

-

-	<dependencies>

-		<dependency>

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

-			<artifactId>jackson-core</artifactId>

-			<version>${jackson.version}</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>jackson-databind</artifactId>

-			<version>${jackson.version}</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>jackson-annotations</artifactId>

-			<version>${jackson.version}</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>jackson-module-jsonSchema</artifactId>

-			<version>${jackson.version}</version>

-		</dependency>

-		<dependency>

-			<groupId>com.jayway.jsonpath</groupId>

-			<artifactId>json-path</artifactId>

-			<version>2.3.0</version>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.ccsdk.features</groupId>

-			<artifactId>blueprints-rest-adaptor-provider</artifactId>

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

-		</dependency>

-		<dependency>

-			<groupId>org.onap.ccsdk.features</groupId>

-			<artifactId>blueprints-data-adaptor-provider</artifactId>

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

-		</dependency>

-		<dependency>

-			<groupId>org.powermock</groupId>

-			<artifactId>powermock-api-mockito</artifactId>

-			<version>1.6.6</version>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.powermock</groupId>

-			<artifactId>powermock-module-junit4</artifactId>

-			<version>1.6.6</version>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

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

-			<artifactId>org.apache.sling.testing.osgi-mock</artifactId>

-			<version>2.3.2</version>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>${junit.version}</version>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

-			<groupId>commons-collections</groupId>

-			<artifactId>commons-collections</artifactId>

-			<version>3.2.2</version>

-		</dependency>

-	</dependencies>

-

-	<build>

-		<plugins>

-			<plugin>

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

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

-				<configuration>

-					<additionalparam>-Xdoclint:none</additionalparam>

-				</configuration>

-			</plugin>

-			<plugin>

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

-				<artifactId>maven-bundle-plugin</artifactId>

-				<version>${maven.bundle.version}</version>

-				<extensions>true</extensions>

-				<configuration>

-					<instructions>

-						<Bundle-Name>${project.artifactId}</Bundle-Name>

-						<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>

-						<Export-Package>org.onap.ccsdk.features.model,

-							org.onap.ccsdk.features.model.data,

-							org.onap.ccsdk.features.model.data.api,

-							org.onap.ccsdk.features.model.data.dict,

-							org.onap.ccsdk.features.model.domain,

-							org.onap.ccsdk.features.model.service,

-							org.onap.ccsdk.features.model.utils,

-							org.onap.ccsdk.features.model.validator

-						</Export-Package>

-					</instructions>

-				</configuration>

-			</plugin>

-		</plugins>

-	</build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright © 2017-2018 AT&T Intellectual Property.
+  Modifications Copyright © 2018 IBM.
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+      http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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.onap.ccsdk.parent</groupId>
+		<artifactId>binding-parent</artifactId>
+		<version>1.2.0</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>org.onap.ccsdk.features</groupId>
+	<version>0.4.0-SNAPSHOT</version>
+	<artifactId>blueprints-model-provider</artifactId>
+	<packaging>bundle</packaging>
+	<name>Blueprints Model - Provider</name>
+	<url>http://maven.apache.org</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jsonSchema</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.jayway.jsonpath</groupId>
+			<artifactId>json-path</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.features</groupId>
+			<artifactId>blueprints-rest-adaptor-provider</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.features</groupId>
+			<artifactId>blueprints-data-adaptor-provider</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>1.6.6</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>1.6.6</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
+			<version>2.3.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.2</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${maven.bundle.version}</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Name>${project.artifactId}</Bundle-Name>
+						<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+						<Export-Package>org.onap.ccsdk.features.model,
+							org.onap.ccsdk.features.model.data,
+							org.onap.ccsdk.features.model.data.api,
+							org.onap.ccsdk.features.model.data.dict,
+							org.onap.ccsdk.features.model.domain,
+							org.onap.ccsdk.features.model.service,
+							org.onap.ccsdk.features.model.utils,
+							org.onap.ccsdk.features.model.validator
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/blueprints-processor/plugin/pom.xml b/blueprints-processor/plugin/pom.xml
index 2626c4281..58b3fe394 100644
--- a/blueprints-processor/plugin/pom.xml
+++ b/blueprints-processor/plugin/pom.xml
@@ -1,42 +1,40 @@
-<!--

-  Copyright © 2017-2018 AT&T Intellectual Property.

-  Modifications Copyright © 2018 IBM.

-  

-  Licensed under the Apache License, Version 2.0 (the "License");

-  you may not use this file except in compliance with the License.

-  You may obtain a copy of the License at

-  

-      http://www.apache.org/licenses/LICENSE-2.0

-  

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-

-<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.onap.ccsdk.parent</groupId>

-		<artifactId>odlparent-lite</artifactId>

-		<version>1.2.0-SNAPSHOT</version>

-		<relativePath />

-	</parent>

-

-	<version>0.4.0-SNAPSHOT</version>

-	<artifactId>blueprints-processor-plugin</artifactId>

-	<groupId>org.onap.ccsdk.features</groupId>

-	<packaging>pom</packaging>

-	<name>Blueprints Processor Plugins - POM</name>

-	<description>Blueprints Processor Plugins - POM</description>

-	<modules>

-		<module>model-provider</module>

-		<module>assignment-provider</module>

-		<module>generator-provider</module>

-	</modules>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright © 2017-2018 AT&T Intellectual Property.
+  Modifications Copyright © 2018 IBM.
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+      http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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.onap.ccsdk.parent</groupId>
+		<artifactId>odlparent-lite</artifactId>
+		<version>1.2.0</version>
+		<relativePath/>
+	</parent>
+
+	<version>0.4.0-SNAPSHOT</version>
+	<artifactId>blueprints-processor-plugin</artifactId>
+	<groupId>org.onap.ccsdk.features</groupId>
+	<packaging>pom</packaging>
+	<name>Blueprints Processor Plugins - POM</name>
+	<description>Blueprints Processor Plugins - POM</description>
+	<modules>
+		<module>model-provider</module>
+		<module>assignment-provider</module>
+		<module>generator-provider</module>
+	</modules>
+
+</project>