Skip to content

Commit f28e5e8

Browse files
authored
Merge branch 'main' into HTM-1960_Custom_extract_functionality_for_layer_attributes
2 parents e1cb81b + 0b23022 commit f28e5e8

7 files changed

Lines changed: 10 additions & 10 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:

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ SPDX-License-Identifier: MIT
100100
<maven.compiler.source>${java.version}</maven.compiler.source>
101101
<maven.compiler.target>${java.version}</maven.compiler.target>
102102
<maven.compiler.release>${java.version}</maven.compiler.release>
103-
<project.build.outputTimestamp>2026-03-31T11:10:19Z</project.build.outputTimestamp>
103+
<project.build.outputTimestamp>2026-04-21T11:04:09Z</project.build.outputTimestamp>
104104
<geotools.version>34.3</geotools.version>
105105
<jts.version>1.20.0</jts.version>
106106
<okhttp.version>5.3.2</okhttp.version>
@@ -123,7 +123,7 @@ SPDX-License-Identifier: MIT
123123
<commons-lang3.version>3.20.0</commons-lang3.version>
124124
<commons-codec.version>1.21.0</commons-codec.version>
125125
<flyway.version>12.1.1</flyway.version>
126-
<hibernate.version>7.3.1.Final</hibernate.version>
126+
<hibernate.version>7.3.2.Final</hibernate.version>
127127
<jackson-2-bom.version>2.21.2</jackson-2-bom.version>
128128
<jackson-bom.version>3.1.1</jackson-bom.version>
129129
<json-path.version>3.0.0</json-path.version>
@@ -153,7 +153,7 @@ SPDX-License-Identifier: MIT
153153
<modernizer-maven-plugin.version>3.3.0</modernizer-maven-plugin.version>
154154
<maven-fluido-skin.version>2.1.0</maven-fluido-skin.version>
155155
<swagger-ui.version>5.32.4</swagger-ui.version>
156-
<sentry.version>8.39.0</sentry.version>
156+
<sentry.version>8.39.1</sentry.version>
157157
<errorProne.version>2.49.0</errorProne.version>
158158
<errorProneFlags>-XepDisableWarningsInGeneratedCode</errorProneFlags>
159159
<errorProneExcludePaths>${project.build.directory}/generated-sources/.*</errorProneExcludePaths>
@@ -202,7 +202,7 @@ SPDX-License-Identifier: MIT
202202
<dependency>
203203
<groupId>ch.rasc</groupId>
204204
<artifactId>sse-eventbus</artifactId>
205-
<version>3.0.0</version>
205+
<version>3.1.0</version>
206206
</dependency>
207207
<dependency>
208208
<groupId>com.fasterxml.jackson.core</groupId>

0 commit comments

Comments
 (0)