Merge "Minor HTML Gen improvments"

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/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}