Code Review / aaf / authz.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: a06268e)
Merge "Committing the changes of Locate cred tags to Gerrit."
authorJohn Franey <john.franey@att.com>
Tue, 11 Aug 2020 17:58:46 +0000 (17:58 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 11 Aug 2020 17:58:46 +0000 (17:58 +0000)
Jenkinsfile [new file with mode: 0644] patch | blob
misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java patch | blob | history
misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/HTML5Gen.java patch | blob | history
releases/2.7.0.yaml [new file with mode: 0644] patch | blob
version.properties patch | blob | history

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644 (file)
index 0000000..d9b0710
--- /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 b68ad6e..258715e 100644 (file)
--- 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>> {
 \r
     @SuppressWarnings("unchecked")\r
     public RT text(String txt) {\r
-        forward.append(txt);\r
+       if(txt!=null) {\r
+               forward.append(txt);\r
+       }\r
         return (RT)this;\r
     }\r
     \r
@@ -182,8 +184,12 @@ public class XGen<RT extends XGen<RT>> {
         for (int i=0;i<tabs;++i) {\r
             forward.append("  ");\r
         }\r
-        forward.append(txt);\r
-        if (pretty)forward.println();\r
+        if(txt!=null) {\r
+               forward.append(txt);\r
+        }\r
+       if (pretty) {\r
+               forward.println();\r
+       }\r
         return (RT)this;\r
     }\r
 \r
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 89a39b3..7cf3929 100644 (file)
--- 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 {
 \r
     @Override\r
     public HTMLGen html(String ... attrib) {\r
-        //forward.println("<!DOCTYPE html>");\r
+        forward.println("<!DOCTYPE html>");\r
         incr("html",attrib);\r
         return this;\r
     }\r
diff --git a/releases/2.7.0.yaml b/releases/2.7.0.yaml
new file mode 100644 (file)
index 0000000..9cea6b4
--- /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 02ce089..38e2752 100644 (file)
--- 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}
 
ARCHIVED- 2022-02-15 at the request of the project