Skip to content
Snippets Groups Projects
Commit 43ce16cb authored by Griefed's avatar Griefed :joystick:
Browse files

Merge branch 'main' into 'renovate-spring-boot'

# Conflicts:
#   build.gradle
parents 6b1a4d9c fa44d646
No related branches found
No related tags found
1 merge request!153Update spring boot to v2.7.2
...@@ -16,7 +16,7 @@ variables: ...@@ -16,7 +16,7 @@ variables:
SECRET_DETECTION_EXCLUDED_PATHS: "" SECRET_DETECTION_EXCLUDED_PATHS: ""
services: services:
- name: ghcr.io/griefed/gitlab-ci-cd:2.0.8 - name: ghcr.io/griefed/gitlab-ci-cd:2.0.9
alias: docker alias: docker
workflow: workflow:
...@@ -134,7 +134,7 @@ secret_detection: ...@@ -134,7 +134,7 @@ secret_detection:
Gradle Test: Gradle Test:
stage: Tests stage: Tests
image: ghcr.io/griefed/baseimage-ubuntu-jdk-8:2.0.3 image: ghcr.io/griefed/baseimage-ubuntu-jdk-8:2.0.12
before_script: before_script:
- echo "**** Running in $CI_JOB_ID ****" - echo "**** Running in $CI_JOB_ID ****"
- echo "**** Java location ****" - echo "**** Java location ****"
...@@ -366,7 +366,7 @@ coverage: ...@@ -366,7 +366,7 @@ coverage:
path: build/cobertura.xml path: build/cobertura.xml
Gradle Dependency-Checks: Gradle Dependency-Checks:
image: griefed/baseimage-ubuntu-jdk-8:2.0.11 image: griefed/baseimage-ubuntu-jdk-8:2.0.12
stage: Other stage: Other
allow_failure: true allow_failure: true
before_script: before_script:
......
FROM griefed/baseimage-ubuntu-jdk-8:2.0.11 AS builder FROM griefed/baseimage-ubuntu-jdk-8:2.0.12 AS builder
ARG BRANCH_OR_TAG=main ARG BRANCH_OR_TAG=main
...@@ -15,7 +15,7 @@ RUN \ ...@@ -15,7 +15,7 @@ RUN \
./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info -x test && \ ./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info -x test && \
ls -ahl ./build/libs/ ls -ahl ./build/libs/
FROM griefed/baseimage-ubuntu-jdk-8:2.0.11 FROM griefed/baseimage-ubuntu-jdk-8:2.0.12
LABEL maintainer="Griefed <griefed@griefed.de>" LABEL maintainer="Griefed <griefed@griefed.de>"
LABEL description="DESCRIPTION" LABEL description="DESCRIPTION"
......
FROM griefed/baseimage-ubuntu-jdk-8:2.0.11 AS builder FROM griefed/baseimage-ubuntu-jdk-8:2.0.12 AS builder
ARG BRANCH_OR_TAG=main ARG BRANCH_OR_TAG=main
...@@ -15,7 +15,7 @@ RUN \ ...@@ -15,7 +15,7 @@ RUN \
./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info -x test && \ ./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info -x test && \
ls -ahl ./build/libs/ ls -ahl ./build/libs/
FROM griefed/baseimage-ubuntu-jdk-8:2.0.11 FROM griefed/baseimage-ubuntu-jdk-8:2.0.12
LABEL maintainer="Griefed <griefed@griefed.de>" LABEL maintainer="Griefed <griefed@griefed.de>"
LABEL description="DESCRIPTION" LABEL description="DESCRIPTION"
......
...@@ -19,7 +19,7 @@ plugins { ...@@ -19,7 +19,7 @@ plugins {
id 'org.siouan.frontend-jdk8' version '6.0.0' id 'org.siouan.frontend-jdk8' version '6.0.0'
id 'org.springframework.boot' version '2.7.2' id 'org.springframework.boot' version '2.7.2'
id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'io.spring.dependency-management' version '1.0.12.RELEASE'
} }
sourceCompatibility = targetCompatibility = '1.8' sourceCompatibility = targetCompatibility = '1.8'
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"@quasar/extras": "1.14.2", "@quasar/extras": "1.14.2",
"axios": "0.27.2", "axios": "0.27.2",
"core-js": "3.23.3", "core-js": "3.23.3",
"quasar": "2.7.5", "quasar": "2.7.7",
"tsparticles": "2.0.6" "tsparticles": "2.0.6"
}, },
"devDependencies": { "devDependencies": {
...@@ -10353,9 +10353,9 @@ ...@@ -10353,9 +10353,9 @@
} }
}, },
"node_modules/quasar": { "node_modules/quasar": {
"version": "2.7.5", "version": "2.7.7",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-2.7.5.tgz", "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.7.7.tgz",
"integrity": "sha512-DWI0S+bXASfMSPrB8c/LVsXpA4dF7cBUbaJlcrM+1ioTNBHtiudma2Nhk2SDd5bzk9AYVHh5A8JCZuKqQAXt7g==", "integrity": "sha512-tegG6EmEmv5i24MoNopRkhZOdT5kdLSAxQMA0V/fG04oco52hk2xwvB0EVS8WzT0bZZbc/9iXlAm1c29rZ3yVA==",
"engines": { "engines": {
"node": ">= 10.18.1", "node": ">= 10.18.1",
"npm": ">= 6.13.4", "npm": ">= 6.13.4",
...@@ -21377,9 +21377,9 @@ ...@@ -21377,9 +21377,9 @@
"dev": true "dev": true
}, },
"quasar": { "quasar": {
"version": "2.7.5", "version": "2.7.7",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-2.7.5.tgz", "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.7.7.tgz",
"integrity": "sha512-DWI0S+bXASfMSPrB8c/LVsXpA4dF7cBUbaJlcrM+1ioTNBHtiudma2Nhk2SDd5bzk9AYVHh5A8JCZuKqQAXt7g==" "integrity": "sha512-tegG6EmEmv5i24MoNopRkhZOdT5kdLSAxQMA0V/fG04oco52hk2xwvB0EVS8WzT0bZZbc/9iXlAm1c29rZ3yVA=="
}, },
"queue-microtask": { "queue-microtask": {
"version": "1.2.3", "version": "1.2.3",
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
"dependencies": { "dependencies": {
"@quasar/extras": "1.14.2", "@quasar/extras": "1.14.2",
"axios": "0.27.2", "axios": "0.27.2",
"quasar": "2.7.5", "quasar": "2.7.7",
"core-js": "3.23.3", "core-js": "3.23.3",
"tsparticles": "2.0.6" "tsparticles": "1.43.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/eslint-parser": "7.18.9", "@babel/eslint-parser": "7.18.9",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment