15 Commits

Author SHA1 Message Date
65cc93f466 Merge pull request 'master' (#13) from master into release/1.1
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good
Reviewed-on: #13
2022-03-02 17:32:06 -06:00
a4c39918f0 Merge branch 'develop' into master
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good
2022-03-02 17:30:25 -06:00
55a2f620a1 Merge pull request 'Adjusted node' (#11) from bug/jenkins_update into develop
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good
Reviewed-on: #11
2022-03-02 17:24:09 -06:00
b50eccc471 Adjusted node 2022-03-02 18:16:32 -05:00
ecfdf202d8 Merge pull request 'bug/jenkins_update' (#10) from bug/jenkins_update into develop
Some checks reported errors
Locusworks Team/app-logger/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #10
2022-03-02 17:15:36 -06:00
43cffb3610 Merge branch 'develop' of ssh://gitea.locusworks.net:7999/locusworks/app-logger into bug/jenkins_update 2022-03-02 18:08:10 -05:00
8575afe735 Updated jenkins build file 2022-03-02 18:07:55 -05:00
f5806348dc Merge pull request 'feature/update_library_again (#8)' (#9) from develop into master
Some checks reported errors
Locusworks Team/app-logger/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #9
2022-03-02 16:57:19 -06:00
043e9e9075 feature/update_library_again (#8)
Some checks reported errors
Locusworks Team/app-logger/pipeline/head Something is wrong with the build of this commit
Co-authored-by: Isaac Parenteau <locus2k@gmail.com>
Reviewed-on: #8
2022-03-02 16:56:32 -06:00
1986831f2c updated log4j library 2022-03-02 17:47:08 -05:00
9ac40b5922 Updated log4j 2022-03-02 17:41:44 -05:00
77bd18b0f1 Merge pull request 'develop' (#7) from develop into master
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good
Reviewed-on: #7
2021-09-14 22:24:35 -05:00
e30e2c8455 Merge pull request 'release/1.0' (#4) from release/1.0 into master
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good
2020-05-31 21:32:23 +00:00
bf1b6497ef Merge pull request 'develop' (#3) from develop into release/1.0
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good
2020-05-31 21:32:06 +00:00
7c65b8aecf Merge pull request 'develop' (#1) from develop into master
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good
2020-05-22 18:56:39 +00:00
3 changed files with 10 additions and 9 deletions

1
.gitignore vendored
View File

@ -2,4 +2,5 @@
.classpath
.settings/
target/
.idea/
bin/

8
Jenkinsfile vendored
View File

@ -48,7 +48,7 @@ def init() {
if (branch_name.indexOf('master')==0) build_type='master'
// common pipeline elements
node('master') {
node() {
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() {
Deploy();
}
} else if (branch_name.indexOf('release/')==0) {
node('master') {
node() {
Deploy();
}
}
node('master') {
node() {
set_result('SUCCESS')
}

10
pom.xml
View File

@ -9,7 +9,7 @@
<description>Logger library for applications</description>
<scm>
<url>ssh://git@bitbucket.org:locus2k/applogger.git</url>
<url>https://gitea.locusworks.net/locusworks/app-logger.git</url>
</scm>
<organization>
<name>locusworks</name>
@ -20,8 +20,8 @@
<main.basedir>${project.basedir}</main.basedir>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<log4j.version>2.14.1</log4j.version>
<slf4j.version>1.7.32</slf4j.version>
<log4j.version>2.17.2</log4j.version>
<slf4j.version>1.7.36</slf4j.version>
<nexus.repo>https://nexus.locusworks.net</nexus.repo>
</properties>
@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.10.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@ -51,7 +51,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>6.3.1</version>
<version>7.0.0</version>
<executions>
<execution>
<goals>