Compare commits
15 Commits
1.0.3-RELE
...
1.1.2-RELE
Author | SHA1 | Date | |
---|---|---|---|
65cc93f466 | |||
a4c39918f0 | |||
55a2f620a1 | |||
b50eccc471 | |||
ecfdf202d8 | |||
43cffb3610 | |||
8575afe735 | |||
f5806348dc | |||
043e9e9075 | |||
1986831f2c | |||
9ac40b5922 | |||
77bd18b0f1 | |||
e30e2c8455 | |||
bf1b6497ef | |||
7c65b8aecf |
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,4 +2,5 @@
|
|||||||
.classpath
|
.classpath
|
||||||
.settings/
|
.settings/
|
||||||
target/
|
target/
|
||||||
|
.idea/
|
||||||
bin/
|
bin/
|
||||||
|
8
Jenkinsfile
vendored
8
Jenkinsfile
vendored
@ -48,7 +48,7 @@ def init() {
|
|||||||
if (branch_name.indexOf('master')==0) build_type='master'
|
if (branch_name.indexOf('master')==0) build_type='master'
|
||||||
|
|
||||||
// common pipeline elements
|
// common pipeline elements
|
||||||
node('master') {
|
node() {
|
||||||
Initialize()
|
Initialize()
|
||||||
SetVersion(build_type)
|
SetVersion(build_type)
|
||||||
print_vars() // after SetVersion - all variables now defined
|
print_vars() // after SetVersion - all variables now defined
|
||||||
@ -57,16 +57,16 @@ def init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (branch_name.indexOf('develop')==0) {
|
if (branch_name.indexOf('develop')==0) {
|
||||||
node('master') {
|
node() {
|
||||||
Deploy();
|
Deploy();
|
||||||
}
|
}
|
||||||
} else if (branch_name.indexOf('release/')==0) {
|
} else if (branch_name.indexOf('release/')==0) {
|
||||||
node('master') {
|
node() {
|
||||||
Deploy();
|
Deploy();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
node('master') {
|
node() {
|
||||||
set_result('SUCCESS')
|
set_result('SUCCESS')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
10
pom.xml
10
pom.xml
@ -9,7 +9,7 @@
|
|||||||
<description>Logger library for applications</description>
|
<description>Logger library for applications</description>
|
||||||
|
|
||||||
<scm>
|
<scm>
|
||||||
<url>ssh://git@bitbucket.org:locus2k/applogger.git</url>
|
<url>https://gitea.locusworks.net/locusworks/app-logger.git</url>
|
||||||
</scm>
|
</scm>
|
||||||
<organization>
|
<organization>
|
||||||
<name>locusworks</name>
|
<name>locusworks</name>
|
||||||
@ -20,8 +20,8 @@
|
|||||||
<main.basedir>${project.basedir}</main.basedir>
|
<main.basedir>${project.basedir}</main.basedir>
|
||||||
<maven.compiler.source>1.8</maven.compiler.source>
|
<maven.compiler.source>1.8</maven.compiler.source>
|
||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
<maven.compiler.target>1.8</maven.compiler.target>
|
||||||
<log4j.version>2.14.1</log4j.version>
|
<log4j.version>2.17.2</log4j.version>
|
||||||
<slf4j.version>1.7.32</slf4j.version>
|
<slf4j.version>1.7.36</slf4j.version>
|
||||||
<nexus.repo>https://nexus.locusworks.net</nexus.repo>
|
<nexus.repo>https://nexus.locusworks.net</nexus.repo>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
@ -38,7 +38,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.8.1</version>
|
<version>3.10.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>${maven.compiler.source}</source>
|
<source>${maven.compiler.source}</source>
|
||||||
<target>${maven.compiler.target}</target>
|
<target>${maven.compiler.target}</target>
|
||||||
@ -51,7 +51,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.owasp</groupId>
|
<groupId>org.owasp</groupId>
|
||||||
<artifactId>dependency-check-maven</artifactId>
|
<artifactId>dependency-check-maven</artifactId>
|
||||||
<version>6.3.1</version>
|
<version>7.0.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
|
Reference in New Issue
Block a user