Skip to content

Commit 2ab46be

Browse files
committed
4.3.32: Spring Boot 2.2.2.RELEASE
1 parent 06b5ff7 commit 2ab46be

File tree

18 files changed

+87
-83
lines changed

18 files changed

+87
-83
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ node_js: lts/*
1414
python: 3.7
1515
service: docker
1616
os: linux
17+
arch: amd64
1718
addons:
1819
apt:
1920
update: true

DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ _process versions substitution_
2323
_set specific version_
2424

2525
```bash
26-
./mvnw versions:set -DnewVersion=4.3.31
26+
./mvnw versions:set -DnewVersion=4.3.32
2727
```
2828

2929
**maven version management**

FEATURES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Features
22

3-
- migrate to latest spring-boot `2.2.1.RELEASE`
3+
- migrate to latest spring-boot `2.2.2.RELEASE`
44
- reactive cors filter: see `modules/apps/file-items-service/src/main/java/daggerok/config/CorsWebFluxConfigurer.java`
55
- global 404 fallback: see `modules/apps/file-server/src/main/java/daggerok/web/config/FallbackConfig.java`
66
- split architecture into micro-services

INSTALL.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ application.cmd clean path\to\storage
2626

2727
```bash
2828
# database
29-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/docker-compose.yml
29+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/docker-compose.yml
3030
docker-compose -f docker-compose.yml up -d
3131

3232
# file-items data service
33-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/file-items-service-4.3.31.jar
34-
bash file-items-service-4.3.31.jar --spring.profiles.active=db-pg
33+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-items-service-4.3.32.jar
34+
bash file-items-service-4.3.32.jar --spring.profiles.active=db-pg
3535

3636
# file server
37-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/file-server-4.3.31.jar
38-
bash file-server-4.3.31.jar --app.upload.path=./path/to/file-storage
37+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-server-4.3.32.jar
38+
bash file-server-4.3.32.jar --app.upload.path=./path/to/file-storage
3939

4040
# cleanup
4141
docker-compose -f docker-compose.yml down -v
@@ -44,7 +44,7 @@ docker-compose -f docker-compose.yml down -v
4444
**or simply using shell-script**
4545

4646
```bash
47-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/application.bash
47+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application.bash
4848

4949
# start
5050
bash application.bash start ./path/to/file-storage
@@ -60,7 +60,7 @@ bash application.bash clean ./path/to/file-storage
6060

6161
installed binaries: `wget`, `docker-compose`, `bash` and of course `java` are required
6262

63-
**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/application.cmd**
63+
**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application.cmd**
6464

6565
```cmd
6666
@rem start
@@ -80,18 +80,18 @@ installed binaries: `which`, `wget`, `docker-compose`, `taskkill`, `mkdir` and o
8080
**with h2 in-memory database**
8181

8282
```bash
83-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/file-items-service-4.3.31.jar
84-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/file-server-4.3.31.jar
83+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-items-service-4.3.32.jar
84+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-server-4.3.32.jar
8585

86-
# bash file-items-service-4.3.31.jar --spring.profiles.active=db-h2 # or just:
87-
bash file-items-service-4.3.31.jar
88-
bash file-server-4.3.31.jar --app.upload.path=./path/to/file-storage
86+
# bash file-items-service-4.3.32.jar --spring.profiles.active=db-h2 # or just:
87+
bash file-items-service-4.3.32.jar
88+
bash file-server-4.3.32.jar --app.upload.path=./path/to/file-storage
8989
```
9090

9191
**or simply shell script for h2**
9292

9393
```bash
94-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/application-h2.bash
94+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application-h2.bash
9595

9696
# start
9797
bash application-h2.bash start ./path/to/file-storage
@@ -103,7 +103,7 @@ bash application-h2.bash stop
103103
bash application-h2.bash clean ./path/to/file-storage
104104
```
105105

106-
**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/application-h2.cmd**
106+
**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application-h2.cmd**
107107

108108
```cmd
109109
@rem start

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# streaming-file-server [![build](https://travis-ci.org/daggerok/streaming-file-server.svg?branch=master)](https://travis-ci.org/daggerok/streaming-file-server)
2-
_version: 4.3.31_
2+
_version: 4.3.32_
33

44
Full-stack java file server based on spring-boot / spring-* with no limitation for upload and download files
55

RELEASE.md

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
# streaming-file-server
2-
_4.3.31 release notes_
3-
4-
* Migrate tp Gradle 6.0.1
5-
* Migrate `kotlin-dsl` -> `embedded-kotlin`
6-
* Remove useless gradle propdeps plugins
7-
* More Gradle Kotlin DSL migrations
8-
* Update docker images
2+
_4.3.32 release notes_
3+
4+
* Automate HTML version replacement
5+
* Update versions:
6+
* spring boot
7+
* bootstrap
8+
* bootstrap file input
9+
* hibernate-java8
10+
* selenide
11+
* git-publish gradle plugin
12+
* asciidoctor convert gradle plugin
13+
* asciidoctorj-pdf
914

1015
## Java file server
1116

@@ -14,6 +19,9 @@ _4.3.31 release notes_
1419
### incompatible (not upgradeable) versions
1520

1621
ch.qos.logback:logback-classic [1.2.3 -> 1.3.0-alpha4]
22+
com.tngtech.jgiven:jgiven-html5-report [0.18.2 -> 1.0.0-RC2]
23+
com.tngtech.jgiven:jgiven-junit [0.18.2 -> 1.0.0-RC2]
24+
com.tngtech.jgiven:jgiven-junit5 [0.18.2 -> 1.0.0-RC2]
1725

1826
## Installation
1927

@@ -23,16 +31,16 @@ _4.3.31 release notes_
2331

2432
```bash
2533
# docker compose file for postgres database
26-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/docker-compose.yml
34+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/docker-compose.yml
2735
docker-compose up -d
2836

2937
# file-items data service
30-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/file-items-service-4.3.31.jar
31-
java -jar file-items-service-4.3.31.jar --spring.profiles.active=db-pg
38+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-items-service-4.3.32.jar
39+
java -jar file-items-service-4.3.32.jar --spring.profiles.active=db-pg
3240

3341
# file server
34-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/file-server-4.3.31.jar
35-
java -jar file-server-4.3.31.jar --app.upload.path=./path/to/file-storage
42+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-server-4.3.32.jar
43+
java -jar file-server-4.3.32.jar --app.upload.path=./path/to/file-storage
3644

3745
# cleanup
3846
docker-compose down -v
@@ -42,7 +50,7 @@ docker-compose down -v
4250

4351
```bash
4452
# bash script
45-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/application.bash
53+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application.bash
4654

4755
# start
4856
bash application.bash start ./path/to/file-storage
@@ -62,7 +70,7 @@ binaries: `wget`, `docker-compose`, `bash` and of course `java` are required
6270

6371
```cmd
6472
@rem batch shell-script
65-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/application.cmd
73+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application.cmd
6674
6775
@rem start
6876
application.cmd start path\to\file-storage
@@ -83,18 +91,18 @@ binaries: `which`, `wget`, `docker-compose`, `taskkill`, `mkdir` and of course j
8391
#### manual setup
8492

8593
```bash
86-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/file-items-service-4.3.31.jar
87-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/file-server-4.3.31.jar
94+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-items-service-4.3.32.jar
95+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-server-4.3.32.jar
8896

89-
bash file-items-service-4.3.31.jar --spring.profiles.active=db-h2
90-
bash file-server-4.3.31.jar --app.upload.path=./path/to/file-storage
97+
bash file-items-service-4.3.32.jar --spring.profiles.active=db-h2
98+
bash file-server-4.3.32.jar --app.upload.path=./path/to/file-storage
9199
```
92100

93101
#### or for simplicity use special h2 automation shell-script
94102

95103
```bash
96104
# bash shell script
97-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/application-h2.bash
105+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application-h2.bash
98106

99107
# start
100108
bash application-h2.bash start ./path/to/file-storage
@@ -110,7 +118,7 @@ bash application-h2.bash clean ./path/to/file-storage
110118

111119
```cmd
112120
@rem cmd script
113-
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.31/application-h2.cmd
121+
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application-h2.cmd
114122
115123
@rem start
116124
application-h2.cmd start path\to\file-storage

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ tasks {
5252
all {
5353
// val rejected = listOf("alpha", "beta", "rc", "cr", "m", "preview", "b", "ea", "M1", "BUILD-SNAPSHOT", "SNAPSHOT")
5454
val rejected = listOf("alpha") // ch.qos.logback:logback-classic:1.3.0-alpha*, io.vavr:vavr:1.0.0-alpha-*
55+
// com.tngtech.jgiven:jgiven-*:1.0.0-RC1 com.tngtech.jgiven:jgiven-*:1.0.0-RC2
5556
.map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-+]*") }
5657
.any { it.matches(candidate.version) }
5758
if (rejected) reject("Release candidate")

buildSrc/src/main/java/Globals.kt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11
import org.gradle.api.JavaVersion
22

33
object Globals {
4-
const val version = "4.3.31"
4+
const val version = "4.3.32"
55
const val groupId = "com.github.daggerok"
66
const val artifactId = "streaming-file-server"
77

88
val javaVersion = JavaVersion.VERSION_1_8
99

1010
const val vavrVersion = "0.10.2"
11-
const val slf4jVersion = "1.7.26"
1211
const val jqueryVersion = "3.4.1"
1312
const val popperVersion = "1.16.0"
1413
const val logbackVersion = "1.2.3"
1514
const val lombokVersion = "1.18.10"
1615
const val jgivenVersion = "0.18.2"
17-
const val selenideVersion = "5.5.0"
16+
const val selenideVersion = "5.5.1"
1817
const val postgresVersion = "42.2.8"
19-
const val bootstrapVersion = "4.3.1"
18+
const val bootstrapVersion = "4.4.1"
2019
const val commonsIoVersion = "1.3.2"
2120
const val jacocoToolVersion = "0.8.4"
2221
const val fontAwesomeVersion = "5.11.2"
2322
const val powermockitoVersion = "2.0.4"
24-
const val springBootVersion = "2.2.1.RELEASE"
25-
const val bootstrapFileInputVersion = "5.0.1"
26-
const val hibernateJava8Version = "5.4.9.Final"
23+
const val springBootVersion = "2.2.2.RELEASE"
24+
const val bootstrapFileInputVersion = "5.0.7"
25+
const val hibernateJava8Version = "5.4.10.Final"
2726

2827
const val wrapperVersion = "6.0.1"
2928

3029
const val toolVersion = "4.0.0-beta4"
3130
const val spotbugsVersion = "2.0.0"
3231
const val querydslVersion = "1.0.10"
3332
const val versionsVersion = "0.27.0"
34-
const val gitPublishVersion = "2.1.2"
33+
const val gitPublishVersion = "2.1.3-rc.1"
3534
const val lombokPluginVersion = "3.2.0"
3635
const val dependencyManagementVersion = "1.0.8.RELEASE"
3736
const val dockerComposeVersion = "0.10.4"
38-
const val asciidoctorjPdfVersion = "1.5.0-beta.7"
37+
const val asciidoctorjPdfVersion = "1.5.0-beta.8"
3938
const val asciidoctorjDiagramVersion = "1.5.18"
40-
const val asciidoctorjConvertVersion = "2.3.0"
39+
const val asciidoctorjConvertVersion = "2.4.0"
4140
}

modules/apps/file-server/src/main/resources/templates/parts/head.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<title>File server</title>
66
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
8-
<link rel="stylesheet" href="{{ctx}}/webjars/bootstrap/4.3.1/dist/css/bootstrap.min.css"/>
9-
<link rel="stylesheet" href="{{ctx}}/webjars/bootstrap-fileinput/5.0.1/css/fileinput.min.css"/>
8+
<link rel="stylesheet" href="{{ctx}}/webjars/bootstrap/4.4.1/dist/css/bootstrap.min.css"/>
9+
<link rel="stylesheet" href="{{ctx}}/webjars/bootstrap-fileinput/5.0.7/css/fileinput.min.css"/>
1010
<link rel="stylesheet" href="{{ctx}}/webjars/font-awesome/5.11.2/css/all.css"/>
1111
<link rel="stylesheet" href="{{ctx}}/css/app.css"/>
1212
<link rel="shortcut icon" type="image/x-icon" href="{{ctx}}/images/favicon.ico">

modules/apps/file-server/src/main/resources/templates/parts/tail.hbs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,9 @@
55
2016-2019 &copy; Maksim Kostromin <i class="text-muted fab fa-github"></i></a>
66
</div>
77
</footer>
8-
<!--jquery CDN: -->
9-
<!--<script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>-->
10-
<!--jquery webjars npm: -->
11-
<!--<script src="{{ctx}}/webjars/jquery/3.4.1/jquery.min.js"></script>-->
12-
<!--jquery webjars bower: -->
138
<script src="{{ctx}}/webjars/jquery/3.4.1/dist/jquery.min.js"></script>
149
<script src="{{ctx}}/webjars/popper.js/1.16.0/dist/umd/popper.min.js"></script>
15-
<script src="{{ctx}}/webjars/bootstrap/4.3.1/dist/js/bootstrap.bundle.min.js"></script>
16-
<script src="{{ctx}}/webjars/bootstrap-fileinput/5.0.1/js/fileinput.min.js"></script>
10+
<script src="{{ctx}}/webjars/bootstrap/4.4.1/dist/js/bootstrap.bundle.min.js"></script>
11+
<script src="{{ctx}}/webjars/bootstrap-fileinput/5.0.7/js/fileinput.min.js"></script>
1712
</body>
1813
</html>

0 commit comments

Comments
 (0)