Prepare for release build 43/69143/1 0.3.0
authorTimoney, Dan (dt5972) <dt5972@att.com>
Wed, 26 Sep 2018 16:59:43 +0000 (12:59 -0400)
committerTimoney, Dan (dt5972) <dt5972@att.com>
Wed, 26 Sep 2018 17:02:27 +0000 (13:02 -0400)
Update for release build :
(a) Remove -STAGING tag from release version in version.properties
(b) Update to use released version of parent poms
(c) Disable single-feature-test (which does not work with released
dependencies from ONAP)

Change-Id: I5d0bc654b966934fbea18896de77aababc70405c
Issue-ID: CCSDK-597
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
18 files changed:
blueprints-processor/adaptors/data-adaptor-provider/pom.xml
blueprints-processor/adaptors/pom.xml
blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
blueprints-processor/features/features-blueprints-processor/pom.xml
blueprints-processor/features/pom.xml
blueprints-processor/installer/pom.xml
blueprints-processor/plugin/assignment-provider/pom.xml
blueprints-processor/plugin/generator-provider/pom.xml
blueprints-processor/plugin/model-provider/pom.xml
blueprints-processor/plugin/pom.xml
blueprints-processor/pom.xml
features/ccsdk-features-all/pom.xml
features/features-features/pom.xml
features/installer/pom.xml
features/pom.xml
pom.xml
version.properties

index 99a1f92..21e0c61 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!-- Copyright © 2017-2018 AT&T Intellectual Property. Modifications Copyright \r
-       © 2018 IBM. Licensed under the Apache License, Version 2.0 (the "License"); \r
-       you may not use this file except in compliance with the License. You may \r
-       obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 \r
-       Unless required by applicable law or agreed to in writing, software distributed \r
-       under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES \r
-       OR CONDITIONS OF ANY KIND, either express or implied. See the License for \r
-       the specific language governing permissions and limitations under the License. -->\r
-\r
-<project xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-\r
-       <parent>\r
-               <groupId>org.onap.ccsdk.parent</groupId>\r
-               <artifactId>binding-parent</artifactId>\r
-               <version>1.1.0-SNAPSHOT</version>\r
-               <relativePath />\r
-       </parent>\r
-\r
-       <groupId>org.onap.ccsdk.features</groupId>\r
-       <version>0.3.0-SNAPSHOT</version>\r
-       <artifactId>blueprints-data-adaptor-provider</artifactId>\r
-       <packaging>bundle</packaging>\r
-       <name>Blueprints Data Adaptor - Provider</name>\r
-       <url>http://maven.apache.org</url>\r
-\r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>org.apache.commons</groupId>\r
-                       <artifactId>commons-lang3</artifactId>\r
-                       <version>${commons.lang3.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.sli.core</groupId>\r
-                       <artifactId>sli-provider</artifactId>\r
-                       <version>${project.version}</version>\r
-                       <scope>compile</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-io</groupId>\r
-                       <artifactId>commons-io</artifactId>\r
-                       <version>2.5</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.mariadb.jdbc</groupId>\r
-                       <artifactId>mariadb-java-client</artifactId>\r
-                       <version>${mariadb.connector.version}</version>\r
-                       <scope>runtime</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-context</artifactId>\r
+<?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>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-jdbc</artifactId>\r
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-jdbc</artifactId>
                        <version>${spring.version}</version>
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.att.eelf</groupId>\r
-                       <artifactId>eelf-core</artifactId>\r
-                       <version>${eelf.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-test</artifactId>\r
+               </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>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.h2database</groupId>\r
-                       <artifactId>h2</artifactId>\r
-                       <version>${h2database.version}</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <version>${junit.version}</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-       </dependencies>\r
-\r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                               <configuration>\r
-                                       <additionalparam>-Xdoclint:none</additionalparam>\r
-                               </configuration>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.felix</groupId>\r
-                               <artifactId>maven-bundle-plugin</artifactId>\r
-                               <version>${maven.bundle.version}</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <instructions>\r
+                       <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\r
-                                               </Export-Package>\r
-                                       </instructions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-</project>\r
+                                                       org.onap.ccsdk.features.data.adaptor.service
+                                               </Export-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
index afdfab3..2336c18 100644 (file)
@@ -23,7 +23,7 @@
     <parent>\r
         <groupId>org.onap.ccsdk.parent</groupId>\r
         <artifactId>odlparent-lite</artifactId>\r
-        <version>1.1.0-SNAPSHOT</version>\r
+        <version>1.1.0</version>\r
         <relativePath/>\r
     </parent>\r
 \r
index 0bf0d73..d689eb8 100644 (file)
@@ -24,7 +24,7 @@
     <parent>\r
         <groupId>org.onap.ccsdk.parent</groupId>\r
         <artifactId>binding-parent</artifactId>\r
-        <version>1.1.0-SNAPSHOT</version>\r
+        <version>1.1.0</version>\r
         <relativePath/>\r
     </parent>\r
 \r
index 4f396b7..b0bd61c 100644 (file)
@@ -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>
 
 
     <name>Blueprints Processor :: Features :: ${project.artifactId}</name>
 
+        <properties>
+            <skip.karaf.featureTest>true</skip.karaf.featureTest>
+        </properties>
+
+
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
index fc552a7..aff771f 100755 (executable)
@@ -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>
 
index b1b6aca..13c789b 100755 (executable)
@@ -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>
 
index ecb2144..7ad35e3 100644 (file)
@@ -23,7 +23,7 @@
        <parent>\r
                <groupId>org.onap.ccsdk.parent</groupId>\r
                <artifactId>odlparent-lite</artifactId>\r
-               <version>1.1.0-SNAPSHOT</version>\r
+               <version>1.1.0</version>\r
                <relativePath />\r
        </parent>\r
 \r
index 5ca679b..9c32003 100644 (file)
@@ -24,7 +24,7 @@
     <parent>\r
         <groupId>org.onap.ccsdk.parent</groupId>\r
         <artifactId>binding-parent</artifactId>\r
-        <version>1.1.0-SNAPSHOT</version>\r
+        <version>1.1.0</version>\r
         <relativePath/>\r
     </parent>\r
 \r
index e8a2ab0..5df1159 100644 (file)
@@ -24,7 +24,7 @@
     <parent>\r
         <groupId>org.onap.ccsdk.parent</groupId>\r
         <artifactId>binding-parent</artifactId>\r
-        <version>1.1.0-SNAPSHOT</version>\r
+        <version>1.1.0</version>\r
         <relativePath/>\r
     </parent>\r
 \r
index 1092b48..d52096e 100644 (file)
@@ -24,7 +24,7 @@
     <parent>\r
         <groupId>org.onap.ccsdk.parent</groupId>\r
         <artifactId>binding-parent</artifactId>\r
-        <version>1.1.0-SNAPSHOT</version>\r
+        <version>1.1.0</version>\r
         <relativePath/>\r
     </parent>\r
 \r
index f4c53a4..f23e550 100644 (file)
@@ -23,7 +23,7 @@
     <parent>\r
         <groupId>org.onap.ccsdk.parent</groupId>\r
         <artifactId>odlparent-lite</artifactId>\r
-        <version>1.1.0-SNAPSHOT</version>\r
+        <version>1.1.0</version>\r
         <relativePath/>\r
     </parent>\r
 \r
index c6077a1..e26508f 100644 (file)
@@ -24,7 +24,7 @@
        <parent>\r
                <groupId>org.onap.ccsdk.parent</groupId>\r
                <artifactId>odlparent-lite</artifactId>\r
-               <version>1.1.0-SNAPSHOT</version>\r
+               <version>1.1.0</version>\r
                <relativePath/>\r
        </parent>\r
 \r
index 34496a6..711a291 100644 (file)
@@ -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>
 
     <packaging>feature</packaging>
 
     <name>ccsdk-features :: features :: ${project.artifactId}</name>
+
+        <properties>
+            <skip.karaf.featureTest>true</skip.karaf.featureTest>
+        </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
index 6640a87..fca0761 100644 (file)
@@ -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>
 
index 3e057e4..ecd9401 100755 (executable)
@@ -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>
 
index 665efe8..c16f697 100755 (executable)
@@ -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 f5a990c..68a2d28 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
        <parent>\r
                <groupId>org.onap.ccsdk.parent</groupId>\r
                <artifactId>odlparent-lite</artifactId>\r
-               <version>1.1.0-SNAPSHOT</version>\r
+               <version>1.1.0</version>\r
                <relativePath />\r
        </parent>\r
 \r
index 4c1c6c6..31723e3 100644 (file)
@@ -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