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

Merge branch 'main' into 'renovate-org.apache.logging.log4j-log4j-slf4j-impl-2.x'

# Conflicts:
#   build.gradle
parents 691d191e 9c0b9829
No related branches found
No related tags found
1 merge request!104Update dependency org.apache.logging.log4j:log4j-slf4j-impl to v2.17.2
...@@ -12,7 +12,7 @@ jobs: ...@@ -12,7 +12,7 @@ jobs:
gradle: gradle:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up JDK 8 - name: Set up JDK 8
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
...@@ -46,7 +46,7 @@ jobs: ...@@ -46,7 +46,7 @@ jobs:
quasar: quasar:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Setup Node.js environment - name: Setup Node.js environment
uses: actions/setup-node@v3.0.0 uses: actions/setup-node@v3.0.0
with: with:
...@@ -70,7 +70,7 @@ jobs: ...@@ -70,7 +70,7 @@ jobs:
docker: docker:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Get branch name - name: Get branch name
id: branch-name id: branch-name
......
...@@ -76,12 +76,11 @@ dependencies { ...@@ -76,12 +76,11 @@ dependencies {
//embed 'org.springframework.boot:spring-boot-starter-data-jpa:2.6.2' //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.springframework.boot:spring-boot-starter-artemis:2.6.2'
//embed 'org.apache.activemq:artemis-jms-server:2.19.0' //embed 'org.apache.activemq:artemis-jms-server:2.19.0'
embed 'org.apache.logging.log4j:log4j-web:2.17.1'
embed 'org.apache.logging.log4j:log4j-api:2.17.1'
embed 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.2' embed 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.2'
embed 'org.apache.logging.log4j:log4j-api:2.17.2'
embed 'org.apache.logging.log4j:log4j-core:2.17.2' embed 'org.apache.logging.log4j:log4j-core:2.17.2'
embed 'org.apache.logging.log4j:log4j-web:2.17.1' embed 'org.apache.logging.log4j:log4j-web:2.17.2'
embed 'org.apache.logging.log4j:log4j-jul:2.17.2' embed 'org.apache.logging.log4j:log4j-jul:2.17.2'
// Dev tools // Dev tools
......
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