aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--blueprints-processor/adaptors/data-adaptor-provider/pom.xml216
-rw-r--r--blueprints-processor/adaptors/pom.xml2
-rw-r--r--blueprints-processor/adaptors/rest-adaptor-provider/pom.xml2
-rw-r--r--blueprints-processor/features/ccsdk-blueprints-processor/pom.xml7
-rwxr-xr-xblueprints-processor/features/features-blueprints-processor/pom.xml2
-rwxr-xr-xblueprints-processor/features/pom.xml2
-rw-r--r--blueprints-processor/installer/pom.xml2
-rw-r--r--blueprints-processor/plugin/assignment-provider/pom.xml2
-rw-r--r--blueprints-processor/plugin/generator-provider/pom.xml2
-rw-r--r--blueprints-processor/plugin/model-provider/pom.xml2
-rw-r--r--blueprints-processor/plugin/pom.xml2
-rw-r--r--blueprints-processor/pom.xml2
-rw-r--r--features/ccsdk-features-all/pom.xml7
-rw-r--r--features/features-features/pom.xml2
-rwxr-xr-xfeatures/installer/pom.xml2
-rwxr-xr-xfeatures/pom.xml2
-rwxr-xr-xpom.xml2
-rw-r--r--version.properties2
18 files changed, 135 insertions, 125 deletions
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
index 99a1f923e..21e0c61ea 100644
--- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
@@ -1,117 +1,117 @@
-<?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.1.0-SNAPSHOT</version>
- <relativePath />
- </parent>
-
- <groupId>org.onap.ccsdk.features</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>
-
- <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>
+<?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.1.0</version>
+ <relativePath/>
+ </parent>
+
+ <groupId>org.onap.ccsdk.features</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>
+
+ <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>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
<version>${spring.version}</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>
+ </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>${spring.version}</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>
+ <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-Name>${project.artifactId}</Bundle-Name>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.onap.ccsdk.features.data.adaptor,
org.onap.ccsdk.features.data.adaptor.dao,
org.onap.ccsdk.features.data.adaptor.db,
org.onap.ccsdk.features.data.adaptor.domain,
- org.onap.ccsdk.features.data.adaptor.service
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+ org.onap.ccsdk.features.data.adaptor.service
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml
index afdfab35a..2336c1829 100644
--- a/blueprints-processor/adaptors/pom.xml
+++ b/blueprints-processor/adaptors/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
index 0bf0d73d7..d689eb833 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
diff --git a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
index 4f396b714..b0bd61c66 100644
--- a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
+++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
@@ -32,6 +32,11 @@
<name>Blueprints Processor :: Features :: ${project.artifactId}</name>
+ <properties>
+ <skip.karaf.featureTest>true</skip.karaf.featureTest>
+ </properties>
+
+
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
diff --git a/blueprints-processor/features/features-blueprints-processor/pom.xml b/blueprints-processor/features/features-blueprints-processor/pom.xml
index fc552a7a2..aff771f70 100755
--- a/blueprints-processor/features/features-blueprints-processor/pom.xml
+++ b/blueprints-processor/features/features-blueprints-processor/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath />
</parent>
diff --git a/blueprints-processor/features/pom.xml b/blueprints-processor/features/pom.xml
index b1b6aca23..13c789ba1 100755
--- a/blueprints-processor/features/pom.xml
+++ b/blueprints-processor/features/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml
index ecb214416..7ad35e337 100644
--- a/blueprints-processor/installer/pom.xml
+++ b/blueprints-processor/installer/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath />
</parent>
diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index 5ca679baf..9c320036c 100644
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml
index e8a2ab026..5df115928 100644
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml
index 1092b486f..d52096e65 100644
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
diff --git a/blueprints-processor/plugin/pom.xml b/blueprints-processor/plugin/pom.xml
index f4c53a4d1..f23e550e1 100644
--- a/blueprints-processor/plugin/pom.xml
+++ b/blueprints-processor/plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
diff --git a/blueprints-processor/pom.xml b/blueprints-processor/pom.xml
index c6077a1a4..e26508f14 100644
--- a/blueprints-processor/pom.xml
+++ b/blueprints-processor/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
diff --git a/features/ccsdk-features-all/pom.xml b/features/ccsdk-features-all/pom.xml
index 34496a625..711a2917e 100644
--- a/features/ccsdk-features-all/pom.xml
+++ b/features/ccsdk-features-all/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
@@ -32,6 +32,11 @@
<packaging>feature</packaging>
<name>ccsdk-features :: features :: ${project.artifactId}</name>
+
+ <properties>
+ <skip.karaf.featureTest>true</skip.karaf.featureTest>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/features/features-features/pom.xml b/features/features-features/pom.xml
index 6640a87b4..fca0761a3 100644
--- a/features/features-features/pom.xml
+++ b/features/features-features/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 3e057e45f..ecd94012d 100755
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
diff --git a/features/pom.xml b/features/pom.xml
index 665efe8b7..c16f697fc 100755
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath/>
</parent>
diff --git a/pom.xml b/pom.xml
index f5a990cec..68a2d28e4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath />
</parent>
diff --git a/version.properties b/version.properties
index 4c1c6c69a..31723e3ff 100644
--- a/version.properties
+++ b/version.properties
@@ -10,6 +10,6 @@ feature_revision=0
base_version=${release_name}.${sprint_number}.${feature_revision}
-release_version=${base_version}-STAGING
+release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT