From a5fc976cf491415ae8a9b29cb78f1625c3f3d762 Mon Sep 17 00:00:00 2001 From: FriedJannik Date: Wed, 28 Aug 2024 08:55:02 +0200 Subject: [PATCH 1/8] Changes workflow --- .github/workflows/maven_run_test.yml | 6 +- pom.xml | 124 ++++++++++++++------------- 2 files changed, 69 insertions(+), 61 deletions(-) diff --git a/.github/workflows/maven_run_test.yml b/.github/workflows/maven_run_test.yml index 3da66b4aa..3712f4136 100644 --- a/.github/workflows/maven_run_test.yml +++ b/.github/workflows/maven_run_test.yml @@ -36,8 +36,10 @@ jobs: cache: maven - name: Start environment run: docker compose --project-directory ./ci up -d --wait - - name: Install BaSyx - run: mvn clean install + - name: Compile BaSyx + run: mvn clean compile -T1C + - name: Test BaSyx + run: mvn test - name: Stop environment if: always() run: docker compose --project-directory ./ci down diff --git a/pom.xml b/pom.xml index 5801f1dae..3755d92b2 100644 --- a/pom.xml +++ b/pom.xml @@ -94,53 +94,6 @@ - - org.eclipse.dash - license-tool-plugin - 1.1.1-SNAPSHOT - - - license-check - - license-check - - - - - - - org.codehaus.mojo - flatten-maven-plugin - 1.5.0 - - true - - - - - - - - - - - - flatten - process-resources - - flatten - - - - - flatten.clean - clean - - clean - - - - org.apache.maven.plugins maven-compiler-plugin @@ -177,18 +130,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - @@ -1289,5 +1230,70 @@ + + some-things + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + org.eclipse.dash + license-tool-plugin + 1.1.1-SNAPSHOT + + + license-check + + license-check + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.5.0 + + true + + + + + + + + + + + + flatten + process-resources + + flatten + + + + + flatten.clean + clean + + clean + + + + + + + From 801ec0a326117b4be5da6ca66f415518ae41d154 Mon Sep 17 00:00:00 2001 From: FriedJannik Date: Wed, 28 Aug 2024 09:00:23 +0200 Subject: [PATCH 2/8] Changes workflow --- .github/workflows/maven_run_test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven_run_test.yml b/.github/workflows/maven_run_test.yml index 3712f4136..4114cde38 100644 --- a/.github/workflows/maven_run_test.yml +++ b/.github/workflows/maven_run_test.yml @@ -34,10 +34,10 @@ jobs: java-version: '17' distribution: 'adopt' cache: maven - - name: Start environment - run: docker compose --project-directory ./ci up -d --wait - name: Compile BaSyx - run: mvn clean compile -T1C + run: mvn clean compile -T1C -DskipTests + - name: Start Test environment + run: docker compose --project-directory ./ci up -d --wait - name: Test BaSyx run: mvn test - name: Stop environment From aa76c5e8f7cee3c2cddb325f1a4741a520d66d1c Mon Sep 17 00:00:00 2001 From: FriedJannik Date: Wed, 28 Aug 2024 09:02:57 +0200 Subject: [PATCH 3/8] Changes workflow --- .github/workflows/maven_run_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven_run_test.yml b/.github/workflows/maven_run_test.yml index 4114cde38..22ab7e342 100644 --- a/.github/workflows/maven_run_test.yml +++ b/.github/workflows/maven_run_test.yml @@ -35,7 +35,7 @@ jobs: distribution: 'adopt' cache: maven - name: Compile BaSyx - run: mvn clean compile -T1C -DskipTests + run: mvn clean install -T1C -DskipTests - name: Start Test environment run: docker compose --project-directory ./ci up -d --wait - name: Test BaSyx From 32bc6a4ba9a30fab8a4cb38cbaac186f57f99438 Mon Sep 17 00:00:00 2001 From: FriedJannik Date: Wed, 28 Aug 2024 10:40:01 +0200 Subject: [PATCH 4/8] Changes workflow --- .github/workflows/maven_run_test.yml | 44 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/maven_run_test.yml b/.github/workflows/maven_run_test.yml index 22ab7e342..337cc450e 100644 --- a/.github/workflows/maven_run_test.yml +++ b/.github/workflows/maven_run_test.yml @@ -36,40 +36,40 @@ jobs: cache: maven - name: Compile BaSyx run: mvn clean install -T1C -DskipTests - - name: Start Test environment - run: docker compose --project-directory ./ci up -d --wait - - name: Test BaSyx - run: mvn test - - name: Stop environment - if: always() - run: docker compose --project-directory ./ci down - name: Build and remove Docker images run: | - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelservice.example" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelservice.example" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasrepository.component" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasrepository.component" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasenvironment.component" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasenvironment.component" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.conceptdescriptionrepository.component" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.conceptdescriptionrepository.component" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasxfileserver.component" - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-kafka-mem" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasxfileserver.component" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-kafka-mem" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-kafka-mongodb" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-kafka-mongodb" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-log-mem" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-log-mem" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-log-mongodb" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-log-mongodb" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-kafka-mem" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-kafka-mem" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-kafka-mongodb" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-kafka-mongodb" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mem" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mem" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mongodb" + mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mongodb" + - name: Start Test environment + run: docker compose --project-directory ./ci up -d --wait + - name: Test BaSyx + run: mvn test + - name: Stop environment + if: always() + run: docker compose --project-directory ./ci down From ff044123d5129a9a583a6849d12a077804611018 Mon Sep 17 00:00:00 2001 From: FriedJannik Date: Wed, 28 Aug 2024 13:34:25 +0200 Subject: [PATCH 5/8] Reverts workflow --- .github/workflows/maven_run_test.yml | 46 +++++++++++++--------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/.github/workflows/maven_run_test.yml b/.github/workflows/maven_run_test.yml index 337cc450e..6af3f3560 100644 --- a/.github/workflows/maven_run_test.yml +++ b/.github/workflows/maven_run_test.yml @@ -34,42 +34,40 @@ jobs: java-version: '17' distribution: 'adopt' cache: maven - - name: Compile BaSyx - run: mvn clean install -T1C -DskipTests + - name: Start environment + run: docker compose --project-directory ./ci up -d --wait + - name: Install BaSyx + run: mvn clean install + - name: Stop environment + if: always() + run: docker compose --project-directory ./ci down - name: Build and remove Docker images run: | - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelservice.example" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelservice.example" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasrepository.component" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasrepository.component" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasenvironment.component" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasenvironment.component" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.conceptdescriptionrepository.component" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.conceptdescriptionrepository.component" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasxfileserver.component" - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-kafka-mem" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasxfileserver.component" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-kafka-mem" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-kafka-mongodb" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-kafka-mongodb" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-log-mem" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-log-mem" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-log-mongodb" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-log-mongodb" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-kafka-mem" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-kafka-mem" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-kafka-mongodb" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-kafka-mongodb" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mem" + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mem" docker rmi -f $(docker images -aq) - mvn install -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mongodb" - - name: Start Test environment - run: docker compose --project-directory ./ci up -d --wait - - name: Test BaSyx - run: mvn test - - name: Stop environment - if: always() - run: docker compose --project-directory ./ci down + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mongodb" \ No newline at end of file From 1b8957a9dcd9354dcbad2e038dfa72b412ae7a5d Mon Sep 17 00:00:00 2001 From: FriedJannik Date: Thu, 29 Aug 2024 08:15:54 +0200 Subject: [PATCH 6/8] CI --- .../basyx.aasenvironment.benchmark/pom.xml | 113 ++++++++++++++++++ .../resources/application-MongoDB.properties | 0 2 files changed, 113 insertions(+) create mode 100644 basyx.aasenvironment/basyx.aasenvironment.benchmark/pom.xml create mode 100644 basyx.aasenvironment/basyx.aasenvironment.benchmark/src/main/resources/application-MongoDB.properties diff --git a/basyx.aasenvironment/basyx.aasenvironment.benchmark/pom.xml b/basyx.aasenvironment/basyx.aasenvironment.benchmark/pom.xml new file mode 100644 index 000000000..71d2b2911 --- /dev/null +++ b/basyx.aasenvironment/basyx.aasenvironment.benchmark/pom.xml @@ -0,0 +1,113 @@ + + + 4.0.0 + + org.eclipse.digitaltwin.basyx + basyx.aasenvironment + ${revision} + + + basyx.aasenvironment.benchmark + + + org.eclipse.digitaltwin.basyx + basyx.aasrepository.component + tests + test + + + org.eclipse.digitaltwin.basyx + basyx.aasrepository-tck + tests + test + + + org.eclipse.digitaltwin.basyx + basyx.submodelrepository.component + tests + test + + + org.eclipse.digitaltwin.basyx + basyx.submodelrepository-tck + tests + test + + + org.eclipse.digitaltwin.basyx + basyx.conceptdescriptionrepository-tck + tests + test + + + org.eclipse.digitaltwin.basyx + basyx.mongodbcore + test + + + org.eclipse.digitaltwin.basyx + basyx.conceptdescriptionrepository.component + tests + test + + + org.eclipse.digitaltwin.basyx + basyx.aasenvironment-core + + + org.eclipse.digitaltwin.basyx + basyx.aasenvironment-http + + + org.eclipse.digitaltwin.basyx + basyx.aasenvironment-feature-authorization + + + org.eclipse.digitaltwin.basyx + basyx.http + + + org.eclipse.digitaltwin.basyx + basyx.submodelservice-core + tests + test + + + org.eclipse.digitaltwin.basyx + basyx.http + tests + test + + + org.eclipse.digitaltwin.basyx + basyx.mongodbcore + + + org.springframework.boot + spring-boot-starter-actuator + + + org.eclipse.digitaltwin.aas4j + aas4j-dataformat-xml + + + org.eclipse.digitaltwin.aas4j + aas4j-dataformat-aasx + + + org.xmlunit + xmlunit-core + + + org.xmlunit + xmlunit-matchers + + + org.apache.httpcomponents.client5 + httpclient5 + test + + + \ No newline at end of file diff --git a/basyx.aasenvironment/basyx.aasenvironment.benchmark/src/main/resources/application-MongoDB.properties b/basyx.aasenvironment/basyx.aasenvironment.benchmark/src/main/resources/application-MongoDB.properties new file mode 100644 index 000000000..e69de29bb From 04a622a21cafee0b81aa7cdc68b8fff04dc5f4f3 Mon Sep 17 00:00:00 2001 From: FriedJannik Date: Thu, 29 Aug 2024 08:28:13 +0200 Subject: [PATCH 7/8] Changes workflow --- .github/workflows/maven_run_test.yml | 16 +++---- pom.xml | 72 +++++++++++++++------------- 2 files changed, 47 insertions(+), 41 deletions(-) diff --git a/.github/workflows/maven_run_test.yml b/.github/workflows/maven_run_test.yml index 6af3f3560..25c7891ed 100644 --- a/.github/workflows/maven_run_test.yml +++ b/.github/workflows/maven_run_test.yml @@ -34,13 +34,6 @@ jobs: java-version: '17' distribution: 'adopt' cache: maven - - name: Start environment - run: docker compose --project-directory ./ci up -d --wait - - name: Install BaSyx - run: mvn clean install - - name: Stop environment - if: always() - run: docker compose --project-directory ./ci down - name: Build and remove Docker images run: | mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelservice.example" @@ -70,4 +63,11 @@ jobs: docker rmi -f $(docker images -aq) mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mem" docker rmi -f $(docker images -aq) - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mongodb" \ No newline at end of file + mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mongodb" + - name: Start environment + run: docker compose --project-directory ./ci up -d --wait + - name: Install BaSyx + run: mvn clean install + - name: Stop environment + if: always() + run: docker compose --project-directory ./ci down diff --git a/pom.xml b/pom.xml index 8b48223e0..0e21ce9c4 100644 --- a/pom.xml +++ b/pom.xml @@ -255,6 +255,40 @@ + + + org.codehaus.mojo + flatten-maven-plugin + 1.5.0 + + true + + + + + + + + + + + + flatten + process-resources + + flatten + + + + + flatten.clean + clean + + clean + + + + @@ -601,6 +635,11 @@ basyx.aasenvironment-client ${revision} + + org.eclipse.digitaltwin.basyx + basyx.aasenvironment.benchmark + ${revision} + org.eclipse.digitaltwin.basyx @@ -1271,39 +1310,6 @@ - - org.codehaus.mojo - flatten-maven-plugin - 1.5.0 - - true - - - - - - - - - - - - flatten - process-resources - - flatten - - - - - flatten.clean - clean - - clean - - - - From ffef5d8c13348858e296bf7ca60d48e5a5ada67c Mon Sep 17 00:00:00 2001 From: FriedJannik Date: Thu, 29 Aug 2024 08:32:08 +0200 Subject: [PATCH 8/8] Changes workflow --- .github/workflows/maven_run_test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/maven_run_test.yml b/.github/workflows/maven_run_test.yml index 25c7891ed..16b04c349 100644 --- a/.github/workflows/maven_run_test.yml +++ b/.github/workflows/maven_run_test.yml @@ -36,8 +36,6 @@ jobs: cache: maven - name: Build and remove Docker images run: | - mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelservice.example" - docker rmi -f $(docker images -aq) mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component" docker rmi -f $(docker images -aq) mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasrepository.component"