Skip to content

Commit af4b4f6

Browse files
Bump spring.version from 6.1.20 to 6.2.9 (#1616)
* Bump spring.version from 6.1.20 to 6.2.9 Bumps `spring.version` from 6.1.20 to 6.2.9. Updates `org.springframework:spring-beans` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-core` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-context` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-context-support` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-jdbc` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-orm` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-tx` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-test` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-jms` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-web` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-webmvc` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-webflux` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-aop` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-expression` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-jcl` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-messaging` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) Updates `org.springframework:spring-oxm` from 6.1.20 to 6.2.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.20...v6.2.9) --- updated-dependencies: - dependency-name: org.springframework:spring-beans dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-core dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-context dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-context-support dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-jdbc dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-orm dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-tx dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-test dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-jms dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-web dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-webmvc dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-webflux dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-aop dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-expression dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-jcl dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-messaging dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-oxm dependency-version: 6.2.9 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fixed compilation error in ThrottlingClient Signed-off-by: Harry Middelburg <harry.middelburg@alliander.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Harry Middelburg <harry.middelburg@alliander.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Harry Middelburg <harry.middelburg@alliander.com>
1 parent 9af257b commit af4b4f6

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

osgp/shared/osgp-throttling-client/src/main/java/org/opensmartgridplatform/throttling/ThrottlingClient.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,11 @@ public void handleError(
9494
*/
9595
return;
9696
}
97-
super.handleError(response, response.getStatusCode());
97+
super.handleError(
98+
response,
99+
response.getStatusCode(),
100+
response.getHeaders().getLocation(),
101+
response.getHeaders().getAccessControlRequestMethod());
98102
}
99103
});
100104

@@ -398,7 +402,7 @@ private boolean releasePermit(final Integer requestId) {
398402
Void.class,
399403
this.throttlingConfig.getId(),
400404
this.clientId);
401-
} catch (Exception e) {
405+
} catch (final Exception e) {
402406
LOGGER.warn(
403407
"Unable to release permit with throttlingConfigId {}, clientId {}, requestId {} - got unexpected exception: {}",
404408
this.throttlingConfig.getId(),
@@ -455,7 +459,7 @@ private boolean releasePermit(
455459
this.clientId,
456460
baseTransceiverStationId,
457461
cellId);
458-
} catch (Exception e) {
462+
} catch (final Exception e) {
459463
LOGGER.warn(
460464
"Unable to release permit with throttlingConfigId {}, clientId {}, requestId {}, baseTransceiverStationId {}, cellId {} - got unexpected exception: {}",
461465
this.throttlingConfig.getId(),

super/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ SPDX-License-Identifier: Apache-2.0
4949
<osgp.dlms.version>6.22.0-SNAPSHOT</osgp.dlms.version>
5050
<osgp.shared.version>6.22.0-SNAPSHOT</osgp.shared.version>
5151
<osgp.jasper-interface.version>6.22.0-SNAPSHOT</osgp.jasper-interface.version>
52-
<spring.version>6.1.20</spring.version>
52+
<spring.version>6.2.9</spring.version>
5353
<spring.data.version>3.3.13</spring.data.version>
5454
<spring.data.commons.version>3.3.13</spring.data.commons.version>
5555
<spring.security.version>6.3.9</spring.security.version>

0 commit comments

Comments
 (0)