Skip to content

Commit 49d1d33

Browse files
authored
Merge branch 'main' into HTM-1852_geotools-35.x
2 parents b25543d + 0b23022 commit 49d1d33

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ concurrency:
66

77
env:
88
MAVEN_OPTS: -Djava.awt.headless=true
9-
MAVEN_VERSION: '3.9.14'
9+
MAVEN_VERSION: '3.9.15'
1010

1111
on:
1212
push:

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: 'Set up Maven'
3030
uses: stCarolas/setup-maven@v5
3131
with:
32-
maven-version: 3.9.14
32+
maven-version: 3.9.15
3333

3434
- name: 'Login to b3p.nl'
3535
uses: docker/login-action@v4

.github/workflows/owasp-dependency-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: 'OWASP'
22

33
env:
44
MAVEN_OPTS: -Djava.awt.headless=true
5-
MAVEN_VERSION: '3.9.14'
5+
MAVEN_VERSION: '3.9.15'
66

77
concurrency: # More info: https://stackoverflow.com/a/68422069/253468
88
group: ${{ github.workflow }}-${{ ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release' ) && format('ci-main-{0}', github.sha) || format('ci-main-{0}', github.ref) }}

.github/workflows/qa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: 'Ubuntu QA Maven build'
22

33
env:
44
MAVEN_OPTS: -Djava.awt.headless=true
5-
MAVEN_VERSION: '3.9.14'
5+
MAVEN_VERSION: '3.9.15'
66

77
concurrency:
88
group: ${{ github.workflow }}-${{ ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release' ) && format('ci-main-{0}', github.sha) || format('ci-main-{0}', github.ref) }}

.github/workflows/trivy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: 'Trivy Security Scan'
22

33
env:
44
MAVEN_OPTS: -Djava.awt.headless=true
5-
MAVEN_VERSION: '3.9.14'
5+
MAVEN_VERSION: '3.9.15'
66

77
on: # use pull request so this workflow dos not fail when triggered by dependabot PR's
88
pull_request:

.github/workflows/ubuntu-maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ permissions:
66

77
env:
88
MAVEN_OPTS: -Djava.awt.headless=true
9-
MAVEN_VERSION: '3.9.14'
9+
MAVEN_VERSION: '3.9.15'
1010
JAVA_VERSION: '25'
1111

1212
concurrency:

0 commit comments

Comments
 (0)