Compare commits

..

No commits in common. "master" and "AcceptanceTestStable" have entirely different histories.

6 changed files with 6 additions and 9 deletions

1
.gitignore vendored
View File

@ -36,4 +36,3 @@ overridedb.*
davos.log
src/main/resources/application.properties
src/main/resources/log4j2.xml
.vscode/

View File

@ -38,8 +38,6 @@ Finally, schedules can be started or stopped at any point, using the schedules l
![https://raw.githubusercontent.com/linuxserver/davos/master/docs/list.PNG](https://raw.githubusercontent.com/linuxserver/davos/master/docs/list.PNG)
# Changelog
- **2.2.2**
- Updated log4j dependency to 2.16.0, accounting for CVE-2021-44228
- **2.2.1**
- Fixed bug where lastRunTime got reset whenever a change was made to a schedule.

View File

@ -61,9 +61,9 @@ dependencies {
compile 'org.springframework.boot:spring-boot-starter-data-jpa'
compile 'org.springframework.boot:spring-boot-starter-jdbc'
compile 'org.apache.logging.log4j:log4j-api:2.16.0'
compile 'org.apache.logging.log4j:log4j-core:2.16.0'
compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.16.0'
compile 'org.apache.logging.log4j:log4j-api:2.4.1'
compile 'org.apache.logging.log4j:log4j-core:2.4.1'
compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.4.1'
compile 'com.jcraft:jsch:0.1.50'
compile 'joda-time:joda-time:2.3'

View File

@ -1 +1 @@
davos.version=2.2.2
davos.version=2.2.1

View File

@ -4,4 +4,4 @@ spring.datasource.password=sa
spring.datasource.driverClassName=org.h2.Driver
spring.jpa.hibernate.ddl-auto=update
davos.version=2.2.2
davos.version=2.2.1

View File

@ -1 +1 @@
2.2.2
2.2.1