Merge branch 'main' of https://git.griefed.de/prosper/docker-template-repo

.github/workflows/test.yml

@@ -48,7 +48,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup Node.js environment
-        uses: actions/setup-node@v2.5.0
+        uses: actions/setup-node@v2.5.1
         with:
           # Version Spec of the version to use.  Examples: 12.x, 10.15.1, >=10.15.0
           node-version: '>= 16.13.1'
@@ -126,7 +126,7 @@ jobs:
         #  2. ubuntu-latest
         #  3. windows-latest
       - name: Setup Node.js environment
-        uses: actions/setup-node@v2.5.0
+        uses: actions/setup-node@v2.5.1
         with:
           # Version Spec of the version to use.  Examples: 12.x, 10.15.1, >=10.15.0
           node-version: '>= 16.9.1'

.gitlab-ci.yml

@@ -190,6 +190,9 @@ Gradle Test:
 #      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA"
 #      --build-arg BRANCH_OR_TAG=$CI_COMMIT_REF_NAME
 #      --file Dockerfile .
+#  only:
+#    variables:
+#      - $CI_SERVER_HOST == "git.griefed.de"
 
 Gradle Dependency-Checks:
   image: griefed/baseimage-ubuntu-jdk-8:2.0.0
@@ -386,8 +389,9 @@ Gradle Dependency-Checks:
 #      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest"
 #      --build-arg BRANCH_OR_TAG=$CI_COMMIT_TAG
 #      --file Dockerfile .
-#  rules:
-#    - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+$/'
+#  only:
+#    variables:
+#      - '$CI_COMMIT_TAG =~ /^\\d+\\.\\d+\\.\\d+$/ && $CI_SERVER_HOST == "git.griefed.de"'
 
 #Build Docker PreRelease:
 #  stage: Build Release
@@ -404,12 +408,13 @@ Gradle Dependency-Checks:
 #      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG"
 #      --build-arg BRANCH_OR_TAG=$CI_COMMIT_TAG
 #      --file Dockerfile .
-#  rules:
-#    - if: "$CI_COMMIT_TAG =~ /^\\d+\\.\\d+\\.\\d+(-beta|-alpha)\\.\\d+$/"
+#  only:
+#    variables:
+#      - '$CI_COMMIT_TAG =~ /^\\d+\\.\\d+\\.\\d+(-beta|-alpha)\\.\\d+$/ && $CI_SERVER_HOST == "git.griefed.de"'
 
 coverage:
   stage: Other
-  image: registry.gitlab.com/haynes/jacoco2cobertura:1.0.7
+  image: registry.gitlab.com/haynes/jacoco2cobertura:1.0.8
   allow_failure: true
   script:
     - python /opt/cover2cover.py build/jacoco/test/jacocoTestReport.xml $CI_PROJECT_DIR/backend/main/java/ > build/cobertura.xml
@@ -462,3 +467,5 @@ coverage:
 #    paths:
 #      - public
 #    expire_in: 1 week
+#  rules:
+#    - if: "$CI_SERVER_HOST =~ /git.griefed.de/"

build.gradle

@@ -11,14 +11,14 @@ plugins {
 
     id 'jacoco'
 
-    id "com.github.ben-manes.versions" version '0.39.0'
+    id "com.github.ben-manes.versions" version '0.41.0'
 
     id 'maven-publish'
 
     id 'edu.sc.seis.launch4j' version '2.5.1'
     id 'org.siouan.frontend-jdk8' version '6.0.0'
 
-    id 'org.springframework.boot' version '2.6.2'
+    id 'org.springframework.boot' version '2.6.3'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 }
 
@@ -92,27 +92,28 @@ dependencies {
     // WEB
     //embed 'org.springframework.boot:spring-boot-starter-security:2.5.6'
     //embed 'org.springframework.boot:spring-boot-starter-validation:2.6.2'
-    embed 'org.springframework.boot:spring-boot-starter-web:2.6.2'
-    embed 'org.springframework.boot:spring-boot-starter-log4j2:2.6.2'
-    embed 'org.springframework.boot:spring-boot-starter-quartz:2.6.2'
+    embed 'org.springframework.boot:spring-boot-starter-web:2.6.3'
+    embed 'org.springframework.boot:spring-boot-starter-log4j2:2.6.3'
+    embed 'org.springframework.boot:spring-boot-starter-quartz:2.6.3'
     //embed 'org.springframework.boot:spring-boot-starter-data-jpa:2.6.2'
     //embed 'org.springframework.boot:spring-boot-starter-artemis:2.6.2'
     //embed 'org.apache.activemq:artemis-jms-server:2.19.0'
-    embed 'org.apache.logging.log4j:log4j-web:2.17.0'
+    embed 'org.apache.logging.log4j:log4j-web:2.17.1'
 
-    embed 'org.apache.logging.log4j:log4j-api:2.17.0'
-    embed 'org.apache.logging.log4j:log4j-core:2.17.0'
+    embed 'org.apache.logging.log4j:log4j-api:2.17.1'
+    embed 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
+    embed 'org.apache.logging.log4j:log4j-core:2.17.1'
     embed 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.0'
-    embed 'org.apache.logging.log4j:log4j-web:2.17.0'
-    embed 'org.apache.logging.log4j:log4j-jul:2.17.0'
+    embed 'org.apache.logging.log4j:log4j-web:2.17.1'
+    embed 'org.apache.logging.log4j:log4j-jul:2.17.1'
 
     // Dev tools
-    developmentOnly 'org.springframework.boot:spring-boot-devtools:2.6.2'
+    developmentOnly 'org.springframework.boot:spring-boot-devtools:2.6.3'
 
     // Testing
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test:2.6.2'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test:2.6.3'
     testImplementation 'org.junit.platform:junit-platform-commons:1.8.2'
 }
 

frontend/package.json

@@ -26,20 +26,20 @@
     "test": "echo \"No test specified\" && exit 0"
   },
   "dependencies": {
-    "@quasar/extras": "1.12.2",
+    "@quasar/extras": "1.12.4",
     "axios": "0.24.0",
-    "quasar": "2.4.2",
-    "core-js": "3.20.1",
-    "tsparticles": "1.37.6"
+    "quasar": "2.4.9",
+    "core-js": "3.20.3",
+    "tsparticles": "1.38.0"
   },
   "devDependencies": {
     "@babel/eslint-parser": "7.16.5",
-    "electron": "16.0.5",
-    "@quasar/app": "3.2.6",
+    "electron": "16.0.7",
+    "@quasar/app": "3.2.9",
     "electron-packager": "15.4.0",
-    "eslint": "8.5.0",
+    "eslint": "8.7.0",
     "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-vue": "8.2.0",
+    "eslint-plugin-vue": "8.3.0",
     "eslint-webpack-plugin": "3.1.1"
   },
   "browserslist": [