From ea45fbffab1f36271def9443fd32cdbd75839f7e Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Tue, 11 Sep 2018 11:13:56 -0400
Subject: Update parent pom to conform to CCSDK structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ie99cd61cc83dff14b2e1a1a1014411342031e27f
Issue-ID: CCSDK-505
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 .../plugin/assignment-provider/pom.xml             | 148 +++++++++++--------
 .../plugin/generator-provider/pom.xml              | 148 ++++++++++---------
 blueprints-processor/plugin/model-provider/pom.xml | 163 ++++++++++++---------
 blueprints-processor/plugin/pom.xml                |  37 ++---
 4 files changed, 273 insertions(+), 223 deletions(-)

(limited to 'blueprints-processor/plugin')

diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index b6167cf17..073f9af9e 100644
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -17,71 +17,89 @@
 -->
 
 <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.config</groupId>
-		<artifactId>blueprints-processor-plugin</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>blueprints-assignment-provider</artifactId>
-	<packaging>bundle</packaging>
-	<name>Blueprints Assignment - Provider</name>
-	<url>http://maven.apache.org</url>
+  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>
 
-	<dependencies>
-		<dependency>
-			<groupId>equinoxSDK381</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.ccsdk.config</groupId>
-			<artifactId>blueprints-generator-provider</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.sling</groupId>
-			<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${maven.bundle.version}</version>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Bundle-SymbolicName>org.onap.ccsdk.config.assignment</Bundle-SymbolicName>
-						<Export-Package>org.onap.ccsdk.config.assignment,
-							org.onap.ccsdk.config.assignment.data,
-							org.onap.ccsdk.config.assignment.service,
-							org.onap.ccsdk.config.assignment.processor,
-							org.onap.ccsdk.config.assignment.processor.custom
-						</Export-Package>
-						<Import-Package>*</Import-Package>
-						<Embed-Transitive>true</Embed-Transitive>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <groupId>org.onap.ccsdk.config</groupId>
+    <version>0.3.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>equinoxSDK381</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>${equinox.osgi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.config</groupId>
+            <artifactId>blueprints-generator-provider</artifactId>
+            <version>${project.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>
+                        <Bundle-SymbolicName>org.onap.ccsdk.config.assignment</Bundle-SymbolicName>
+                        <Export-Package>org.onap.ccsdk.config.assignment,
+                            org.onap.ccsdk.config.assignment.data,
+                            org.onap.ccsdk.config.assignment.service,
+                            org.onap.ccsdk.config.assignment.processor,
+                            org.onap.ccsdk.config.assignment.processor.custom
+                        </Export-Package>
+                        <Import-Package>*</Import-Package>
+                        <Embed-Transitive>true</Embed-Transitive>
+                    </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 132852e4a..f18170a6a 100644
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -17,74 +17,86 @@
 -->
 
 <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.config</groupId>
-		<artifactId>blueprints-processor-plugin</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>blueprints-generator-provider</artifactId>
-	<packaging>bundle</packaging>
-	<name>Blueprints Generator - Provider</name>
-	<url>http://maven.apache.org</url>
+  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>
 
-	<dependencies>
-		<dependency>
-			<artifactId>org.eclipse.osgi</artifactId>
-			<groupId>equinoxSDK381</groupId>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.ccsdk.config</groupId>
-			<artifactId>blueprints-model-provider</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${maven.bundle.version}</version>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Bundle-SymbolicName>org.onap.ccsdk.config.generator</Bundle-SymbolicName>
-						<Export-Package>
-							org.onap.ccsdk.config.generator,
-							org.onap.ccsdk.config.generator.data,
-							org.onap.ccsdk.config.generator.service,
-							org.onap.ccsdk.config.generator.tool
-						</Export-Package>
-						<Import-Package>*</Import-Package>
-						<Embed-Transitive>true</Embed-Transitive>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <groupId>org.onap.ccsdk.config</groupId>
+    <version>0.3.0-SNAPSHOT</version>
+    <artifactId>blueprints-generator-provider</artifactId>
+    <packaging>bundle</packaging>
+    <name>Blueprints Generator - Provider</name>
+    <url>http://maven.apache.org</url>
+
+    <dependencies>
+        <dependency>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <groupId>equinoxSDK381</groupId>
+            <version>${equinox.osgi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.config</groupId>
+            <artifactId>blueprints-model-provider</artifactId>
+            <version>${project.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-SymbolicName>org.onap.ccsdk.config.generator</Bundle-SymbolicName>
+                        <Export-Package>
+                            org.onap.ccsdk.config.generator,
+                            org.onap.ccsdk.config.generator.data,
+                            org.onap.ccsdk.config.generator.service,
+                            org.onap.ccsdk.config.generator.tool
+                        </Export-Package>
+                        <Import-Package>*</Import-Package>
+                        <Embed-Transitive>true</Embed-Transitive>
+                    </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 5e75c6afd..7710fbbed 100644
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -17,81 +17,98 @@
 -->
 
 <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.config</groupId>
-		<artifactId>blueprints-processor-plugin</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>blueprints-model-provider</artifactId>
-	<packaging>bundle</packaging>
-	<name>Blueprints Model - Provider</name>
-	<url>http://maven.apache.org</url>
+  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>
 
-	<dependencies>
-		<dependency>
-			<groupId>equinoxSDK381</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-		</dependency>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-		<dependency>
-			<groupId>org.onap.ccsdk.config</groupId>
-			<artifactId>blueprints-rest-adaptor-provider</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.ccsdk.config</groupId>
-			<artifactId>blueprints-data-adaptor-provider</artifactId>
-		</dependency>
+    <groupId>org.onap.ccsdk.config</groupId>
+    <version>0.3.0-SNAPSHOT</version>
+    <artifactId>blueprints-model-provider</artifactId>
+    <packaging>bundle</packaging>
+    <name>Blueprints Model - Provider</name>
+    <url>http://maven.apache.org</url>
 
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.sling</groupId>
-			<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>equinoxSDK381</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>${equinox.osgi.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-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>
+    </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-SymbolicName>org.onap.ccsdk.config.model</Bundle-SymbolicName>
-						<Export-Package>org.onap.ccsdk.config.model,
-							org.onap.ccsdk.config.model.data,
-							org.onap.ccsdk.config.model.data.api,
-							org.onap.ccsdk.config.model.data.custom,
-							org.onap.ccsdk.config.model.data.custom.dict,
-							org.onap.ccsdk.config.model.domain,
-							org.onap.ccsdk.config.model.service,
-							org.onap.ccsdk.config.model.utils,
-							org.onap.ccsdk.config.model.validator
-						</Export-Package>
-						<Import-Package>*</Import-Package>
-						<Embed-Transitive>true</Embed-Transitive>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <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-SymbolicName>org.onap.ccsdk.config.model</Bundle-SymbolicName>
+                        <Export-Package>org.onap.ccsdk.config.model,
+                            org.onap.ccsdk.config.model.data,
+                            org.onap.ccsdk.config.model.data.api,
+                            org.onap.ccsdk.config.model.data.custom,
+                            org.onap.ccsdk.config.model.data.custom.dict,
+                            org.onap.ccsdk.config.model.domain,
+                            org.onap.ccsdk.config.model.service,
+                            org.onap.ccsdk.config.model.utils,
+                            org.onap.ccsdk.config.model.validator
+                        </Export-Package>
+                        <Import-Package>*</Import-Package>
+                        <Embed-Transitive>true</Embed-Transitive>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/blueprints-processor/plugin/pom.xml b/blueprints-processor/plugin/pom.xml
index ed7822a2a..442499037 100644
--- a/blueprints-processor/plugin/pom.xml
+++ b/blueprints-processor/plugin/pom.xml
@@ -16,22 +16,25 @@
 -->
 
 <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.config</groupId>
-		<artifactId>blueprints-processor</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>blueprints-processor-plugin</artifactId>
-	<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>
+  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.1.0-SNAPSHOT</version>
+    </parent>
+
+    <version>0.3.0-SNAPSHOT</version>
+    <artifactId>blueprints-processor-plugin</artifactId>
+    <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>
-- 
cgit 1.2.3-korg