Merge "Update parent pom to conform to CCSDK structure"

1 files changed, 174 insertions, 127 deletions

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
index 5e83a2738..d35f1c1a3 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
@@ -17,133 +17,180 @@
 -->

 

 <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-adaptors</artifactId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

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

-	<packaging>bundle</packaging>

-	<name>Blueprints Rest Adaptor - 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>org.apache.commons</groupId>

-			<artifactId>commons-lang3</artifactId>

-		</dependency>

-		<dependency>

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

-			<artifactId>jackson-databind</artifactId>

-		</dependency>

-		<dependency>

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

-			<artifactId>jackson-annotations</artifactId>

-		</dependency>

-		<dependency>

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

-			<artifactId>jackson-core</artifactId>

-		</dependency>

-		<dependency>

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

-			<artifactId>jackson-dataformat-xml</artifactId>

-		</dependency>

-		<dependency>

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

-			<artifactId>jackson-dataformat-yaml</artifactId>

-		</dependency>

-		<dependency>

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

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

-		</dependency>

-		<dependency>

-			<groupId>org.yaml</groupId>

-			<artifactId>snakeyaml</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>org.json</groupId>

-			<artifactId>json</artifactId>

-		</dependency>

-		<dependency>

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

-			<artifactId>json-path</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>commons-collections</groupId>

-			<artifactId>commons-collections</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>commons-io</groupId>

-			<artifactId>commons-io</artifactId>

-		</dependency>

-		<dependency>

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

-			<artifactId>httpclient-osgi</artifactId>

-		</dependency>

-		<dependency>

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

-			<artifactId>httpcore-osgi</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework</groupId>

-			<artifactId>spring-web</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>com.att.eelf</groupId>

-			<artifactId>eelf-core</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework</groupId>

-			<artifactId>spring-test</artifactId>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</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.rest.adaptor</Bundle-SymbolicName>

-						<Export-Package>org.onap.ccsdk.config.rest.adaptor,

-							org.onap.ccsdk.config.rest.adaptor.data,

-							org.onap.ccsdk.config.rest.adaptor.service,

-							org.onap.ccsdk.config.rest.adaptor.utils

-						</Export-Package>

-						<Import-Package>!*spring*,!joptsimple,!net.*,!bsh,

-							!org.apache.commons.pool*,!org.apache.commons.fileupload*,!org.apache.http.*,!org.apache.logger*,

-							!org.apache.lucene*,!org.apache.t*,!org.apache.derby*,!org.codehaus.groovy*,!org.custommonkey.xmlunit*,

-							!org.hibernate*,!org.jruby*,!org.aspectj*,!org.mockito*,!org.openqa*,!org.skyscreamer*,!org.testng*,

-							!com.caucho*,!com.gargoylesoftware*,!com.jamonapi*,!com.rometools*,!com.squareup*,!com.sun*,!groovy*,

-							!javax.ejb*,!javax.enterprise*,!javax.faces*,!javax.in*,!javax.money*,!javax.portlet*,!javax.resource*,

-							org.*,javax.*,com.google.gson*,com.google.common.*,*jackson*</Import-Package>

-						<Embed-Dependency>*;groupId=!*eelf*|*opendaylight*|*ccsdk*|*osgi*|*jackson*|*json*|*powermock*|*junit*</Embed-Dependency>

-						<Embed-Transitive>true</Embed-Transitive>

-					</instructions>

-				</configuration>

-			</plugin>

-		</plugins>

-	</build>

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

+    <version>0.3.0-SNAPSHOT</version>

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

+    <packaging>bundle</packaging>

+    <name>Blueprints Rest Adaptor - Provider</name>

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

+

+    <dependencies>

+        <dependency>

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

+            <artifactId>commons-lang3</artifactId>

+            <version>${commons.lang3.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.core</groupId>

+            <artifactId>jackson-core</artifactId>

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

+        </dependency>

+        <dependency>

+            <groupId>com.fasterxml.jackson.dataformat</groupId>

+            <artifactId>jackson-dataformat-xml</artifactId>

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

+        </dependency>

+        <dependency>

+            <groupId>com.fasterxml.jackson.dataformat</groupId>

+            <artifactId>jackson-dataformat-yaml</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>org.yaml</groupId>

+            <artifactId>snakeyaml</artifactId>

+            <version>1.12</version>

+        </dependency>

+        <dependency>

+            <groupId>org.json</groupId>

+            <artifactId>json</artifactId>

+            <version>${org.json.version}</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>json-path</artifactId>

+            <version>2.3.0</version>

+        </dependency>

+        <dependency>

+            <groupId>commons-collections</groupId>

+            <artifactId>commons-collections</artifactId>

+            <version>3.2.2</version>

+        </dependency>

+        <dependency>

+            <groupId>commons-io</groupId>

+            <artifactId>commons-io</artifactId>

+            <version>2.5</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>httpclient-osgi</artifactId>

+            <version>4.5.6</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>httpcore-osgi</artifactId>

+            <version>4.4.10</version>

+        </dependency>

+        <dependency>

+            <groupId>org.springframework</groupId>

+            <artifactId>spring-web</artifactId>

+            <version>4.2.9.RELEASE</version>

+        </dependency>

+        <dependency>

+            <groupId>com.att.eelf</groupId>

+            <artifactId>eelf-core</artifactId>

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

+        </dependency>

+        <dependency>

+            <groupId>org.springframework</groupId>

+            <artifactId>spring-test</artifactId>

+            <version>4.2.9.RELEASE</version>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>${junit.version}</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>

+        <dependency>

+            <groupId>org.powermock</groupId>

+            <artifactId>powermock-core</artifactId>

+            <version>1.6.6</version>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.powermock</groupId>

+            <artifactId>powermock-api-support</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.rest.adaptor</Bundle-SymbolicName>

+                        <Export-Package>org.onap.ccsdk.config.rest.adaptor,

+                            org.onap.ccsdk.config.rest.adaptor.data,

+                            org.onap.ccsdk.config.rest.adaptor.service,

+                            org.onap.ccsdk.config.rest.adaptor.utils

+                        </Export-Package>

+                        <Import-Package>!*spring*,!joptsimple,!net.*,!bsh,

+                            !org.apache.commons.pool*,!org.apache.commons.fileupload*,!org.apache.http.*,!org.apache.logger*,

+                            !org.apache.lucene*,!org.apache.t*,!org.apache.derby*,!org.codehaus.groovy*,!org.custommonkey.xmlunit*,

+                            !org.hibernate*,!org.jruby*,!org.aspectj*,!org.mockito*,!org.openqa*,!org.skyscreamer*,!org.testng*,

+                            !com.caucho*,!com.gargoylesoftware*,!com.jamonapi*,!com.rometools*,!com.squareup*,!com.sun*,!groovy*,

+                            !javax.ejb*,!javax.enterprise*,!javax.faces*,!javax.in*,!javax.money*,!javax.portlet*,!javax.resource*,

+                            org.*,javax.*,com.google.gson*,com.google.common.*,*jackson*

+                        </Import-Package>

+                        <Embed-Dependency>

+                            *;groupId=!*eelf*|*opendaylight*|*ccsdk*|*osgi*|*jackson*|*json*|*powermock*|*junit*

+                        </Embed-Dependency>

+                        <Embed-Transitive>true</Embed-Transitive>

+                    </instructions>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

 </project>