diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-09-11 20:57:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-11 20:57:02 +0000 |
| commit | 5dfa696b46c79c64c429c66d2af911bd54a653d7 (patch) | |
| tree | 1a12975a07756a9b9476461d5972d5c0913745e0 /blueprints-processor | |
| parent | d348199f43d31b55d9d974bb9679a6cfc3ca97e2 (diff) | |
| parent | ea45fbffab1f36271def9443fd32cdbd75839f7e (diff) | |
Merge "Update parent pom to conform to CCSDK structure"
Diffstat (limited to 'blueprints-processor')
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/pom.xml | 208 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/pom.xml | 38 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/pom.xml | 301 | ||||
| -rw-r--r-- | blueprints-processor/features/pom.xml | 2 | ||||
| -rw-r--r-- | blueprints-processor/installer/pom.xml | 28 | ||||
| -rw-r--r-- | blueprints-processor/installer/src/assembly/assemble_installer_zip.xml | 27 | ||||
| -rw-r--r-- | blueprints-processor/installer/src/assembly/assemble_mvnrepo_zip.xml | 27 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/pom.xml | 148 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/pom.xml | 148 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/pom.xml | 163 | ||||
| -rw-r--r-- | blueprints-processor/plugin/pom.xml | 37 | ||||
| -rw-r--r-- | blueprints-processor/pom.xml | 2 |
12 files changed, 630 insertions, 499 deletions
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml index d73a21c7f..a965c7fcd 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml @@ -17,96 +17,126 @@ -->
<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>
+ 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>
- <artifactId>blueprints-data-adaptor-provider</artifactId>
- <packaging>bundle</packaging>
- <name>Blueprints Data Adaptor - Provider</name>
- <url>http://maven.apache.org</url>
+ <parent>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-provider</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mariadb.jdbc</groupId>
- <artifactId>mariadb-java-client</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</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>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <groupId>org.onap.ccsdk.config</groupId>
+ <version>0.3.0-SNAPSHOT</version>
+ <artifactId>blueprints-data-adaptor-provider</artifactId>
+ <packaging>bundle</packaging>
+ <name>Blueprints Data Adaptor - Provider</name>
+ <url>http://maven.apache.org</url>
- <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.data.adaptor</Bundle-SymbolicName>
- <Export-Package>org.onap.ccsdk.config.data.adaptor,
- org.onap.ccsdk.config.data.adaptor.dao,
- org.onap.ccsdk.config.data.adaptor.db,
- org.onap.ccsdk.config.data.adaptor.domain,
- org.onap.ccsdk.config.data.adaptor.service
- </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>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons.lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-provider</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>${mariadb.connector.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>4.2.9.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>4.2.9.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</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>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2database.version}</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.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.data.adaptor</Bundle-SymbolicName>
+ <Export-Package>org.onap.ccsdk.config.data.adaptor,
+ org.onap.ccsdk.config.data.adaptor.dao,
+ org.onap.ccsdk.config.data.adaptor.db,
+ org.onap.ccsdk.config.data.adaptor.domain,
+ org.onap.ccsdk.config.data.adaptor.service
+ </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>
diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml index 481f48c47..53b6c3ff2 100644 --- a/blueprints-processor/adaptors/pom.xml +++ b/blueprints-processor/adaptors/pom.xml @@ -17,21 +17,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/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.onap.ccsdk.config</groupId>
- <artifactId>blueprints-processor</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
- <artifactId>blueprints-processor-adaptors</artifactId>
- <name>Blueprints Processor Adaptors - POM</name>
- <url>http://wiki.sdn.labs.att.com</url>
- <description>Blueprints Processor Adaptors - POM</description>
- <modules>
- <module>data-adaptor-provider</module>
- <module>rest-adaptor-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/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.onap.ccsdk.config</groupId>
+ <version>0.3.0-SNAPSHOT</version>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+ <artifactId>blueprints-processor-adaptors</artifactId>
+ <name>Blueprints Processor Adaptors - POM</name>
+ <url>http://wiki.sdn.labs.att.com</url>
+ <description>Blueprints Processor Adaptors - POM</description>
+ <modules>
+ <module>data-adaptor-provider</module>
+ <module>rest-adaptor-provider</module>
+ </modules>
</project>
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>
diff --git a/blueprints-processor/features/pom.xml b/blueprints-processor/features/pom.xml index 5b9ecfc10..f80d14fd3 100644 --- a/blueprints-processor/features/pom.xml +++ b/blueprints-processor/features/pom.xml @@ -23,7 +23,7 @@ <parent>
<groupId>org.onap.ccsdk.config</groupId>
<artifactId>blueprints-processor</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.3.0-SNAPSHOT</version>
</parent>
<artifactId>blueprints-processor-features</artifactId>
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>
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>
diff --git a/blueprints-processor/pom.xml b/blueprints-processor/pom.xml index 8e3556624..3111fc9f5 100644 --- a/blueprints-processor/pom.xml +++ b/blueprints-processor/pom.xml @@ -29,7 +29,7 @@ <groupId>org.onap.ccsdk.config</groupId>
<artifactId>blueprints-processor</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Blueprints Processor Module</name>
|