diff --git a/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/pom.xml b/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/pom.xml index acf3211f9..3762d0842 100644 --- a/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/pom.xml +++ b/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 @@ -12,7 +14,8 @@ aas-discovery - http://localhost:${docker.host.port}/lookup/shells + + http://localhost:${docker.host.port}/lookup/shells @@ -116,31 +119,33 @@ docker - - - docker.namespace - - + + + docker.namespace + + io.fabric8 docker-maven-plugin - - - - - - ${docker.host.port}:${docker.container.port} - - - ${docker.container.waitForEndpoint} - - - - - - + + + + + + + ${docker.host.port}:${docker.container.port} + + + + ${docker.container.waitForEndpoint} + + + + + + build-docker @@ -149,19 +154,19 @@ push-docker - docker-compose-up - pre-integration-test - - start - - - - docker-compose-down - post-integration-test - - stop - - + docker-compose-up + pre-integration-test + + start + + + + docker-compose-down + post-integration-test + + stop + + diff --git a/basyx.aasenvironment/basyx.aasenvironment.component/pom.xml b/basyx.aasenvironment/basyx.aasenvironment.component/pom.xml index 461a8d9ba..280b62df1 100644 --- a/basyx.aasenvironment/basyx.aasenvironment.component/pom.xml +++ b/basyx.aasenvironment/basyx.aasenvironment.component/pom.xml @@ -46,7 +46,7 @@ basyx.conceptdescriptionrepository-tck tests test - + org.eclipse.digitaltwin.basyx basyx.conceptdescriptionrepository.component @@ -65,12 +65,12 @@ org.eclipse.digitaltwin.basyx basyx.http - + org.eclipse.digitaltwin.basyx basyx.submodelservice-core tests test - + org.eclipse.digitaltwin.basyx basyx.http @@ -119,31 +119,33 @@ docker - - - docker.namespace - - + + + docker.namespace + + io.fabric8 docker-maven-plugin - - - - - - ${docker.host.port}:${docker.container.port} - - - ${docker.container.waitForEndpoint} - - - - - - + + + + + + + ${docker.host.port}:${docker.container.port} + + + + ${docker.container.waitForEndpoint} + + + + + + build-docker @@ -152,19 +154,19 @@ push-docker - docker-compose-up - pre-integration-test - - start - - - - docker-compose-down - post-integration-test - - stop - - + docker-compose-up + pre-integration-test + + start + + + + docker-compose-down + post-integration-test + + stop + + diff --git a/basyx.aasregistry/pom.xml b/basyx.aasregistry/pom.xml index 2d0c585ae..51cd983d4 100644 --- a/basyx.aasregistry/pom.xml +++ b/basyx.aasregistry/pom.xml @@ -22,7 +22,8 @@ 3.0.42 3.0.0 open-api - Plattform_i40-AssetAdministrationShellRegistryServiceSpecification-V3.0.1_SSP-001-resolved.yaml + + Plattform_i40-AssetAdministrationShellRegistryServiceSpecification-V3.0.1_SSP-001-resolved.yaml Plattform_i40-Registry-and-Discovery.yaml 31.0.1-jre @@ -44,13 +45,14 @@ basyx.aasregistry-paths basyx.aasregistry-service basyx.aasregistry-service-basetests - basyx.aasregistry-service-kafka-events + basyx.aasregistry-service-inmemory-storage basyx.aasregistry-service-mongodb-storage basyx.aasregistry-service-release-log-mem basyx.aasregistry-service-release-log-mongodb - basyx.aasregistry-service-release-kafka-mem - basyx.aasregistry-service-release-kafka-mongodb + + + @@ -247,7 +249,8 @@ dockerbuild - + src/main/docker/Dockerfile @@ -277,19 +280,20 @@ io.fabric8 docker-maven-plugin - - - - - - artifact - - Dockerfile - ${project.basedir}/src/main/docker - - - - + + + + + + artifact + + Dockerfile + + ${project.basedir}/src/main/docker + + + + build-docker diff --git a/basyx.aasrepository/basyx.aasrepository.component/pom.xml b/basyx.aasrepository/basyx.aasrepository.component/pom.xml index bd3421794..be5ecc3ef 100644 --- a/basyx.aasrepository/basyx.aasrepository.component/pom.xml +++ b/basyx.aasrepository/basyx.aasrepository.component/pom.xml @@ -124,34 +124,36 @@ docker - - - docker.namespace - - + + + docker.namespace + + io.fabric8 docker-maven-plugin - - - - - - ${docker.host.port}:${docker.container.port} - - - ${docker.container.waitForEndpoint} - - - - integration - - - - - + + + + + + + ${docker.host.port}:${docker.container.port} + + + + ${docker.container.waitForEndpoint} + + + + integration + + + + + build-docker @@ -160,19 +162,19 @@ push-docker - docker-compose-up - pre-integration-test - - start - - - - docker-compose-down - post-integration-test - - stop - - + docker-compose-up + pre-integration-test + + start + + + + docker-compose-down + post-integration-test + + stop + + diff --git a/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/pom.xml b/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/pom.xml index 85850b976..7efa9cca9 100644 --- a/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/pom.xml +++ b/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -13,7 +14,8 @@ conceptdescription-repository - http://localhost:${docker.host.port}/concept-descriptions + + http://localhost:${docker.host.port}/concept-descriptions @@ -117,31 +119,33 @@ docker - - - docker.namespace - - + + + docker.namespace + + io.fabric8 docker-maven-plugin - - - - - - ${docker.host.port}:${docker.container.port} - - - ${docker.container.waitForEndpoint} - - - - - - + + + + + + + ${docker.host.port}:${docker.container.port} + + + + ${docker.container.waitForEndpoint} + + + + + + build-docker @@ -150,19 +154,19 @@ push-docker - docker-compose-up - pre-integration-test - - start - - - - docker-compose-down - post-integration-test - - stop - - + docker-compose-up + pre-integration-test + + start + + + + docker-compose-down + post-integration-test + + stop + + diff --git a/basyx.submodelregistry/pom.xml b/basyx.submodelregistry/pom.xml index 514859c66..f0243981f 100644 --- a/basyx.submodelregistry/pom.xml +++ b/basyx.submodelregistry/pom.xml @@ -22,7 +22,8 @@ 3.0.42 3.0.0 open-api - Plattform_i40-SubmodelRegistryServiceSpecification-V3.0.1_SSP-001-resolved.yaml + + Plattform_i40-SubmodelRegistryServiceSpecification-V3.0.1_SSP-001-resolved.yaml Plattform_i40-SubmodelRegistry-and-Discovery.yaml 31.0.1-jre 3.6.0 @@ -44,11 +45,13 @@ basyx.submodelregistry-service-release-log-mem basyx.submodelregistry-client-native basyx.submodelregistry-service-mongodb-storage - + basyx.submodelregistry-service-basetests - + basyx.submodelregistry-service-release-log-mongodb - + @@ -230,7 +233,8 @@ dockerbuild - + src/main/docker/Dockerfile @@ -260,19 +264,20 @@ io.fabric8 docker-maven-plugin - - - - - - artifact - - Dockerfile - ${project.basedir}/src/main/docker - - - - + + + + + + artifact + + Dockerfile + + ${project.basedir}/src/main/docker + + + + build-docker diff --git a/basyx.submodelrepository/basyx.submodelrepository.component/pom.xml b/basyx.submodelrepository/basyx.submodelrepository.component/pom.xml index 38cbd01f1..1bbb18c94 100644 --- a/basyx.submodelrepository/basyx.submodelrepository.component/pom.xml +++ b/basyx.submodelrepository/basyx.submodelrepository.component/pom.xml @@ -131,34 +131,36 @@ docker - - - docker.namespace - - + + + docker.namespace + + io.fabric8 docker-maven-plugin - - - - - - ${docker.host.port}:${docker.container.port} - - - ${docker.container.waitForEndpoint} - - - - integration - - - - - + + + + + + + ${docker.host.port}:${docker.container.port} + + + + ${docker.container.waitForEndpoint} + + + + integration + + + + + build-docker @@ -167,19 +169,19 @@ push-docker - docker-compose-up - pre-integration-test - - start - - - - docker-compose-down - post-integration-test - - stop - - + docker-compose-up + pre-integration-test + + start + + + + docker-compose-down + post-integration-test + + stop + + diff --git a/basyx.submodelservice/basyx.submodelservice.component/pom.xml b/basyx.submodelservice/basyx.submodelservice.component/pom.xml index 18956ef26..e905c5350 100644 --- a/basyx.submodelservice/basyx.submodelservice.component/pom.xml +++ b/basyx.submodelservice/basyx.submodelservice.component/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 org.eclipse.digitaltwin.basyx @@ -8,7 +10,8 @@ basyx.submodelservice.component submodelservice - http://localhost:${docker.host.port}/submodel + + http://localhost:${docker.host.port}/submodel @@ -65,7 +68,8 @@ maven-dependency-plugin - org.eclipse.digitaltwin.basyx:basyx.submodelservice-http + + org.eclipse.digitaltwin.basyx:basyx.submodelservice-http @@ -75,31 +79,33 @@ docker - - - docker.namespace - - + + + docker.namespace + + io.fabric8 docker-maven-plugin - - - - - - ${docker.host.port}:${docker.container.port} - - - ${docker.container.waitForEndpoint} - - - - - - + + + + + + + ${docker.host.port}:${docker.container.port} + + + + ${docker.container.waitForEndpoint} + + + + + + build-docker @@ -108,19 +114,19 @@ push-docker - docker-compose-up - pre-integration-test - - start - - - - docker-compose-down - post-integration-test - - stop - - + docker-compose-up + pre-integration-test + + start + + + + docker-compose-down + post-integration-test + + stop + + diff --git a/pom.xml b/pom.xml index e1ea34d6c..569fc5010 100644 --- a/pom.xml +++ b/pom.xml @@ -48,11 +48,11 @@ UTF-8 UTF-8 2.0.0-SNAPSHOT - - eclipsebasyx - NOT_DEFINED_IN_MODULE - ${revision} - linux/amd64,linux/arm64 + + eclipsebasyx + NOT_DEFINED_IN_MODULE + ${revision} + linux/amd64,linux/arm64 8081 8081 1.0.0-milestone-04 @@ -161,59 +161,63 @@ - io.fabric8 - docker-maven-plugin - 0.43.4 - - - - ${docker.namespace}/${docker.image.name}:${docker.image.tag} - - ${project.basedir} - - - - ${project.version} - ${maven.build.timestamp} - - true - - - - true - - - - build-docker - package - - build - - - - push-docker - deploy - - build - push - - - - - - - ${docker.target.platforms} - - ${docker.provenance} - - - - - - - - - + io.fabric8 + docker-maven-plugin + 0.43.4 + + + + + ${docker.namespace}/${docker.image.name}:${docker.image.tag} + + ${project.basedir} + + + + ${project.version} + + ${maven.build.timestamp} + + true + + + + true + + + + build-docker + package + + build + + + + push-docker + deploy + + build + push + + + + + + + + ${docker.target.platforms} + + + ${docker.provenance} + + + + + + + + + @@ -279,6 +283,11 @@ snakeyaml 2.2 + + org.yaml + snakeyaml + 2.2 + org.springdoc springdoc-openapi-starter-webmvc-ui @@ -381,7 +390,8 @@ org.eclipse.digitaltwin.basyx - basyx.submodelrepository-feature-registry-integration + + basyx.submodelrepository-feature-registry-integration ${revision} @@ -645,7 +655,8 @@ org.eclipse.digitaltwin.basyx - basyx.submodelrepository-feature-registry-integration + + basyx.submodelrepository-feature-registry-integration ${revision} tests