From 9ac40b59226d2a3da56d7ada88298d84066aa13a Mon Sep 17 00:00:00 2001 From: Isaac Parenteau Date: Wed, 2 Mar 2022 17:41:44 -0500 Subject: [PATCH 1/2] Updated log4j --- .gitignore | 1 + pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e00ec70..94e8438 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .classpath .settings/ target/ +/.idea/ diff --git a/pom.xml b/pom.xml index 9066d15..56977a9 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ Logger library for applications - ssh://git@bitbucket.org:locus2k/applogger.git + https://gitea.locusworks.net/locusworks/app-logger.git locusworks @@ -20,8 +20,8 @@ ${project.basedir} 1.8 1.8 - 2.13.0 - 1.7.30 + 2.17.2 + 1.7.36 https://nexus.locusworks.net @@ -36,9 +36,9 @@ - org.apache.maven.plugin + org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.10.0 1.8 1.8 From 8575afe735b145394b5855aeeab3041119082c7b Mon Sep 17 00:00:00 2001 From: Isaac Parenteau Date: Wed, 2 Mar 2022 18:07:55 -0500 Subject: [PATCH 2/2] Updated jenkins build file --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b19af3..783f321 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,7 @@ def init() { if (branch_name.indexOf('master')==0) build_type='master' // common pipeline elements - node('master') { + node('controller') { Initialize() SetVersion(build_type) print_vars() // after SetVersion - all variables now defined @@ -57,16 +57,16 @@ def init() { } if (branch_name.indexOf('develop')==0) { - node('master') { + node('controller') { Deploy(); } } else if (branch_name.indexOf('release/')==0) { - node('master') { + node('controller') { Deploy(); } } - node('master') { + node('controller') { set_result('SUCCESS') }