Merge "Update parent pom to conform to CCSDK structure"

3 files changed, 41 insertions, 41 deletions

diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml
index ef39b412d..54ad30d42 100644
--- a/blueprints-processor/installer/pom.xml
+++ b/blueprints-processor/installer/pom.xml
@@ -21,12 +21,15 @@
 	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.config</groupId>

-		<artifactId>blueprints-processor</artifactId>

-		<version>0.0.1-SNAPSHOT</version>

+		<groupId>org.onap.ccsdk.parent</groupId>

+		<artifactId>odlparent-lite</artifactId>

+		<version>1.1.0-SNAPSHOT</version>

+		<relativePath />

 	</parent>

 

+	<groupId>org.onap.ccsdk.config</groupId>

 	<artifactId>blueprints-processor-installer</artifactId>

+	<version>0.3.0-SNAPSHOT</version>

 	<packaging>pom</packaging>

 	<name>Blueprints Processor :: ${project.artifactId}</name>

 

@@ -41,6 +44,7 @@
 		<dependency>

 			<groupId>org.onap.ccsdk.config</groupId>

 			<artifactId>blueprints-processor-features</artifactId>

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

 			<classifier>features</classifier>

 			<type>xml</type>

 			<exclusions>

@@ -53,22 +57,27 @@
 		<dependency>

 			<groupId>org.onap.ccsdk.config</groupId>

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

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

 		</dependency>

 		<dependency>

 			<groupId>org.onap.ccsdk.config</groupId>

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

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

 		</dependency>

 		<dependency>

 			<groupId>org.onap.ccsdk.config</groupId>

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

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

 		</dependency>

 		<dependency>

 			<groupId>org.onap.ccsdk.config</groupId>

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

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

 		</dependency>

 		<dependency>

 			<groupId>org.onap.ccsdk.config</groupId>

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

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

 		</dependency>

 	</dependencies>

 

@@ -84,12 +93,12 @@
 						</goals>

 						<phase>package</phase>

 						<configuration>

-							<attach>false</attach>

+							<attach>true</attach>

 							<finalName>stage/${application.name}-${project.version}</finalName>

 							<descriptors>

 								<descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>

 							</descriptors>

-							<appendAssemblyId>false</appendAssemblyId>

+							<appendAssemblyId>true</appendAssemblyId>

 						</configuration>

 					</execution>

 					<execution>

@@ -128,14 +137,7 @@
 							<useRepositoryLayout>true</useRepositoryLayout>

 							<addParentPoms>false</addParentPoms>

 							<copyPom>false</copyPom>

-							<includeArtifactIds>

-								blueprints-processor-features,

-								blueprints-data-adaptor-provider,

-								blueprints-rest-adaptor-provider,

-								blueprints-assignment-provider,

-								blueprints-generator-provider,commons-lang,commons-collections,

-								blueprints-model-provider,

-							</includeArtifactIds>

+							<includeGroupIds>org.onap.ccsdk.config</includeGroupIds>

 							<scope>provided</scope>

 						</configuration>

 					</execution>

diff --git a/blueprints-processor/installer/src/assembly/assemble_installer_zip.xml b/blueprints-processor/installer/src/assembly/assemble_installer_zip.xml
index 88a6bb773..e803caf46 100644
--- a/blueprints-processor/installer/src/assembly/assemble_installer_zip.xml
+++ b/blueprints-processor/installer/src/assembly/assemble_installer_zip.xml
@@ -1,33 +1,33 @@
 <!--

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

-  Modifications Copyright © 2018 IBM.

-  

+  Copyright (C) 2018 AT&T, Bell Canada

+

   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

-  

+

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

--->

+  -->

 

 <!-- Defines how we build the .zip file which is our distribution. -->

 

 <assembly

-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"

-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">

-	<id>bin</id>

+xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"

+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">

+	<id>installer_zip</id>

 	<formats>

 		<format>zip</format>

 	</formats>

 

-	<!-- we want "system" and related files right at the root level as this 

-		file is suppose to be unzip on top of a karaf distro. -->

+	<!--  we want "system" and related files right at the root level

+        as this file is suppose to be unzip on top of a karaf

+        distro. -->

 	<includeBaseDirectory>false</includeBaseDirectory>

 

 	<fileSets>

@@ -50,5 +50,4 @@
 	</fileSets>

 

 

-

 </assembly>

diff --git a/blueprints-processor/installer/src/assembly/assemble_mvnrepo_zip.xml b/blueprints-processor/installer/src/assembly/assemble_mvnrepo_zip.xml
index 44237aeea..95d191a81 100644
--- a/blueprints-processor/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/blueprints-processor/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -1,33 +1,33 @@
 <!--

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

-  Modifications Copyright © 2018 IBM.

-  

+  Copyright (C) 2018 AT&T, Bell Canada

+

   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

-  

+

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

--->

+  -->

 

 <!-- Defines how we build the .zip file which is our distribution. -->

 

 <assembly

-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"

-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">

-	<id>bin</id>

+xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"

+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">

+	<id>repo</id>

 	<formats>

 		<format>zip</format>

 	</formats>

 

-	<!-- we want "system" and related files right at the root level as this 

-		file is suppose to be unzip on top of a karaf distro. -->

+	<!--  we want "system" and related files right at the root level

+        as this file is suppose to be unzip on top of a karaf

+        distro. -->

 	<includeBaseDirectory>false</includeBaseDirectory>

 

 	<fileSets>

@@ -40,5 +40,4 @@
 	</fileSets>

 

 

-

 </assembly>