Skip to content

Commit 5dc747a

Browse files
authored
Merge branch 'development' into dependabot/maven/spring.security.version-6.5.5
2 parents c8dcb59 + 1220092 commit 5dc747a

File tree

81 files changed

+143
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+143
-96
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Staging war and jar files
4545
run: mkdir staging && find . -path ./staging -prune -o \( -name gxf -o -name cucumber-*-test-jar-with-dependencies.jar -o -name *simulator*.war \) -exec cp -prv --parents '{}' staging/ \;
4646
if: contains(github.ref, 'release') || contains(github.ref, 'development') || contains(github.event.pull_request.labels.*.name, 'build_containers') || contains(github.event.pull_request.labels.*.name, 'cucumber_testing') || contains(github.event.pull_request.labels.*.name, 'dependencies')
47-
- uses: actions/upload-artifact@v4
47+
- uses: actions/upload-artifact@v5
4848
if: contains(github.ref, 'release') || contains(github.ref, 'development') || contains(github.event.pull_request.labels.*.name, 'build_containers') || contains(github.event.pull_request.labels.*.name, 'cucumber_testing') || contains(github.event.pull_request.labels.*.name, 'dependencies')
4949
with:
5050
name: warFiles
@@ -113,7 +113,7 @@ jobs:
113113
- name: Checkout
114114
uses: actions/checkout@v5
115115
- name: Download war files
116-
uses: actions/download-artifact@v5
116+
uses: actions/download-artifact@v6
117117
with:
118118
name: warFiles
119119
- name: Show files in current context

integration-tests/cucumber-tests-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>6.27.0-SNAPSHOT</version>
15+
<version>6.29.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

integration-tests/cucumber-tests-execution/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>6.27.0-SNAPSHOT</version>
15+
<version>6.29.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

integration-tests/cucumber-tests-platform-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SPDX-License-Identifier: Apache-2.0
1313
<parent>
1414
<groupId>org.opensmartgridplatform</groupId>
1515
<artifactId>parent-integration-tests</artifactId>
16-
<version>6.27.0-SNAPSHOT</version>
16+
<version>6.29.0-SNAPSHOT</version>
1717
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1818
</parent>
1919

integration-tests/cucumber-tests-platform-publiclighting/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>6.27.0-SNAPSHOT</version>
15+
<version>6.29.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

integration-tests/cucumber-tests-platform-smartmetering/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SPDX-License-Identifier: Apache-2.0
1414
<parent>
1515
<groupId>org.opensmartgridplatform</groupId>
1616
<artifactId>parent-integration-tests</artifactId>
17-
<version>6.27.0-SNAPSHOT</version>
17+
<version>6.29.0-SNAPSHOT</version>
1818
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1919
</parent>
2020

integration-tests/cucumber-tests-platform/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>6.27.0-SNAPSHOT</version>
15+
<version>6.29.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

integration-tests/cucumber-tests-protocol-iec60870/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>6.27.0-SNAPSHOT</version>
15+
<version>6.29.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

integration-tests/parent-integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SPDX-License-Identifier: Apache-2.0
1717
<parent>
1818
<groupId>org.opensmartgridplatform</groupId>
1919
<artifactId>super-osgp</artifactId>
20-
<version>6.27.0-SNAPSHOT</version>
20+
<version>6.29.0-SNAPSHOT</version>
2121
<relativePath>../../super/pom.xml</relativePath>
2222
</parent>
2323
<distributionManagement>

integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SPDX-License-Identifier: Apache-2.0
1111
<modelVersion>4.0.0</modelVersion>
1212
<groupId>org.opensmartgridplatform</groupId>
1313
<artifactId>integration-tests</artifactId>
14-
<version>6.27.0-SNAPSHOT</version>
14+
<version>6.29.0-SNAPSHOT</version>
1515
<packaging>pom</packaging>
1616

1717
<properties>

0 commit comments

Comments
 (0)