diff options
| -rw-r--r-- | Jenkinsfile | 14 | ||||
| -rw-r--r-- | misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java | 12 | ||||
| -rw-r--r-- | misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/HTML5Gen.java | 2 | ||||
| -rw-r--r-- | releases/2.7.0.yaml | 4 | ||||
| -rw-r--r-- | version.properties | 6 |
5 files changed, 31 insertions, 7 deletions
diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..d9b07104 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,14 @@ +#!groovy + +properties([[$class: 'ParametersDefinitionProperty', parameterDefinitions: [ +[$class: 'hudson.model.StringParameterDefinition', name: 'ECO_PIPELINE_ID', defaultValue: '0', description: 'Select an environment'], +[$class: 'hudson.model.StringParameterDefinition', name: 'PHASE', defaultValue: 'BUILD, PACKAGE, SONAR, SAST', description: 'Select an instance'], +[$class: 'hudson.model.StringParameterDefinition', name: 'TARGET_NODE', defaultValue: 'zld03318.vci.att.com', description: 'Select an environment to deploy to'] +]]]) + +def wf = new MavenWorkflow() + +wf defaultPhase:'BUILD, SONAR, SAST, DAST', + language:'MAVEN', + deployType: 'SWM', + deployOptions:"swm:install -Dswm.target.node=${params.TARGET_NODE}" diff --git a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java index b68ad6e5..258715e1 100644 --- a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java +++ b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java @@ -151,7 +151,9 @@ public class XGen<RT extends XGen<RT>> { @SuppressWarnings("unchecked")
public RT text(String txt) {
- forward.append(txt);
+ if(txt!=null) {
+ forward.append(txt);
+ }
return (RT)this;
}
@@ -182,8 +184,12 @@ public class XGen<RT extends XGen<RT>> { for (int i=0;i<tabs;++i) {
forward.append(" ");
}
- forward.append(txt);
- if (pretty)forward.println();
+ if(txt!=null) {
+ forward.append(txt);
+ }
+ if (pretty) {
+ forward.println();
+ }
return (RT)this;
}
diff --git a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/HTML5Gen.java b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/HTML5Gen.java index 89a39b3a..7cf3929a 100644 --- a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/HTML5Gen.java +++ b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/HTML5Gen.java @@ -32,7 +32,7 @@ public class HTML5Gen extends HTMLGen { @Override
public HTMLGen html(String ... attrib) {
- //forward.println("<!DOCTYPE html>");
+ forward.println("<!DOCTYPE html>");
incr("html",attrib);
return this;
}
diff --git a/releases/2.7.0.yaml b/releases/2.7.0.yaml new file mode 100644 index 00000000..9cea6b4c --- /dev/null +++ b/releases/2.7.0.yaml @@ -0,0 +1,4 @@ +distribution_type: 'maven' +version: '2.7.0' +project: 'aaf-authz' +log_dir: 'aaf-authz-maven-stage-master/448/' diff --git a/version.properties b/version.properties index 02ce0893..38e27527 100644 --- a/version.properties +++ b/version.properties @@ -24,10 +24,10 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -# This TAG <version>2.1.21-SNAPSHOT</version> is here to help remember to change this file. Keep it up to date with the following "real" entries: +# This TAG <version>2.7.0-SNAPSHOT</version> is here to help remember to change this file. Keep it up to date with the following "real" entries: major=2 -minor=1 -patch=21 +minor=7 +patch=0 base_version=${major}.${minor}.${patch} |