From 70e7a87189bb55524ca9c61d46ce9e2ba9f05773 Mon Sep 17 00:00:00 2001 From: death-claw <53543762+death-claw@users.noreply.github.com> Date: Thu, 31 Aug 2023 23:28:59 +0100 Subject: [PATCH] dependencies update (#109) --- vripper-core/pom.xml | 3 +- .../main/kotlin/me/mnlr/vripper/Management.kt | 41 +------------------ vripper-gui/pom.xml | 2 +- vripper-project.iml | 9 ++++ vripper-web-ui/vripper-web-ui.iml | 9 ++++ vripper-web/pom.xml | 2 +- 6 files changed, 23 insertions(+), 43 deletions(-) create mode 100644 vripper-project.iml create mode 100644 vripper-web-ui/vripper-web-ui.iml diff --git a/vripper-core/pom.xml b/vripper-core/pom.xml index d39e058..bc967e2 100644 --- a/vripper-core/pom.xml +++ b/vripper-core/pom.xml @@ -7,7 +7,7 @@ spring-boot-starter-parent org.springframework.boot - 3.0.6 + 3.1.3 me.mnlr.vripper vripper-core @@ -49,6 +49,7 @@ httpclient org.apache.httpcomponents + 4.5.14 htmlcleaner diff --git a/vripper-core/src/main/kotlin/me/mnlr/vripper/Management.kt b/vripper-core/src/main/kotlin/me/mnlr/vripper/Management.kt index 23f2e57..8733a4f 100644 --- a/vripper-core/src/main/kotlin/me/mnlr/vripper/Management.kt +++ b/vripper-core/src/main/kotlin/me/mnlr/vripper/Management.kt @@ -1,58 +1,19 @@ package me.mnlr.vripper import jakarta.annotation.PreDestroy -import org.springframework.beans.factory.annotation.Value +import me.mnlr.vripper.download.DownloadService import org.springframework.jdbc.core.JdbcTemplate import org.springframework.stereotype.Component -import me.mnlr.vripper.download.DownloadService -import me.mnlr.vripper.services.AsyncTaskRunnerService -import java.nio.file.Path -import java.time.format.DateTimeFormatter -import java.util.* -import java.util.regex.Pattern @Component class Management( private val jdbcTemplate: JdbcTemplate, - @Value("\${base.dir}") baseDir: String, - @Value("\${base.dir.name}") baseDirName: String, - private val asyncTaskRunnerService: AsyncTaskRunnerService, private val downloadService: DownloadService ) { - private val backupFolder: Path - - init { - backupFolder = Path.of(baseDir, baseDirName, "backup") - } @PreDestroy fun destroy() { -// taskRunnerService.destroy() downloadService.destroy() jdbcTemplate.execute("SHUTDOWN") } - -// @PostConstruct -// @Scheduled(cron = "0 0 0 ? * *") -// private fun backup() { -// -// for (file in Files.list(backupFolder)) { -// val matcher = BACKUP_FILE_PATTERN.matcher(file.fileName.toString()) -// if (matcher.find()) { -// val localDate = LocalDate.parse(matcher.group(1), FORMATTER) -// if (localDate.isEqual(LocalDate.now())) { -// return -// } -// } -// } -// -// // create a backup file -// val backupFile = backupFolder.resolve("db_${LocalDateTime.now().format(FORMATTER)}.tar.gz") -// jdbcTemplate.execute("BACKUP DATABASE TO '${backupFile}' BLOCKING") -// } - - companion object { - val FORMATTER: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") - private val BACKUP_FILE_PATTERN = Pattern.compile("^db_(\\d{4}-\\d{2}-\\d{2})\\.tar\\.gz$") - } } \ No newline at end of file diff --git a/vripper-gui/pom.xml b/vripper-gui/pom.xml index 57f0c70..c56af8c 100644 --- a/vripper-gui/pom.xml +++ b/vripper-gui/pom.xml @@ -7,7 +7,7 @@ spring-boot-starter-parent org.springframework.boot - 3.0.6 + 3.1.3 me.mnlr.vripper vripper-gui diff --git a/vripper-project.iml b/vripper-project.iml new file mode 100644 index 0000000..a1b5ac7 --- /dev/null +++ b/vripper-project.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/vripper-web-ui/vripper-web-ui.iml b/vripper-web-ui/vripper-web-ui.iml new file mode 100644 index 0000000..844f49f --- /dev/null +++ b/vripper-web-ui/vripper-web-ui.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/vripper-web/pom.xml b/vripper-web/pom.xml index ece1ada..f14d5cf 100644 --- a/vripper-web/pom.xml +++ b/vripper-web/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.4 + 3.1.3 me.mnlr.vripper