Skip to content

Commit 670eaeb

Browse files
Merge pull request #1530 from OSGP/feature/security-netty-spring-boot-cxf-core
security update netty spring-boot and cxf-core
2 parents 2264f62 + 6370b54 commit 670eaeb

File tree

7 files changed

+9
-10
lines changed
  • osgp
    • platform
    • protocol-adapter-dlms/osgp-protocol-simulator-dlms
    • protocol-adapter-iec60870/osgp-protocol-simulator-iec60870
    • protocol-adapter-iec61850/osgp-protocol-simulator-iec61850
  • super

7 files changed

+9
-10
lines changed

osgp/platform/osgp-secret-management/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SPDX-License-Identifier: Apache-2.0
2121

2222
<properties>
2323
<java.version>17</java.version>
24-
<spring.boot.version>3.3.7</spring.boot.version>
24+
<spring.boot.version>3.3.8</spring.boot.version>
2525
<osgp-ws-secret-management-version>${project.parent.version}</osgp-ws-secret-management-version>
2626
<apache.ws.xlmschema.version>2.3.1</apache.ws.xlmschema.version>
2727
<wsdl4j.version>1.6.3</wsdl4j.version>

osgp/platform/osgp-throttling-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SPDX-License-Identifier: Apache-2.0
2323
</parent>
2424

2525
<properties>
26-
<spring.boot.version>3.3.7</spring.boot.version>
26+
<spring.boot.version>3.3.8</spring.boot.version>
2727
<failOnMissingWebXml>false</failOnMissingWebXml>
2828
</properties>
2929

osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SPDX-License-Identifier: Apache-2.0
2323
<properties>
2424
<display.version>${project.version}-${BUILD_TAG}</display.version>
2525
<commons.collections.version>4.4</commons.collections.version>
26-
<spring.boot.version>3.3.7</spring.boot.version>
26+
<spring.boot.version>3.3.8</spring.boot.version>
2727
<skipITs>true</skipITs>
2828
</properties>
2929

osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/simulator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ SPDX-License-Identifier: Apache-2.0
5656
<!-- </dependencyManagement> -->
5757

5858
<properties>
59-
<spring.boot.version>3.3.7</spring.boot.version>
59+
<spring.boot.version>3.3.8</spring.boot.version>
6060
</properties>
6161

6262
<build>

osgp/protocol-adapter-iec60870/osgp-protocol-simulator-iec60870/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SPDX-License-Identifier: Apache-2.0
1616
<parent>
1717
<groupId>org.springframework.boot</groupId>
1818
<artifactId>spring-boot-starter-parent</artifactId>
19-
<version>3.3.7</version>
19+
<version>3.3.8</version>
2020
<relativePath /> <!-- lookup parent from repository -->
2121
</parent>
2222

osgp/protocol-adapter-iec61850/osgp-protocol-simulator-iec61850/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ SPDX-License-Identifier: Apache-2.0
4343
<parent>
4444
<groupId>org.springframework.boot</groupId>
4545
<artifactId>spring-boot-starter-parent</artifactId>
46-
<version>3.3.7</version>
46+
<version>3.3.8</version>
4747
<relativePath /> <!-- lookup parent from repository -->
4848
</parent>
4949

@@ -52,7 +52,6 @@ SPDX-License-Identifier: Apache-2.0
5252

5353
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5454
<java.version>17</java.version>
55-
<spring.boot.version>3.2.0</spring.boot.version>
5655
<beanit.openiec61850.version>1.8.0</beanit.openiec61850.version>
5756

5857
<jxr.version>3.3.2</jxr.version>

super/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ SPDX-License-Identifier: Apache-2.0
5555
<spring.security.version>6.2.8</spring.security.version>
5656
<spring.ws.version>4.0.11</spring.ws.version>
5757
<spring.integration.version>6.3.5</spring.integration.version>
58-
<reactor.version>2023.0.7</reactor.version>
58+
<reactor.version>2024.0.3</reactor.version>
5959
<assertj.version>3.16.1</assertj.version>
6060
<xmlunit.version>1.6</xmlunit.version>
6161
<mockito.core.version>4.8.0</mockito.core.version>
@@ -111,7 +111,7 @@ SPDX-License-Identifier: Apache-2.0
111111
<apache.commons.schema>2.3.1</apache.commons.schema>
112112
<maven.clean.plugin.version>3.4.0</maven.clean.plugin.version>
113113
<maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
114-
<netty.version>4.1.108.Final</netty.version>
114+
<netty.version>4.1.118.Final</netty.version>
115115
<openmuc.jdlms.version>1.8.0</openmuc.jdlms.version>
116116
<openmuc.jdlms-annotation.version>1.8.0</openmuc.jdlms-annotation.version>
117117
<beanit.openiec61850.version>1.8.0</beanit.openiec61850.version>
@@ -121,7 +121,7 @@ SPDX-License-Identifier: Apache-2.0
121121
<license.maven.plugin>3.0</license.maven.plugin>
122122
<jackson.version>2.15.3</jackson.version>
123123
<cxf.version>4.0.3</cxf.version>
124-
<cxf.core.version>4.0.5</cxf.core.version>
124+
<cxf.core.version>4.0.6</cxf.core.version>
125125
<quartz.version>2.3.2</quartz.version>
126126
<hikaricp.version>3.4.5</hikaricp.version>
127127
<micrometer.version>1.13.1</micrometer.version>

0 commit comments

Comments
 (0)