4.3.35...

daggerok · Mar 10, 2020 · b22729a · b22729a
1 parent c8e201f
commit b22729a
Show file tree

Hide file tree

Showing 35 changed files with 356 additions and 345 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -0,0 +1,84 @@
+name: integration-tests
+on: [push]
+jobs:
+  ui:
+    strategy:
+      matrix:
+        java: [11]
+        os: [ubuntu-latest]
+        nodejs-version: [12]
+        python-version: [3.8]
+    name: k-services java ${{ matrix.java }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      # git clone
+      - name: Git clone
+        uses: actions/checkout@v1
+
+      # java
+      - name: Setup java ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+
+      # python: pip install httpie
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Cache python ${{ matrix.python-version }} deps
+        uses: actions/cache@v1
+        with:
+          path: ~/.pip
+          key: ${{ runner.os }}-${{ matrix.os }}-pip-
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.os }}-pip-
+      - name: Install / upgrade pip
+        run: python -m pip install --upgrade pip setuptools
+      - name: Install HTTPie
+        run: pip install --upgrade httpie
+
+      # node: npm install wait-port
+      - name: Setup NodeJS ${{ matrix.nodejs-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.nodejs-version }}
+      - name: Cache npm ${{ matrix.nodejs-version }} deps
+        uses: actions/cache@v1
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ matrix.os }}-npm-
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.os }}-npm-
+      - name: Install npm apps (wait-port)
+        run: npm install -g wait-port
+
+      - name: Cache gradle deps
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle # npm cache files are stored in `~/.gradle` on Linux/macOS
+          key: ${{ runner.os }}-build-${{ hashFiles('**/*gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Build gradle apps
+        run: |
+          cd $GITHUB_WORKSPACE && ./gradlew -S clean build
+
+      - name: Run gradle apps
+        run: |
+          java -jar $GITHUB_WORKSPACE/modules/apps/file-items-service/build/libs/*.jar &
+          java -jar $GITHUB_WORKSPACE/modules/apps/file-server/build/libs/*.jar &
+
+      - name: Test apps
+        run: |
+          echo "wait-port 8001 8002"
+          #wait-port 8001 8002
+          wait-port 8001
+          wait-port 8002
+          echo "http -a user:password :8001"
+          http -a user:password :8001
+          echo "http -a admin:admin :8002"
+          http -a admin:admin :8002/
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -23,7 +23,7 @@ _process versions substitution_
 _set specific version_
 
 ```bash
-./mvnw versions:set -DnewVersion=4.3.34
+./mvnw versions:set -DnewVersion=4.3.35
 ```
 
 **maven version management**

diff --git a/FEATURES.md b/FEATURES.md
@@ -1,6 +1,6 @@
 # Features
 
-- migrate to latest spring-boot `2.2.4.RELEASE`
+- migrate to latest spring-boot `2.2.5.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

diff --git a/INSTALL.md b/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.34/docker-compose.yml
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/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.34/file-items-service-4.3.34.jar
-bash file-items-service-4.3.34.jar --spring.profiles.active=db-pg
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/file-items-service-4.3.35.jar
+bash file-items-service-4.3.35.jar --spring.profiles.active=db-pg
 
 # file server
-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
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/file-server-4.3.35.jar
+bash file-server-4.3.35.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.34/application.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/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.34/application.cmd**
+**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/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.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
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/file-items-service-4.3.35.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/file-server-4.3.35.jar
 
-# 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
+# bash file-items-service-4.3.35.jar --spring.profiles.active=db-h2 # or just:
+bash file-items-service-4.3.35.jar
+bash file-server-4.3.35.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.34/application-h2.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/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.34/application-h2.cmd**
+**for windows use https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/application-h2.cmd**
 
 ```cmd
 @rem start

diff --git a/README.md b/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.34_
+_version: 4.3.35_
 
 Full-stack java file server based on spring-boot / spring-* with no limitation for upload and download files
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -1,11 +1,14 @@
 # streaming-file-server
-_4.3.34 release notes_
+_4.3.35 release notes_
 
-* Update versions:
-  * spring boot
-  * powermock
-  * spotbugs
-  * gradle
+Update versions:
+
+| artifact                                      |    | version
+|-----------------------------------------------|----|--------------
+| com.avast.gradle.docker-compose.gradle.plugin | -> | 0.10.9
+| spring boot                                   | -> | 2.2.5.RELEASE
+| selenide                                      | -> | 5.8.0
+| gradle                                        | -> | 6.2.2
 
 ## Java file server 
 
@@ -26,16 +29,16 @@ _4.3.34 release notes_
 
 ```bash
 # docker compose file for postgres database
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/docker-compose.yml
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/docker-compose.yml
 docker-compose up -d
 
 # file-items data service
-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
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/file-items-service-4.3.35.jar
+java -jar file-items-service-4.3.35.jar --spring.profiles.active=db-pg
 
 # file server
-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
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/file-server-4.3.35.jar
+java -jar file-server-4.3.35.jar --app.upload.path=./path/to/file-storage
 
 # cleanup
 docker-compose down -v
@@ -45,7 +48,7 @@ docker-compose down -v
 
 ```bash
 # bash script
-wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.34/application.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/application.bash
 
 # start
 bash application.bash start ./path/to/file-storage
@@ -65,7 +68,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.34/application.cmd
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/application.cmd
 
 @rem start
 application.cmd start path\to\file-storage
@@ -86,18 +89,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.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
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/file-items-service-4.3.35.jar
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/file-server-4.3.35.jar
 
-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
+bash file-items-service-4.3.35.jar --spring.profiles.active=db-h2
+bash file-server-4.3.35.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.34/application-h2.bash
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/application-h2.bash
 
 # start
 bash application-h2.bash start ./path/to/file-storage
@@ -113,7 +116,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.34/application-h2.cmd
+wget https://github.com/daggerok/streaming-file-server/releases/download/4.3.35/application-h2.cmd
 
 @rem start
 application-h2.cmd start path\to\file-storage

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,36 +2,39 @@ buildscript {
   repositories {
     gradlePluginPortal()
   }
-  dependencies {
-    classpath("gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:${Globals.spotbugsVersion}")
-  }
 }
 
 plugins {
   idea
   maven
   eclipse
   `java-library`
-  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.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
-  id("io.spring.dependency-management") version Globals.dependencyManagementVersion
+  id("io.franzbecker.gradle-lombok")
+  id("com.github.ben-manes.versions")
+  id("io.spring.dependency-management")
+  id("com.ewerk.gradle.plugins.querydsl") apply false
+  id("com.avast.gradle.docker-compose") apply false
+  id("org.springframework.boot") apply false
+  id("org.asciidoctor.convert") apply false
 }
 
-extra["lombok.version"] = Globals.lombokVersion
-extra["postgresql.version"] = Globals.postgresVersion
+val groupId: String by project
+val lombokVersion: String by project
+val projectVersion: String by project
+val wrapperVersion: String by project
+val postgresVersion: String by project
+
+extra["lombok.version"] = lombokVersion
+extra["postgresql.version"] = postgresVersion
 
 allprojects {
-  version = Globals.version
-  group = Globals.groupId
+  group = groupId
+  version = projectVersion
   defaultTasks("clean", "build")
 }
 
 tasks.withType<Wrapper> {
-  gradleVersion = Globals.wrapperVersion
+  gradleVersion = wrapperVersion
   distributionType = Wrapper.DistributionType.BIN
 }
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/buildSrc/src/main/java/Globals.kt b/buildSrc/src/main/java/Globals.kt