Skip to content

Commit 04cc3a6

Browse files
authored
Merge pull request #215 from xenit-eu/DOCKER-462
DOCKER-462 Added settings for AllowCasualMultipartParsing, AllowMultipleLeadingForwardSlashInPath and CrossContext
2 parents 7ecc9e4 + f5f4073 commit 04cc3a6

File tree

10 files changed

+72
-45
lines changed

10 files changed

+72
-45
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ jobs:
1212
test:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
15+
- uses: actions/checkout@v4.2.2
1616
- name: Set up JDK 17
17-
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
17+
uses: actions/setup-java@v4.7.0
1818
with:
1919
distribution: 'temurin'
2020
java-version: '17'
2121
- name: Unit tests
22-
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2
22+
uses: gradle/gradle-build-action@v3.5.0
2323
with:
2424
cache-read-only: false
2525
arguments: test --parallel --info
2626
- name: Upload analysis to sonarcloud
27-
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2
27+
uses: gradle/gradle-build-action@v3.5.0
2828
env:
2929
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3030
GITHUB_TOKEN: ${{ github.token }}
@@ -33,7 +33,7 @@ jobs:
3333
arguments: sonarqube -i
3434
- name: Upload test artifact
3535
if: success() || failure()
36-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
36+
uses: actions/upload-artifact@v4.6.0
3737
with:
3838
name: test-result
3939
path: /home/runner/work/**/build/reports
@@ -45,22 +45,22 @@ jobs:
4545
matrix:
4646
version: [ "community-7.0.0", "community-7.1.1", "community-7.2.0", "community-7.3.0", "community-7.4.0", "community-23.1.0", "community-23.2.0", "enterprise-7.0.1", "enterprise-7.1.0", "enterprise-7.2.0", "enterprise-7.3.0", "enterprise-7.4.0", "enterprise-23.1.0", "enterprise-23.2.0" ]
4747
steps:
48-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
48+
- uses: actions/checkout@v4.2.2
4949
- name: Set up JDK 17
50-
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
50+
uses: actions/setup-java@v4.7.0
5151
with:
5252
distribution: 'temurin'
5353
java-version: '17'
5454
- name: Login to CloudSmith docker registry
5555
run: echo "${{ secrets.CLOUDSMITH_APIKEY }}" | docker login private.docker.xenit.eu --username "${{ secrets.CLOUDSMITH_USER }}" --password-stdin
5656
- name: Integration tests
57-
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2
57+
uses: gradle/gradle-build-action@v3.5.0
5858
with:
5959
cache-read-only: false
6060
arguments: :2repository:${{ matrix.version }}:integrationTests --info --stacktrace
6161
- name: Upload test artifact
6262
if: success() || failure()
63-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
63+
uses: actions/upload-artifact@v4.6.0
6464
with:
6565
name: integration-test-${{ matrix.version }}-result
6666
path: /home/runner/work/**/build/reports
@@ -70,9 +70,9 @@ jobs:
7070
runs-on: ubuntu-latest
7171
if: ${{ startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/v') }}
7272
steps:
73-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
73+
- uses: actions/checkout@v4.2.2
7474
- name: Set up JDK 17
75-
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
75+
uses: actions/setup-java@v4.7.0
7676
with:
7777
distribution: 'temurin'
7878
java-version: '17'
@@ -85,12 +85,12 @@ jobs:
8585
env:
8686
DOCKER_USER: ${{ secrets.DOCKER_USER }}
8787
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
88-
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2
88+
uses: gradle/gradle-build-action@v3.5.0
8989
with:
9090
cache-read-only: false
9191
arguments: pushDockerImage -PincludeEnterprise=false
9292
- name: Publish private docker images
93-
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2
93+
uses: gradle/gradle-build-action@v3.5.0
9494
with:
9595
cache-read-only: false
9696
arguments: :2repository:pushDockerImage -PincludeCommunity=false
@@ -99,9 +99,9 @@ jobs:
9999
runs-on: ubuntu-latest
100100
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
101101
steps:
102-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
102+
- uses: actions/checkout@v4.2.2
103103
- name: Set up JDK 17
104-
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
104+
uses: actions/setup-java@v4.7.0
105105
with:
106106
distribution: 'temurin'
107107
java-version: '17'
@@ -111,7 +111,7 @@ jobs:
111111
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVEN_CENTRAL_GPG_PASSWORD }}
112112
ORG_GRADLE_PROJECT_sonatype_username: ${{ secrets.SONATYPE_S01_USERNAME }}
113113
ORG_GRADLE_PROJECT_sonatype_password: ${{ secrets.SONATYPE_S01_PASSWORD }}
114-
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2
114+
uses: gradle/gradle-build-action@v3.5.0
115115
with:
116116
cache-read-only: false
117117
arguments: :tomcat-base:tomcat-embedded-9:publish :tomcat-base:tomcat-embedded-10:publish --info -PsigningKeyId=CDE3528F

0 commit comments

Comments
 (0)