Skip to content

Commit 8348437

Browse files
Build(deps): Bump org.springframework.boot:spring-boot-starter-parent from 3.5.8 to 4.0.6 (#1004)
* Build(deps): Bump org.springframework.boot:spring-boot-starter-parent Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.5.8 to 4.0.6. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.8...v4.0.6) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-version: 4.0.6 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Fixes compile problems after deps update * Fixes failing tests * Removes remaining spring 3 stuff * Also updates springdoc dependency * updates related deps * example fixes * Improve example workflow * Fixes remaining failing tests * Removes stale dependencies * Remove springfox from mustache files too * Removes skewed dependency versions * Removes hardcoded internal dep versions * Adds build step for BaSyx example images and updates Docker images to SNAPSHOT versions --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aaron Zielstorff <aaron.zielstorff@iese.fraunhofer.de>
1 parent d53b556 commit 8348437

246 files changed

Lines changed: 1402 additions & 1056 deletions

File tree

Some content is hidden

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

.github/workflows/examples_test.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ jobs:
3232
distribution: 'adopt'
3333
cache: maven
3434

35+
- name: Build BaSyx Example Images
36+
run: bash .github/workflows/scripts/build_example_images.sh mem
37+
3538
- name: Start BaSyx Client Example
3639
run: docker compose -f examples/BaSyxClient/docker-compose.yml up -d
3740

@@ -51,6 +54,9 @@ jobs:
5154
distribution: 'adopt'
5255
cache: maven
5356

57+
- name: Build BaSyx Example Images
58+
run: bash .github/workflows/scripts/build_example_images.sh mem
59+
5460
- name: Start BaSyx DataBridge Example
5561
run: docker compose -f examples/BaSyxDatabridge/docker-compose.yml up -d
5662

@@ -70,10 +76,18 @@ jobs:
7076
distribution: 'adopt'
7177
cache: maven
7278

79+
- name: Build BaSyx Example Images
80+
run: bash .github/workflows/scripts/build_example_images.sh dynamic-rbac
81+
7382
- name: Start BaSyx Dynamic RBAC Example
7483
run: docker compose -f examples/BaSyxDynamicRBAC/docker-compose.yaml up -d
7584

85+
- name: Show BaSyx Dynamic RBAC Example Logs
86+
if: failure()
87+
run: docker compose -f examples/BaSyxDynamicRBAC/docker-compose.yaml logs --no-color
88+
7689
- name: Stop BaSyx Dynamic RBAC Example
90+
if: always()
7791
run: docker compose -f examples/BaSyxDynamicRBAC/docker-compose.yaml down
7892

7993
test-basyx-kafka:
@@ -89,6 +103,9 @@ jobs:
89103
distribution: 'adopt'
90104
cache: maven
91105

106+
- name: Build BaSyx Example Images
107+
run: bash .github/workflows/scripts/build_example_images.sh kafka
108+
92109
- name: Start BaSyx Kafka Example
93110
run: docker compose -f examples/BaSyxKafka/docker-compose.yaml up -d
94111

@@ -108,10 +125,18 @@ jobs:
108125
distribution: 'adopt'
109126
cache: maven
110127

128+
- name: Build BaSyx Example Images
129+
run: bash .github/workflows/scripts/build_example_images.sh mongodb
130+
111131
- name: Start BaSyx Minimal Example
112132
run: docker compose -f examples/BaSyxMinimal/docker-compose.yml up -d
113133

134+
- name: Show BaSyx Minimal Example Logs
135+
if: failure()
136+
run: docker compose -f examples/BaSyxMinimal/docker-compose.yml logs --no-color
137+
114138
- name: Stop BaSyx Minimal Example
139+
if: always()
115140
run: docker compose -f examples/BaSyxMinimal/docker-compose.yml down
116141

117142
test-basyx-reverse-proxy:
@@ -127,6 +152,9 @@ jobs:
127152
distribution: 'adopt'
128153
cache: maven
129154

155+
- name: Build BaSyx Example Images
156+
run: bash .github/workflows/scripts/build_example_images.sh mem
157+
130158
- name: Start BaSyx Reverse Proxy Example
131159
run: docker compose -f examples/BaSyxReverseProxy/docker-compose.yml up -d
132160

@@ -146,6 +174,9 @@ jobs:
146174
distribution: 'adopt'
147175
cache: maven
148176

177+
- name: Build BaSyx Example Images
178+
run: bash .github/workflows/scripts/build_example_images.sh mem
179+
149180
- name: Start BaSyx Operation Delegation Example
150181
run: docker compose -f examples/BaSyxOperationDelegation/docker-compose.yml up -d
151182

@@ -165,6 +196,9 @@ jobs:
165196
distribution: 'adopt'
166197
cache: maven
167198

199+
- name: Build BaSyx Example Images
200+
run: bash .github/workflows/scripts/build_example_images.sh mem
201+
168202
- name: Start BaSyx Secured Example
169203
run: docker compose -f examples/BaSyxSecured/docker-compose.yaml up -d
170204

@@ -184,6 +218,9 @@ jobs:
184218
distribution: 'adopt'
185219
cache: maven
186220

221+
- name: Build BaSyx Example Images
222+
run: bash .github/workflows/scripts/build_example_images.sh mem
223+
187224
- name: Start BaSyx Node-RED Example
188225
run: docker compose -f examples/BaSyxNodeRED/docker-compose.yml up -d
189226

@@ -203,10 +240,18 @@ jobs:
203240
distribution: 'adopt'
204241
cache: maven
205242

243+
- name: Build BaSyx Example Images
244+
run: bash .github/workflows/scripts/build_example_images.sh mongodb
245+
206246
- name: Start BaSyx Query Language Example
207247
run: docker compose -f examples/BaSyxQueryLanguage/docker-compose.yml up -d
208248

249+
- name: Show BaSyx Query Language Example Logs
250+
if: failure()
251+
run: docker compose -f examples/BaSyxQueryLanguage/docker-compose.yml logs --no-color
252+
209253
- name: Stop BaSyx Query Language Example
254+
if: always()
210255
run: docker compose -f examples/BaSyxQueryLanguage/docker-compose.yml down
211256

212257
test-basyx-cad:
@@ -222,6 +267,9 @@ jobs:
222267
distribution: 'adopt'
223268
cache: maven
224269

270+
- name: Build BaSyx Example Images
271+
run: bash .github/workflows/scripts/build_example_images.sh mem
272+
225273
- name: Start BaSyx CAD file Example
226274
run: docker compose -f examples/BaSyxCADFiles/docker-compose.yml up -d
227275

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
if [ "$#" -ne 1 ]; then
5+
echo "Usage: $0 <mem|mongodb|dynamic-rbac|kafka>"
6+
exit 1
7+
fi
8+
9+
case "$1" in
10+
mem)
11+
modules=(
12+
"org.eclipse.digitaltwin.basyx:basyx.aasenvironment.component"
13+
"org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-log-mem"
14+
"org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mem"
15+
"org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
16+
)
17+
;;
18+
mongodb)
19+
modules=(
20+
"org.eclipse.digitaltwin.basyx:basyx.aasenvironment.component"
21+
"org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-log-mongodb"
22+
"org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mongodb"
23+
"org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
24+
)
25+
;;
26+
dynamic-rbac)
27+
modules=(
28+
"org.eclipse.digitaltwin.basyx:basyx.aasenvironment.component"
29+
"org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-log-mongodb"
30+
"org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mongodb"
31+
"org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component"
32+
"org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
33+
)
34+
;;
35+
kafka)
36+
modules=(
37+
"org.eclipse.digitaltwin.basyx:basyx.aasenvironment.component"
38+
"org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-kafka-mem"
39+
"org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-kafka-mem"
40+
"org.eclipse.digitaltwin.basyx:basyx.submodelservice.component"
41+
)
42+
;;
43+
*)
44+
echo "Unknown image set: $1"
45+
exit 1
46+
;;
47+
esac
48+
49+
module_list=$(IFS=,; echo "${modules[*]}")
50+
51+
mvn package \
52+
-DskipTests \
53+
-Ddocker.namespace=eclipsebasyx \
54+
-Ddocker.target.platforms=linux/amd64 \
55+
--projects "${module_list}" \
56+
--also-make

basyx.aasdigitaltwinregistry/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ _No additional environment variables required for InMemory profile._
122122
### Auto-configuration Exclusions
123123
The InMemory profile excludes MongoDB auto-configuration:
124124

125-
- `org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration`
126-
- `org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration`
125+
- `org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration`
126+
- `org.springframework.boot.data.mongodb.autoconfigure.DataMongoAutoConfiguration`
127127

128128
---
129129

@@ -148,4 +148,4 @@ The InMemory profile excludes MongoDB auto-configuration:
148148
| `basyx.backend` | MongoDB | Use MongoDB storage backend |
149149
| `registry.type` | MongoDB | Registry type |
150150
| `registry.discovery.enabled` | true | Enable discovery service |
151-
| `basyx.aasdiscoveryservice.mongodb.collectionName` | aasregistry | MongoDB collection name |
151+
| `basyx.aasdiscoveryservice.mongodb.collectionName` | aasregistry | MongoDB collection name |

basyx.aasdigitaltwinregistry/basyx.digitaltwinregistry.component/src/main/java/org/eclipse/digitaltwin/basyx/digitaltwinregistry/component/controllerAdvice/GlobalExceptionHandler.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
import java.time.OffsetDateTime;
2929

30-
import lombok.extern.slf4j.Slf4j;
3130
import org.eclipse.digitaltwin.basyx.aasregistry.model.Message;
3231
import org.eclipse.digitaltwin.basyx.aasregistry.model.Result;
3332
import org.eclipse.digitaltwin.basyx.aasregistry.model.Message.MessageTypeEnum;
@@ -44,6 +43,8 @@
4443
import org.eclipse.digitaltwin.basyx.core.exceptions.NotInvokableException;
4544
import org.eclipse.digitaltwin.basyx.core.exceptions.NullSubjectException;
4645
import org.eclipse.digitaltwin.basyx.core.exceptions.OperationDelegationException;
46+
import org.slf4j.Logger;
47+
import org.slf4j.LoggerFactory;
4748
import org.springframework.http.HttpStatus;
4849
import org.springframework.http.MediaType;
4950
import org.springframework.http.ResponseEntity;
@@ -55,8 +56,8 @@
5556
import org.springframework.web.server.ResponseStatusException;
5657

5758
@ControllerAdvice
58-
@Slf4j
5959
public class GlobalExceptionHandler {
60+
private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
6061

6162
@ExceptionHandler(MethodArgumentNotValidException.class)
6263
public ResponseEntity<Result> handleValidationException(MethodArgumentNotValidException ex) {
@@ -170,4 +171,4 @@ private Message newExceptionMessage(String msg, HttpStatus status) {
170171
message.setText(msg);
171172
return message;
172173
}
173-
}
174+
}

basyx.aasdigitaltwinregistry/basyx.digitaltwinregistry.component/src/main/resources/application-InMemory.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ registry.discovery.enabled=true
44

55
spring.config.activate.on-profile=InMemory
66

7-
spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration,org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration
7+
spring.autoconfigure.exclude=org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration,org.springframework.boot.data.mongodb.autoconfigure.DataMongoAutoConfiguration

basyx.aasdigitaltwinregistry/basyx.digitaltwinregistry.component/src/main/resources/application-MongoDB.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ basyx.aasdiscoveryservice.mongodb.collectionName=${AUTHENTICATION_DATABASE:db-na
33
registry.type=MongoDB
44
registry.discovery.enabled=true
55
spring.config.activate.on-profile=MongoDB
6-
spring.data.mongodb.authentication-database=${AUTHENTICATION_DATABASE:db-name}
7-
spring.data.mongodb.database=${AUTHENTICATION_DATABASE:db-name}
8-
spring.data.mongodb.host=${DATABASE_HOST:localhost}
9-
spring.data.mongodb.port=${DATABASE_PORT:27017}
10-
spring.data.mongodb.username=${DATABASE_USERNAME:db-username}
11-
spring.data.mongodb.password=${DATABASE_PASSWORD:db-password}
6+
spring.mongodb.authentication-database=${AUTHENTICATION_DATABASE:db-name}
7+
spring.mongodb.database=${AUTHENTICATION_DATABASE:db-name}
8+
spring.mongodb.host=${DATABASE_HOST:localhost}
9+
spring.mongodb.port=${DATABASE_PORT:27017}
10+
spring.mongodb.username=${DATABASE_USERNAME:db-username}
11+
spring.mongodb.password=${DATABASE_PASSWORD:db-password}

basyx.aasdigitaltwinregistry/basyx.digitaltwinregistry.component/src/test/java/org/eclipse/digitaltwin/basyx/digitaltwinregistry/component/tests/controllerAdvice/GlobalExceptionHandlerTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.Arrays;
3535
import java.util.List;
3636

37-
import lombok.extern.slf4j.Slf4j;
3837
import org.eclipse.digitaltwin.basyx.digitaltwinregistry.component.controllerAdvice.GlobalExceptionHandler;
3938
import org.eclipse.digitaltwin.basyx.aasregistry.model.Message;
4039
import org.eclipse.digitaltwin.basyx.aasregistry.model.Result;
@@ -54,14 +53,16 @@
5453
import org.eclipse.digitaltwin.basyx.core.exceptions.OperationDelegationException;
5554
import org.junit.Before;
5655
import org.junit.Test;
56+
import org.slf4j.Logger;
57+
import org.slf4j.LoggerFactory;
5758
import org.springframework.http.HttpStatus;
5859
import org.springframework.http.ResponseEntity;
5960
import org.springframework.validation.ObjectError;
6061
import org.springframework.web.bind.MethodArgumentNotValidException;
6162
import org.springframework.web.context.request.WebRequest;
6263

63-
@Slf4j
6464
public class GlobalExceptionHandlerTest {
65+
private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandlerTest.class);
6566

6667
private GlobalExceptionHandler exceptionHandler;
6768
private WebRequest mockWebRequest;
@@ -267,4 +268,4 @@ private void assertResultHasExceptionMessage(Result result, String expectedMessa
267268
assertEquals(MessageTypeEnum.EXCEPTION, message.getMessageType());
268269
assertNotNull(message.getTimestamp());
269270
}
270-
}
271+
}

basyx.aasdigitaltwinregistry/basyx.digitaltwinregistry.component/src/test/java/org/eclipse/digitaltwin/basyx/digitaltwinregistry/component/tests/documentation/DTRegistryApiDocumentationConfigurationTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@
2929
import static org.junit.Assert.assertNotNull;
3030
import static org.junit.Assert.assertTrue;
3131

32-
import lombok.extern.slf4j.Slf4j;
3332
import org.eclipse.digitaltwin.basyx.digitaltwinregistry.component.documentation.DTRegistryApiDocumentationConfiguration;
3433
import org.junit.Before;
3534
import org.junit.Test;
35+
import org.slf4j.Logger;
36+
import org.slf4j.LoggerFactory;
3637

3738
import io.swagger.v3.oas.models.OpenAPI;
3839

39-
@Slf4j
4040
public class DTRegistryApiDocumentationConfigurationTest {
41+
private static final Logger log = LoggerFactory.getLogger(DTRegistryApiDocumentationConfigurationTest.class);
4142

4243
private DTRegistryApiDocumentationConfiguration config;
4344

@@ -74,4 +75,4 @@ public void testConfigurationAnnotation() {
7475
assertTrue("Class should have @Configuration annotation", hasConfigurationAnnotation);
7576
log.info("Successfully conducted unit test");
7677
}
77-
}
78+
}

basyx.aasdiscoveryservice/basyx.aasdiscoveryservice-backend-h2/src/main/java/org/eclipse/digitaltwin/basyx/aasdiscoveryservice/backend/h2/configuration/DisableH2AasDiscoveryServiceConfiguration.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727

2828
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
30-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
31-
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
3230
import org.springframework.context.annotation.Configuration;
3331

3432
/**
@@ -37,9 +35,9 @@
3735
*/
3836
@Configuration
3937
@ConditionalOnExpression("!'${basyx.backend}'.equals('InMemory')")
40-
@EnableAutoConfiguration(exclude = {
41-
DataSourceAutoConfiguration.class,
42-
HibernateJpaAutoConfiguration.class
38+
@EnableAutoConfiguration(excludeName = {
39+
"org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration",
40+
"org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration"
4341
})
4442
public class DisableH2AasDiscoveryServiceConfiguration {
4543
}

basyx.aasdiscoveryservice/basyx.aasdiscoveryservice-backend-h2/src/main/java/org/eclipse/digitaltwin/basyx/aasdiscoveryservice/backend/h2/configuration/H2AasDiscoveryServiceConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import jakarta.persistence.PersistenceContext;
3131
import org.eclipse.digitaltwin.basyx.aasdiscoveryservice.backend.h2.backend.H2CrudAasDiscoveryFactory;
3232
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
33-
import org.springframework.boot.autoconfigure.domain.EntityScan;
33+
import org.springframework.boot.persistence.autoconfigure.EntityScan;
3434
import org.springframework.context.annotation.Bean;
3535
import org.springframework.context.annotation.Configuration;
3636
import org.springframework.context.annotation.Import;

0 commit comments

Comments
 (0)