Fix Gradle upgrade. Vendors versions update.

daggerok · daggerok · commit 712057b14218 · 2018-11-26T05:58:27.000+02:00
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 streaming-file-server [![build](https://travis-ci.org/daggerok/streaming-file-server.svg?branch=master)](https://travis-ci.org/daggerok/streaming-file-server)
 =====================
 
-_latests VERSION: 4.3.5_
+_latest VERSION: 4.3.6_
 
 full-stack java file server based on spring-boot / spring-* with no limitation for upload and download files
 
@@ -19,16 +19,16 @@ Read [reference documentation](http://daggerok.github.io/streaming-file-server)
 
 ```bash
 # database
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/docker-compose.yml
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/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.5/file-items-service-4.3.5.jar
-bash file-items-service-4.3.5.jar --spring.profiles.active=db-pg
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/file-items-service-4.3.6.jar
+bash file-items-service-4.3.6.jar --spring.profiles.active=db-pg
 
 # file server
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-server-4.3.5.jar
-bash file-server-4.3.5.jar --app.upload.path=./path/to/file-storage
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/file-server-4.3.6.jar
+bash file-server-4.3.6.jar --app.upload.path=./path/to/file-storage
 
 # cleanup
 docker-compose -f docker-compose.yml down -v
@@ -37,7 +37,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.5/application.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/application.bash
 
 # start
 bash application.bash start ./path/to/file-storage
@@ -53,7 +53,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.5/application.cmd**
+**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/application.cmd**
 
 ```cmd
 @rem start
@@ -73,18 +73,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.5/file-items-service-4.3.5.jar
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-server-4.3.5.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/file-items-service-4.3.6.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/file-server-4.3.6.jar
 
-# bash file-items-service-4.3.5.jar --spring.profiles.active=db-h2 # or just:
-bash file-items-service-4.3.5.jar
-bash file-server-4.3.5.jar --app.upload.path=./path/to/file-storage
+# bash file-items-service-4.3.6.jar --spring.profiles.active=db-h2 # or just:
+bash file-items-service-4.3.6.jar
+bash file-server-4.3.6.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.5/application-h2.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/application-h2.bash
 
 # start
 bash application-h2.bash start ./path/to/file-storage
@@ -96,7 +96,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.5/application-h2.cmd**
+**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/application-h2.cmd**
 
 ```cmd
 @rem start
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,23 +1,23 @@
 # streaming-file-server
 
-_version: 4.3.5_
+_version: 4.3.6_
 
 ## Java file server 
 
 **Java file server** based on *spring-boot* with no memory, upload or download files size limitations
 
-1. Applied spring team recommendations base on [that JIRA: Reactive Repositories are not supported by JPA. Need
-spring-webflux + spring-data-jpa combination get working](https://jira.spring.io/browse/DATACMNS-1413)
-2. Fix Download web controller (download file wailed with optional error)
-3. Fix docker compose all, add nginx reverse proxy
-4. Versions update
+1. Spring Boot and Gradle versions update
 
-  | dependency              | version       |
-  |------------------------:|:--------------|
-  | spring-boot             | 2.0.6.RELEASE |
-  | lombok                  | 1.18.4        |
-  | org.asciidoctor.convert | 1.5.9.1       |
-  | gradle                  | 5.0-rc-1      |
+  | dependency                 | version       |
+  |---------------------------:|:--------------|
+  | spring-boot                | 2.1.0.RELEASE |
+  | font-awesome               | 5.5.0         |
+  | popper                     | 1.14.5        |
+  | powermock                  | 2.0.0-RC.4    |
+  | jgiven                     | 0.17.0        |
+  | gradle                     | 5.0-rc-5      |
+  | org.ajoberstar.git-publish | 2.0.0         |
+  | jruby                      | 9.2.4.0       |
 
 ## Installation
 
@@ -27,16 +27,16 @@ spring-webflux + spring-data-jpa combination get working](https://jira.spring.io
 
 ```bash
 # docker compose file for postgres database
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/docker-compose.yml
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/docker-compose.yml
 docker-compose up -d
 
 # file-items data service
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-items-service-4.3.5.jar
-java -jar file-items-service-4.3.5.jar --spring.profiles.active=db-pg
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/file-items-service-4.3.6.jar
+java -jar file-items-service-4.3.6.jar --spring.profiles.active=db-pg
 
 # file server
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-server-4.3.5.jar
-java -jar file-server-4.3.5.jar --app.upload.path=./path/to/file-storage
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/file-server-4.3.6.jar
+java -jar file-server-4.3.6.jar --app.upload.path=./path/to/file-storage
 
 # cleanup
 docker-compose down -v
@@ -46,7 +46,7 @@ docker-compose down -v
 
 ```bash
 # bash script
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/application.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/application.bash
 
 # start
 bash application.bash start ./path/to/file-storage
@@ -66,7 +66,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.5/application.cmd
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/application.cmd
 
 @rem start
 application.cmd start path\to\file-storage
@@ -87,18 +87,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.5/file-items-service-4.3.5.jar
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.5/file-server-4.3.5.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/file-items-service-4.3.6.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/file-server-4.3.6.jar
 
-bash file-items-service-4.3.5.jar --spring.profiles.active=db-h2
-bash file-server-4.3.5.jar --app.upload.path=./path/to/file-storage
+bash file-items-service-4.3.6.jar --spring.profiles.active=db-h2
+bash file-server-4.3.6.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.5/application-h2.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/application-h2.bash
 
 # start
 bash application-h2.bash start ./path/to/file-storage
@@ -114,7 +114,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.5/application-h2.cmd
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.6/application-h2.cmd
 
 @rem start
 application-h2.cmd start path\to\file-storage
diff --git a/build.gradle b/build.gradle
@@ -1,34 +1,34 @@
 buildscript {
   ext {
-    applicationVersion = '4.3.5'
+    applicationVersion = '4.3.6'
     applicationGroup = 'com.github.daggerok'
     applicationName = 'streaming-file-server'
 
     environmentFileDir = '.'
     propertiesPluginEnvironmentNameProperty = 'env'
 
-    springBootVersion = '2.0.6.RELEASE'
+    springBootVersion = '2.1.0.RELEASE'
     commonsIoVersion = '1.3.2'
     lombokVersion = '1.18.4'
     logbackVersion = '1.2.3' // 1.3.0-alpha4 is incompatible
     slf4jVersion = '1.7.25'
     vavrVersion = '0.9.2'
 
-    jgivenVersion = '0.16.1'
-    powermockitoVersion = '2.0.0-RC.1'
-    selenideVersion = '5.0.0'
+    jgivenVersion = '0.17.0'
+    powermockitoVersion = '2.0.0-RC.4'
+    selenideVersion = '5.0.1'
 
-    popperVersion = '1.14.4'
+    popperVersion = '1.14.5'
     jqueryVersion = '3.3.1-1'
-    fontAwesomeVersion = '5.4.1'
+    fontAwesomeVersion = '5.5.0'
 
     bootstrapVersion = '4.1.3'
     bootstrapFileInputVersion = '4.4.8'
   }
 
   dependencies {
     classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
-    classpath 'org.jruby:jruby-complete:9.1.13.0'
+    classpath 'org.jruby:jruby-complete:9.2.4.0' /* 9.1.13.0 */ 
   }
 
   configurations.all {
@@ -47,12 +47,12 @@ plugins {
   id 'cn.bestwu.propdeps-maven' version '0.0.10' apply false
   id 'cn.bestwu.propdeps-eclipse' version '0.0.10' apply false
   id 'io.franzbecker.gradle-lombok' version '1.14' apply false
-  id 'org.springframework.boot' version '2.0.6.RELEASE' apply false
+  id 'org.springframework.boot' version '2.1.0.RELEASE' apply false
   id 'com.ewerk.gradle.plugins.querydsl' version '1.0.10' apply false
   id 'io.spring.dependency-management' version '1.0.6.RELEASE' apply false
 
-  id 'com.github.breadmoirai.github-release' version '2.2.0' apply false
-  id 'org.ajoberstar.git-publish' version '2.0.0-rc.2' /* +0.3.0 +0.2.2 | -0.4.1 */ apply false
+  id 'com.github.breadmoirai.github-release' version '2.2.1' apply false
+  id 'org.ajoberstar.git-publish' version '2.0.0' /* '2.0.0-rc.2' *//* +0.3.0 +0.2.2 | -0.4.1 */ apply false
   id 'org.asciidoctor.convert' version '1.5.9.1' apply false // on windows my fail: instead use 1.5.8.1
   id 'com.avast.gradle.docker-compose' version '0.7.1' apply false // fail with 0.8.9 + asciidoctor ruby
 }
@@ -64,7 +64,7 @@ allprojects {
 }
 
 wrapper {
-  gradleVersion = '5.0-rc-1' // For more details see https://docs.gradle.org/5.0-rc-1/release-notes.html
+  gradleVersion = '5.0-rc-5' // For more details see https://docs.gradle.org/5.0-rc-1/release-notes.html
   distributionType = 'BIN'
 }
 
diff --git a/docs/includes/install/in-mempry-h2.adoc b/docs/includes/install/in-mempry-h2.adoc
@@ -18,7 +18,7 @@ java file-items-service-{project-version}.jar --spring.profiles.active=db-h2
 ----
 
 ////
-with special chars, will show {project-version}, but not substitution, like 4.3.5
+with special chars, will show {project-version}, but not substitution, like 4.3.6
 
 .and then run link:https://github.com/daggerok/streaming-file-server/releases/download/{project-version}/file-server-{project-version}.jar[file server]:
 [source,bash]
diff --git a/gradle/documentation.gradle b/gradle/documentation.gradle
@@ -15,12 +15,12 @@ asciidoctor {
   }
   outputDir = project.file("$asciidocBuildDir")
   attributes toc: 'left',
-      doctype: 'book',
       ruby: 'erubis',
-      encoding: 'utf-8',
+      doctype: 'book',
+      numbered: false,
       linkattrs: true,
-      numbered: true,
       sectanchors: true,
+      encoding: 'utf-8',
       sectlink: true,
       idprefix: '',
       docinfo1: '',
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-rc-5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/modules/apps/file-server/src/main/resources/application-file-orig.yml b/modules/apps/file-server/src/main/resources/application-file-orig.yml
@@ -7,4 +7,4 @@ spring:
     multipart:
       max-file-size: 40960MB
       max-request-size: 40960MB
-      file-size-threshold: 10Mb
+      file-size-threshold: 10MB
diff --git a/modules/apps/file-server/src/main/resources/application.yml b/modules/apps/file-server/src/main/resources/application.yml
@@ -51,7 +51,7 @@ spring:
     multipart:
       max-file-size: -1
       max-request-size: -1
-      file-size-threshold: 10Mb
+      file-size-threshold: 10MB
       resolve-lazily: true
 
 #  # old legacy (spring-boot 1.x):
diff --git a/modules/apps/file-server/src/main/resources/templates/parts/head.hbs b/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.1.3/dist/css/bootstrap.min.css"/>
   <link rel="stylesheet" href="{{ctx}}/webjars/bootstrap-fileinput/4.4.8/css/fileinput.min.css"/>
-  <link rel="stylesheet" href="{{ctx}}/webjars/font-awesome/5.4.1/css/all.css"/>
+  <link rel="stylesheet" href="{{ctx}}/webjars/font-awesome/5.5.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>
diff --git a/modules/apps/file-server/src/main/resources/templates/parts/tail.hbs b/modules/apps/file-server/src/main/resources/templates/parts/tail.hbs
@@ -8,7 +8,7 @@
 </footer>
 
 <script src="{{ctx}}/webjars/jquery/3.3.1-1/jquery.min.js"></script>
-<script src="{{ctx}}/webjars/popper.js/1.14.4/dist/umd/popper.min.js"></script>
+<script src="{{ctx}}/webjars/popper.js/1.14.5/dist/umd/popper.min.js"></script>
 <script src="{{ctx}}/webjars/bootstrap/4.1.3/dist/js/bootstrap.bundle.min.js"></script>
 <script src="{{ctx}}/webjars/bootstrap-fileinput/4.4.8/js/fileinput.min.js"></script>
 
diff --git a/pom.xml b/pom.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="
-         http://maven.apache.org/POM/4.0.0
-         http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <!--
 
@@ -48,13 +46,16 @@
 
   -->
 
-  <version>4.3.5</version>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.daggerok</groupId>
   <artifactId>streaming-file-server</artifactId>
   <packaging>pom</packaging>
+  <version>4.3.6</version>
 
   <properties>
+    <java.version>1.8</java.version>
+    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
diff --git a/scripts/application-h2.bash b/scripts/application-h2.bash
@@ -5,7 +5,7 @@
 #LOG_LEVEL=debug
 
 # app info
-VERSION=4.3.5
+VERSION=4.3.6
 FILE_SERVER_FILENAME="file-server-${VERSION}.jar"
 FILE_ITEMS_SERVICE_FILENAME="file-items-service-${VERSION}.jar"
 RELEASE_BASE_PATH="https://github.com/daggerok/streaming-file-server/releases/download/${VERSION}"
diff --git a/scripts/application-h2.cmd b/scripts/application-h2.cmd
@@ -15,7 +15,7 @@ SETLOCAL ENABLEEXTENSIONS
 
 SET ApplicationPath="app"
 
-SET Version=4.3.5
+SET Version=4.3.6
 SET FileServerFile=file-server-%Version%.jar
 SET FileServerUrl=https://github.com/daggerok/streaming-file-server/releases/download/%Version%/%FileServerFile%
 SET FileServerCommand=java -jar %ApplicationPath%\%FileServerFile%
diff --git a/scripts/application.bash b/scripts/application.bash
diff --git a/scripts/application.cmd b/scripts/application.cmd
diff --git a/settings.gradle b/settings.gradle
