diff options
| -rw-r--r-- | dgbuilder/nodes/dge/dgemain/dgstart.html | 2 | ||||
| -rw-r--r-- | dgbuilder/nodes/dge/dgemain/dgstart.js | 2 | ||||
| -rw-r--r-- | dgbuilder/pom.xml | 2 | ||||
| -rw-r--r-- | odlsli/pom.xml | 2 | ||||
| -rw-r--r-- | platform-logic/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/dgbuilder/nodes/dge/dgemain/dgstart.html b/dgbuilder/nodes/dge/dgemain/dgstart.html index 9caa841a..a203a444 100644 --- a/dgbuilder/nodes/dge/dgemain/dgstart.html +++ b/dgbuilder/nodes/dge/dgemain/dgstart.html @@ -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; diff --git a/dgbuilder/nodes/dge/dgemain/dgstart.js b/dgbuilder/nodes/dge/dgemain/dgstart.js index f2b4815e..e55c8271 100644 --- a/dgbuilder/nodes/dge/dgemain/dgstart.js +++ b/dgbuilder/nodes/dge/dgemain/dgstart.js @@ -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}); diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index f3e073ab..877d13bc 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -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> diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 8edfebb2..932a903a 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -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> diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index f7b665af..4401203b 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -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> @@ -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> |