From 148a992fc967d7c71c9a673f0cffc1c004f4b1f2 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 18 Apr 2021 23:46:42 +0000
Subject: [PATCH] 0.6-SNAPSHOT
---
doc/images/screen-jobmonitor.png | 0
build.gradle | 2 +-
borgbutler-docker/app/Dockerfile | 2 +-
borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ArchivesRest.kt | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/borgbutler-docker/app/Dockerfile b/borgbutler-docker/app/Dockerfile
index d252cd9..532513f 100644
--- a/borgbutler-docker/app/Dockerfile
+++ b/borgbutler-docker/app/Dockerfile
@@ -16,7 +16,7 @@
USER borgbutler:borgbutler
# Don't put fat jar files in docker images: https://phauer.com/2019/no-fat-jar-in-docker-image/
-ARG DEPENDENCY=target/dependency/borgbutler-server-0.5
+ARG DEPENDENCY=target/dependency/borgbutler-server-0.6-SNAPSHOT
COPY ${DEPENDENCY}/lib /app/lib
#COPY ${DEPENDENCY}/META-INF /app/META-INF
#COPY ${DEPENDENCY}/BOOT-INF/classes /app
diff --git a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ArchivesRest.kt b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ArchivesRest.kt
index 4423148..bb36b33 100644
--- a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ArchivesRest.kt
+++ b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ArchivesRest.kt
@@ -150,7 +150,7 @@
return RestUtils.notFound()
}
if (openDownloads == true) openFileBrowser(File(restoreDir, item.getPath()))
- return ResponseEntity.accepted().body("OK")
+ return ResponseEntity.accepted().body("OK") // OK for download (see FileListEntry.jsx)
} catch (ex: IOException) {
log.error("No file extracted: " + ex.message, ex)
return RestUtils.notFound()
diff --git a/build.gradle b/build.gradle
index 8d87b85..4ae8561 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@
allprojects {
group = 'de.micromata.borgbutler'
- version = '0.5'
+ version = '0.6-SNAPSHOT'
}
subprojects {
diff --git a/doc/images/screen-jobmonitor.png b/doc/images/screen-jobmonitor.png
index 5cb217a..952d1c9 100644
--- a/doc/images/screen-jobmonitor.png
+++ b/doc/images/screen-jobmonitor.png
Binary files differ
--
Gitblit v1.10.0