4.3.3: Spring Boot -> 2.2.3, Gradle -> 6.1

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

.travis.yml

@@ -11,7 +11,6 @@ git:
 language: java
 jdk: openjdk11
 node_js: lts/*
-python: 3.7
 service: docker
 os: linux
 arch: amd64
@@ -26,11 +25,13 @@ addons:
       - lsof
       #- bash
       - docker-ce
-      - python3-pip
       - libxml2-utils
       #- libappindicator1
       #- fonts-liberation
       #- google-chrome-stable
+      - python3-pip
+      - openssl
+      - httpie
 install: true
 before_install:
   #- export CHROME_BIN=/usr/bin/google-chrome
@@ -44,8 +45,7 @@ before_install:
   - stop_any 80 8001 8002 8080 5432
   #
   - export PATH=$HOME/.local/bin:$PATH
-  - pip3 install --user --upgrade pip setuptools
-  - pip install --user --upgrade docker-compose httpie
+  - pip install --user --upgrade pip setuptools docker-compose pyopenssl
 before_script:
   - export PATH=/tmp:$PATH
   - export APP_UPLOAD_PATH="/tmp/file-storage"

DEVELOPMENT.md

@@ -23,7 +23,7 @@ _process versions substitution_
 _set specific version_
 
 ```bash
-./mvnw versions:set -DnewVersion=4.3.32
+./mvnw versions:set -DnewVersion=4.3.33
 ```
 
 **maven version management**

FEATURES.md

@@ -1,6 +1,6 @@
 # Features
 
-- migrate to latest spring-boot `2.2.2.RELEASE`
+- migrate to latest spring-boot `2.2.3.RELEASE`
 - reactive cors filter: see `modules/apps/file-items-service/src/main/java/daggerok/config/CorsWebFluxConfigurer.java`
 - global 404 fallback: see `modules/apps/file-server/src/main/java/daggerok/web/config/FallbackConfig.java`
 - split architecture into micro-services

INSTALL.md

@@ -26,16 +26,16 @@ application.cmd clean path\to\storage
 
 ```bash
 # database
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/docker-compose.yml
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/docker-compose.yml
 docker-compose -f docker-compose.yml up -d
 
 # file-items data service
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-items-service-4.3.32.jar
-bash file-items-service-4.3.32.jar --spring.profiles.active=db-pg
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/file-items-service-4.3.33.jar
+bash file-items-service-4.3.33.jar --spring.profiles.active=db-pg
 
 # file server
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-server-4.3.32.jar
-bash file-server-4.3.32.jar --app.upload.path=./path/to/file-storage
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/file-server-4.3.33.jar
+bash file-server-4.3.33.jar --app.upload.path=./path/to/file-storage
 
 # cleanup
 docker-compose -f docker-compose.yml down -v
@@ -44,7 +44,7 @@ docker-compose -f docker-compose.yml down -v
 **or simply using shell-script**
 
 ```bash
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/application.bash
 
 # start
 bash application.bash start ./path/to/file-storage
@@ -60,7 +60,7 @@ bash application.bash clean ./path/to/file-storage
 
 installed binaries: `wget`, `docker-compose`, `bash` and of course `java` are required
 
-**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application.cmd**
+**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/application.cmd**
 
 ```cmd
 @rem start
@@ -80,18 +80,18 @@ installed binaries: `which`, `wget`, `docker-compose`, `taskkill`, `mkdir` and o
 **with h2 in-memory database**
 
 ```bash
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-items-service-4.3.32.jar
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-server-4.3.32.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/file-items-service-4.3.33.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/file-server-4.3.33.jar
 
-# bash file-items-service-4.3.32.jar --spring.profiles.active=db-h2 # or just:
-bash file-items-service-4.3.32.jar
-bash file-server-4.3.32.jar --app.upload.path=./path/to/file-storage
+# bash file-items-service-4.3.33.jar --spring.profiles.active=db-h2 # or just:
+bash file-items-service-4.3.33.jar
+bash file-server-4.3.33.jar --app.upload.path=./path/to/file-storage
 ```
 
 **or simply shell script for h2**
 
 ```bash
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application-h2.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/application-h2.bash
 
 # start
 bash application-h2.bash start ./path/to/file-storage
@@ -103,7 +103,7 @@ bash application-h2.bash stop
 bash application-h2.bash clean ./path/to/file-storage
 ```
 
-**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application-h2.cmd**
+**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/application-h2.cmd**
 
 ```cmd
 @rem start

README.md

@@ -1,5 +1,5 @@
 # streaming-file-server [![build](https://travis-ci.org/daggerok/streaming-file-server.svg?branch=master)](https://travis-ci.org/daggerok/streaming-file-server)
-_version: 4.3.32_
+_version: 4.3.33_
 
 Full-stack java file server based on spring-boot / spring-* with no limitation for upload and download files
 

RELEASE.md

@@ -1,16 +1,13 @@
 # streaming-file-server
-_4.3.32 release notes_
+_4.3.33 release notes_
 
 * Automate HTML version replacement
 * Update versions:
   * spring boot
-  * bootstrap
-  * bootstrap file input
-  * hibernate-java8
   * selenide
-  * git-publish gradle plugin
   * asciidoctor convert gradle plugin
   * asciidoctorj-pdf 
+  * gradle
 
 ## Java file server 
 
@@ -31,16 +28,16 @@ _4.3.32 release notes_
 
 ```bash
 # docker compose file for postgres database
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/docker-compose.yml
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/docker-compose.yml
 docker-compose up -d
 
 # file-items data service
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-items-service-4.3.32.jar
-java -jar file-items-service-4.3.32.jar --spring.profiles.active=db-pg
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/file-items-service-4.3.33.jar
+java -jar file-items-service-4.3.33.jar --spring.profiles.active=db-pg
 
 # file server
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-server-4.3.32.jar
-java -jar file-server-4.3.32.jar --app.upload.path=./path/to/file-storage
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/file-server-4.3.33.jar
+java -jar file-server-4.3.33.jar --app.upload.path=./path/to/file-storage
 
 # cleanup
 docker-compose down -v
@@ -50,7 +47,7 @@ docker-compose down -v
 
 ```bash
 # bash script
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/application.bash
 
 # start
 bash application.bash start ./path/to/file-storage
@@ -70,7 +67,7 @@ binaries: `wget`, `docker-compose`, `bash` and of course `java` are required
 
 ```cmd
 @rem batch shell-script
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application.cmd
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/application.cmd
 
 @rem start
 application.cmd start path\to\file-storage
@@ -91,18 +88,18 @@ binaries: `which`, `wget`, `docker-compose`, `taskkill`, `mkdir` and of course j
 #### manual setup
 
 ```bash
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-items-service-4.3.32.jar
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/file-server-4.3.32.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/file-items-service-4.3.33.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/file-server-4.3.33.jar
 
-bash file-items-service-4.3.32.jar --spring.profiles.active=db-h2
-bash file-server-4.3.32.jar --app.upload.path=./path/to/file-storage
+bash file-items-service-4.3.33.jar --spring.profiles.active=db-h2
+bash file-server-4.3.33.jar --app.upload.path=./path/to/file-storage
 ```
 
 #### or for simplicity use special h2 automation shell-script
 
 ```bash
 # bash shell script
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application-h2.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/application-h2.bash
 
 # start
 bash application-h2.bash start ./path/to/file-storage
@@ -118,7 +115,7 @@ bash application-h2.bash clean ./path/to/file-storage
 
 ```cmd
 @rem cmd script
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.32/application-h2.cmd
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/application-h2.cmd
 
 @rem start
 application-h2.cmd start path\to\file-storage

build.gradle.kts

@@ -1,10 +1,7 @@
-import org.gradle.api.tasks.testing.logging.TestLogEvent.*
-
 buildscript {
   repositories {
     gradlePluginPortal()
   }
-
   dependencies {
     classpath("gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:${Globals.spotbugsVersion}")
   }
@@ -18,7 +15,6 @@ plugins {
   id("com.github.ben-manes.versions") version Globals.versionsVersion
   id("io.franzbecker.gradle-lombok") version Globals.lombokPluginVersion
   id("org.springframework.boot") version Globals.springBootVersion apply false
-  id("org.ajoberstar.git-publish") version Globals.gitPublishVersion apply false
   id("org.asciidoctor.convert") version Globals.asciidoctorjConvertVersion apply false
   id("com.avast.gradle.docker-compose") version Globals.dockerComposeVersion apply false
   id("com.ewerk.gradle.plugins.querydsl") version Globals.querydslVersion apply false
@@ -39,10 +35,10 @@ tasks.withType<Wrapper> {
   distributionType = Wrapper.DistributionType.BIN
 }
 
-apply(from = "${project.rootDir}/gradle/ide.gradle")
-apply(from = "${project.rootDir}/gradle/clean.gradle")
-apply(from = "${project.rootDir}/gradle/subprojects.gradle")
-apply(from = "${project.rootDir}/gradle/documentation.gradle")
+apply(from = "$rootDir/gradle/ide.gradle")
+apply(from = "$rootDir/gradle/clean.gradle")
+apply(from = "$rootDir/gradle/subprojects.gradle")
+apply(from = "$rootDir/gradle/documentation.gradle")
 
 // gradle dependencyUpdates -Drevision=release --parallel
 tasks {
@@ -67,7 +63,11 @@ tasks {
     testLogging {
       showExceptions = true
       showStandardStreams = true
-      events(PASSED, SKIPPED, FAILED)
+      events(
+          org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED,
+          org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED,
+          org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
+      )
     }
   }
 }

buildSrc/src/main/java/Globals.kt

@@ -1,7 +1,7 @@
 import org.gradle.api.JavaVersion
 
 object Globals {
-  const val version = "4.3.32"
+  const val version = "4.3.33"
   const val groupId = "com.github.daggerok"
   const val artifactId = "streaming-file-server"
 
@@ -13,28 +13,27 @@ object Globals {
   const val logbackVersion = "1.2.3"
   const val lombokVersion = "1.18.10"
   const val jgivenVersion = "0.18.2"
-  const val selenideVersion = "5.5.1"
-  const val postgresVersion = "42.2.8"
+  const val selenideVersion = "5.6.1"
+  const val postgresVersion = "42.2.9"
   const val bootstrapVersion = "4.4.1"
   const val commonsIoVersion = "1.3.2"
   const val jacocoToolVersion = "0.8.4"
-  const val fontAwesomeVersion = "5.11.2"
+  const val fontAwesomeVersion = "5.12.0"
   const val powermockitoVersion = "2.0.4"
-  const val springBootVersion = "2.2.2.RELEASE"
+  const val springBootVersion = "2.2.3.RELEASE"
   const val bootstrapFileInputVersion = "5.0.7"
   const val hibernateJava8Version = "5.4.10.Final"
 
-  const val wrapperVersion = "6.0.1"
+  const val wrapperVersion = "6.1"
 
-  const val toolVersion = "4.0.0-beta4"
+  const val toolVersion = "4.0.0-beta5"
   const val spotbugsVersion = "2.0.0"
   const val querydslVersion = "1.0.10"
   const val versionsVersion = "0.27.0"
-  const val gitPublishVersion = "2.1.3-rc.1"
   const val lombokPluginVersion = "3.2.0"
   const val dependencyManagementVersion = "1.0.8.RELEASE"
-  const val dockerComposeVersion = "0.10.4"
-  const val asciidoctorjPdfVersion = "1.5.0-beta.8"
-  const val asciidoctorjDiagramVersion = "1.5.18"
+  const val dockerComposeVersion = "0.10.7"
+  const val asciidoctorjPdfVersion = "1.5.0-rc.2"
+  const val asciidoctorjDiagramVersion = "2.0.0"
   const val asciidoctorjConvertVersion = "2.4.0"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

modules/apps/file-items-service/src/main/resources/banner.txt

@@ -11,4 +11,4 @@
   ░                  ░  ░         ░                ░       ░  ░     ░             ░     ░    ░ ░           ░  ░
                                                                                ░           ░
 
-                                      2016-2019 (C) Maksim Kostromin
+                                    2016-present (C) Maksim Kostromin

modules/apps/file-server/src/main/resources/banner.txt

@@ -11,4 +11,4 @@
               ░         ░  ░      ░  ░             ░        ░  ░      ░              ░        ░  ░      ░
                                                                                     ░
 
-                                      2016-2019 (C) Maksim Kostromin
+                                    2016-present (C) Maksim Kostromin

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

@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <link rel="stylesheet" href="{{ctx}}/webjars/bootstrap/4.4.1/dist/css/bootstrap.min.css"/>
   <link rel="stylesheet" href="{{ctx}}/webjars/bootstrap-fileinput/5.0.7/css/fileinput.min.css"/>
-  <link rel="stylesheet" href="{{ctx}}/webjars/font-awesome/5.11.2/css/all.css"/>
+  <link rel="stylesheet" href="{{ctx}}/webjars/font-awesome/5.12.0/css/all.css"/>
   <link rel="stylesheet" href="{{ctx}}/css/app.css"/>
   <link rel="shortcut icon" type="image/x-icon" href="{{ctx}}/images/favicon.ico">
 </head>