Merge "Install host key"
authorDan Timoney <dt5972@att.com>
Mon, 16 Apr 2018 21:59:19 +0000 (21:59 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 16 Apr 2018 21:59:19 +0000 (21:59 +0000)
dgbuilder/nodes/dge/dgemain/dgstart.html
dgbuilder/nodes/dge/dgemain/dgstart.js
dgbuilder/pom.xml
odlsli/pom.xml
platform-logic/pom.xml
pom.xml

index 9caa841..a203a44 100644 (file)
@@ -989,7 +989,7 @@ function showDgStartGenerateXmlStatus(){
                                        console.log("calling uploadxml. sending to server");
                                                //var successHtmlStr = "<object width='600' height='450' type='text/html' data='"  + data.url + "' />";
                                                
-                                               if( data != undefined  && data != null &&  (data.stdout.indexOf('Saving SvcLogicGraph to database') != -1 || data.stderr.indexOf('Saving SvcLogicGraph to database') != -1)){
+                                               if( data != undefined  && data != null &&  (data.stdout.indexOf('Saving SvcLogicGraph') != -1 || data.stderr.indexOf('Saving SvcLogicGraph') != -1)){
                                                        //RED.notify("<strong>Uploaded Successfully</strong>");
                                                        //console.dir(data);
                                                        var _moduleName = data.module;
index f2b4815..e55c827 100644 (file)
@@ -250,7 +250,7 @@ function uploadDG(filePath,moduleName,rpc,res){
                        }
                        if(stderr && !stdout){
                                //console.log("stderr:" + stderr);
-                               if(stderr.indexOf("Saving SvcLogicGraph to database") != -1){
+                               if(stderr.indexOf("Saving SvcLogicGraph") != -1){
                                        res.send(200,{'error':error,'stdout' :'','stderr':stderr,"url":dbHost,"module" : moduleName,"rpc" : rpc});
                                }else{
                                        res.send(500,{'error':error,'stdout' :'','stderr':stderr});
index f3e073a..877d13b 100644 (file)
@@ -23,7 +23,7 @@
                <application.name>dgbuilder</application.name>
                <skip.SWM>true</skip.SWM>
                <adm.base>/opt/app/dgbuilder</adm.base>
-               <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
                <build.number>${maven.build.timestamp}</build.number>
                <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
        </properties>
index 8edfebb..932a903 100644 (file)
@@ -25,7 +25,7 @@
         <image.name>onap/ccsdk-odlsli-image</image.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-        <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
     <dependencies>
index f7b665a..4401203 100644 (file)
@@ -27,7 +27,7 @@
        <properties>
                <application.name>platform-logic</application.name>
 
-               <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
                <build.number>${maven.build.timestamp}</build.number>
        </properties>
 </project>
diff --git a/pom.xml b/pom.xml
index 541a9c8..8fac91a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <properties>
         <application.name>distribution</application.name>
 
-        <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <build.number>${maven.build.timestamp}</build.number>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

© 2017 ONAP. Copyright © The Linux Foundation ®. All Rights Reserved.
The Linux Foundation has registered trademarks and uses trademarks.
For a list of trademarks of The Linux Foundation, please see our Trademark Usage page.
Linux is a registered trademark of Linus Torvalds.
Privacy Policy and Terms of Use