Skip to content

Commit

Permalink
4.3.4: Spring Boot -> 2.2.4, Gradle -> 6.1.1 | See last commit (C) wh…
Browse files Browse the repository at this point in the history
…atthecommit.com
  • Loading branch information
daggerok committed Jan 25, 2020
1 parent ce4c633 commit c8e201f
Show file tree
Hide file tree
Showing 13 changed files with 50 additions and 54 deletions.
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ _process versions substitution_
_set specific version_

```bash
./mvnw versions:set -DnewVersion=4.3.33
./mvnw versions:set -DnewVersion=4.3.34
```

**maven version management**
Expand Down
2 changes: 1 addition & 1 deletion FEATURES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Features

- migrate to latest spring-boot `2.2.3.RELEASE`
- migrate to latest spring-boot `2.2.4.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
Expand Down
28 changes: 14 additions & 14 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ application.cmd clean path\to\storage

```bash
# database
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/docker-compose.yml
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/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.33/file-items-service-4.3.33.jar
bash file-items-service-4.3.33.jar --spring.profiles.active=db-pg
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/file-items-service-4.3.34.jar
bash file-items-service-4.3.34.jar --spring.profiles.active=db-pg

# file server
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
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/file-server-4.3.34.jar
bash file-server-4.3.34.jar --app.upload.path=./path/to/file-storage

# cleanup
docker-compose -f docker-compose.yml down -v
Expand All @@ -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.33/application.bash
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/application.bash

# start
bash application.bash start ./path/to/file-storage
Expand All @@ -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.33/application.cmd**
**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/application.cmd**

```cmd
@rem start
Expand All @@ -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.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
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/file-items-service-4.3.34.jar
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/file-server-4.3.34.jar

# 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
# bash file-items-service-4.3.34.jar --spring.profiles.active=db-h2 # or just:
bash file-items-service-4.3.34.jar
bash file-server-4.3.34.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.33/application-h2.bash
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/application-h2.bash

# start
bash application-h2.bash start ./path/to/file-storage
Expand All @@ -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.33/application-h2.cmd**
**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/application-h2.cmd**

```cmd
@rem start
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.33_
_version: 4.3.34_

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

Expand Down
34 changes: 16 additions & 18 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# streaming-file-server
_4.3.33 release notes_
_4.3.34 release notes_

* Automate HTML version replacement
* Update versions:
* spring boot
* selenide
* asciidoctor convert gradle plugin
* asciidoctorj-pdf
* powermock
* spotbugs
* gradle

## Java file server
Expand All @@ -28,16 +26,16 @@ _4.3.33 release notes_

```bash
# docker compose file for postgres database
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/docker-compose.yml
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/docker-compose.yml
docker-compose up -d

# file-items data service
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
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/file-items-service-4.3.34.jar
java -jar file-items-service-4.3.34.jar --spring.profiles.active=db-pg

# file server
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
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/file-server-4.3.34.jar
java -jar file-server-4.3.34.jar --app.upload.path=./path/to/file-storage

# cleanup
docker-compose down -v
Expand All @@ -47,7 +45,7 @@ docker-compose down -v

```bash
# bash script
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.33/application.bash
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/application.bash

# start
bash application.bash start ./path/to/file-storage
Expand All @@ -67,7 +65,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.33/application.cmd
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/application.cmd
@rem start
application.cmd start path\to\file-storage
Expand All @@ -88,18 +86,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.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
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/file-items-service-4.3.34.jar
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/file-server-4.3.34.jar

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
bash file-items-service-4.3.34.jar --spring.profiles.active=db-h2
bash file-server-4.3.34.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.33/application-h2.bash
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/application-h2.bash

# start
bash application-h2.bash start ./path/to/file-storage
Expand All @@ -115,7 +113,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.33/application-h2.cmd
wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/application-h2.cmd
@rem start
application-h2.cmd start path\to\file-storage
Expand Down
10 changes: 5 additions & 5 deletions buildSrc/src/main/java/Globals.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.gradle.api.JavaVersion

object Globals {
const val version = "4.3.33"
const val version = "4.3.34"
const val groupId = "com.github.daggerok"
const val artifactId = "streaming-file-server"

Expand All @@ -19,14 +19,14 @@ object Globals {
const val commonsIoVersion = "1.3.2"
const val jacocoToolVersion = "0.8.4"
const val fontAwesomeVersion = "5.12.0"
const val powermockitoVersion = "2.0.4"
const val springBootVersion = "2.2.3.RELEASE"
const val powermockitoVersion = "2.0.5"
const val springBootVersion = "2.2.4.RELEASE"
const val bootstrapFileInputVersion = "5.0.7"
const val hibernateJava8Version = "5.4.10.Final"

const val wrapperVersion = "6.1"
const val wrapperVersion = "6.1.1"

const val toolVersion = "4.0.0-beta5"
const val toolVersion = "4.0.0-RC1"
const val spotbugsVersion = "2.0.0"
const val querydslVersion = "1.0.10"
const val versionsVersion = "0.27.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.github.daggerok</groupId>
<artifactId>streaming-file-server</artifactId>
<packaging>pom</packaging>
<version>4.3.33</version>
<version>4.3.34</version>

<developers>
<developer>
Expand Down Expand Up @@ -62,23 +62,23 @@
<asciidoctorj.diagram.version>2.0.0</asciidoctorj.diagram.version>

<vavr.version>0.10.2</vavr.version>
<gradle.version>6.1</gradle.version>
<gradle.version>6.1.1</gradle.version>
<jquery.version>3.4.1</jquery.version>
<tool.version>4.0.0-RC1</tool.version>
<popper.version>1.16.0</popper.version>
<jgiven.version>0.18.2</jgiven.version><!-- jgiven.version 1.0.0-RC2 currently is incompatibleQ -->
<tool.version>4.0.0-beta5</tool.version>
<lombok.version>1.18.10</lombok.version>
<spotbugs.version>2.0.0</spotbugs.version>
<selenide.version>5.6.1</selenide.version>
<postgres.version>42.2.9</postgres.version>
<bootstrap.version>4.4.1</bootstrap.version>
<commons.io.version>1.3.2</commons.io.version>
<jacoco.tool.version>0.8.4</jacoco.tool.version>
<powermockito.version>2.0.4</powermockito.version>
<powermockito.version>2.0.5</powermockito.version>
<font.awesome.version>5.12.0</font.awesome.version>
<lombok.plugin.version>3.2.0</lombok.plugin.version>
<versions.gradle.plugin>0.27.0</versions.gradle.plugin>
<spring.boot.version>2.2.3.RELEASE</spring.boot.version>
<spring.boot.version>2.2.4.RELEASE</spring.boot.version>
<hibernate.java8.version>5.4.10.Final</hibernate.java8.version>
<bootstrap.file.input.version>5.0.7</bootstrap.file.input.version>
<docker.compose.gradle.plugin>0.10.7</docker.compose.gradle.plugin>
Expand Down
2 changes: 1 addition & 1 deletion scripts/application-h2.bash
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#LOG_LEVEL=debug

# app info
VERSION=4.3.33
VERSION=4.3.34
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}"
Expand Down
2 changes: 1 addition & 1 deletion scripts/application-h2.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SETLOCAL ENABLEEXTENSIONS

SET ApplicationPath="app"

SET Version=4.3.33
SET Version=4.3.34
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%
Expand Down
2 changes: 1 addition & 1 deletion scripts/application.bash
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#LOG_LEVEL=debug

# app info
VERSION=4.3.33
VERSION=4.3.34
COMPOSE_FILE="docker-compose.yml"
FILE_SERVER_FILENAME="file-server-${VERSION}.jar"
FILE_ITEMS_SERVICE_FILENAME="file-items-service-${VERSION}.jar"
Expand Down
2 changes: 1 addition & 1 deletion scripts/application.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ SET InfoLogLevel=0

SET ApplicationPath="app"

SET Version=4.3.33
SET Version=4.3.34
SET DockerComposeFile=docker-compose.yml
SET DockerComposeUrl=https://github.com/daggerok/streaming-file-server/releases/download/%Version%/%dockerComposeFile%
SET DockerComposeCommand=docker-compose -f %ApplicationPath%\%DockerComposeFile%
Expand Down
6 changes: 2 additions & 4 deletions src/main/templates/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# streaming-file-server
_${project.version} release notes_

* Automate HTML version replacement
* Update versions:
* spring boot
* selenide
* asciidoctor convert gradle plugin
* asciidoctorj-pdf
* powermock
* spotbugs
* gradle

## Java file server
Expand Down

0 comments on commit c8e201f

Please sign in to comment.