Upmerge original repo - #9
Merged
Merged
Conversation
Co-authored-by: Aaron Zielstorff <aaron.zi@web.de>
* Fixes wrong status Code on putFileByPath * Fixes test * Fixes test * Fixes missed tests --------- Co-authored-by: Aaron Zielstorff <aaron.zi@web.de>
…-basyx#629) * feat: Added serialization endpoint to AAS Environment Client * adds missing override * Update basyx.aasenvironment/basyx.aasenvironment-client/src/main/java/org/eclipse/digitaltwin/basyx/aasenvironment/client/AuthorizedConnectedAasEnvironment.java Co-authored-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de> * Update basyx.aasenvironment/basyx.aasenvironment-client/src/main/java/org/eclipse/digitaltwin/basyx/aasenvironment/client/ConnectedAasEnvironment.java Co-authored-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de> * Update basyx.aasenvironment/basyx.aasenvironment-client/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/client/TestAuthorizedConnectedAasEnvironment.java Co-authored-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de> * Update basyx.aasenvironment/basyx.aasenvironment-client/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/client/TestConnectedAasEnvironment.java Co-authored-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de> * Adds NOtImplementedException to loadEnvironment Overrides --------- Co-authored-by: Aaron Zielstorff <aaron.zi@web.de> Co-authored-by: Aaron Zielstorff <aaron.zielstorff@iese.fraunhofer.de> Co-authored-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de>
eclipse-basyx#709) Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.5-jre to 33.4.8-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-version: 33.4.8-jre dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…e-basyx#702) Bumps commons-io:commons-io from 2.18.0 to 2.19.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…eclipse-basyx#689) Bumps [org.springframework.cloud:spring-cloud-dependencies](https://github.com/spring-cloud/spring-cloud-release) from 2024.0.0 to 2024.0.1. - [Release notes](https://github.com/spring-cloud/spring-cloud-release/releases) - [Commits](spring-cloud/spring-cloud-release@v2024.0.0...v2024.0.1) --- updated-dependencies: - dependency-name: org.springframework.cloud:spring-cloud-dependencies dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…se-basyx#716) Bumps org.apache.poi:poi-ooxml from 5.4.0 to 5.4.1. --- updated-dependencies: - dependency-name: org.apache.poi:poi-ooxml dependency-version: 5.4.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…eclipse-basyx#714) Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.4.4 to 3.4.5. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.4.4...v3.4.5) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-version: 3.4.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…clipse-basyx#713) Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.36 to 1.18.38. - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](projectlombok/lombok@v1.18.36...v1.18.38) --- updated-dependencies: - dependency-name: org.projectlombok:lombok dependency-version: 1.18.38 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
- TODO: Authorized Client
* Add submodel-service registristry integration feature * Trigger build * Try to fix javadoc * Add proper submodel service descriptor href generation * Try to fix javadoc * Register relevant CORS patterns * Remove duplicate entry with submodel-service-http with no classifier * Add newlines and update License version * Apply suggestions from code review Co-authored-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de> --------- Co-authored-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de>
…n Setup (eclipse-basyx#718) * Update example to use nginx setup instead of keycloak plugin * Uncomment keycloak fixed uri instance to check which test is using it * Fix aas repository registry integration tests * Update keycloak reference for test cases * Update aas environment test * Trigger build * Update submodel service example * Use the real token instead of a mock for testing --------- Co-authored-by: Aaron Zielstorff <aaron.zi@web.de>
* fixed persistence and changed formatting * release canidate for chart version 2.0.0
* Adds check for surefire/failsafe reports * Forces Build of BaSyx Test-Containers to check against new code * Changes Start environment command * Changes path to dockerfiles * Build Docker Images before starting containers * Adds Submodel Repository MongoDB Docker Image test * Adapts docker compose file * Adapts Docker Compose File * Adapts Docker Compose File * Adapts Docker Compose File * Adds AAS Repo & AAS Env MongoDB Docker Image test * Adds AAS Discovery & CD Repository MongoDB Docker Image test --------- Co-authored-by: Aaron Zielstorff <aaron.zi@web.de>
…clipse-basyx#850) Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.38 to 1.18.40. - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](projectlombok/lombok@v1.18.38...v1.18.40) --- updated-dependencies: - dependency-name: org.projectlombok:lombok dependency-version: 1.18.40 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Adds experimental flag to the basyx.feature.search (AASQL) * Adss README to AASQL example
…ipse-basyx#855) Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.5.3 to 3.5.4. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.5.3...surefire-3.5.4) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-version: 3.5.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…clipse-basyx#857) Bumps [org.springdoc:springdoc-openapi-starter-webmvc-ui](https://github.com/springdoc/springdoc-openapi) from 2.8.11 to 2.8.13. - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](springdoc/springdoc-openapi@v2.8.11...v2.8.13) --- updated-dependencies: - dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-ui dependency-version: 2.8.13 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…x#856) Bumps [co.elastic.clients:elasticsearch-java](https://github.com/elastic/elasticsearch-java) from 9.1.3 to 9.1.4. - [Release notes](https://github.com/elastic/elasticsearch-java/releases) - [Changelog](https://github.com/elastic/elasticsearch-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch-java/commits) --- updated-dependencies: - dependency-name: co.elastic.clients:elasticsearch-java dependency-version: 9.1.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…clipse-basyx#863) Bumps io.swagger.codegen.v3:swagger-codegen-maven-plugin from 3.0.72 to 3.0.73. --- updated-dependencies: - dependency-name: io.swagger.codegen.v3:swagger-codegen-maven-plugin dependency-version: 3.0.73 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…yx#864) Bumps [org.codehaus.mojo:flatten-maven-plugin](https://github.com/mojohaus/flatten-maven-plugin) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/mojohaus/flatten-maven-plugin/releases) - [Commits](mojohaus/flatten-maven-plugin@1.7.2...1.7.3) --- updated-dependencies: - dependency-name: org.codehaus.mojo:flatten-maven-plugin dependency-version: 1.7.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…clipse-basyx#861) Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.40 to 1.18.42. - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](projectlombok/lombok@v1.18.40...v1.18.42) --- updated-dependencies: - dependency-name: org.projectlombok:lombok dependency-version: 1.18.42 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fixes wrong status code for PUT AssetInformation * Fixes failing tests
…ipse-basyx#872) Bumps [com.fasterxml.jackson.core:jackson-annotations](https://github.com/FasterXML/jackson) from 2.19.2 to 2.20. - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-version: '2.20' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
eclipse-basyx#869) Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.8-jre to 33.5.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-version: 33.5.0-jre dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…clipse-basyx#870) Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 9.1.3 to 9.1.4. - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md) - [Commits](elastic/elasticsearch@v9.1.3...v9.1.4) --- updated-dependencies: - dependency-name: org.elasticsearch.client:elasticsearch-rest-client dependency-version: 9.1.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ries (eclipse-basyx#875) - Introduced properties: - basyx.aasregistry.mongodb.collectionName (default: aasdescriptors) - basyx.submodelregistry.mongodb.collectionName (default: submodeldescriptors) - Removed @document annotations to avoid static collection binding - Preserved @id usage for MongoDB _id mapping refs eclipse-basyx#873
…clipse-basyx#876) Bumps [com.nimbusds:oauth2-oidc-sdk](https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) from 11.28 to 11.29.2. - [Changelog](https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions/src/master/CHANGELOG.txt) - [Commits](https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions/branches/compare/11.29.2..11.28) --- updated-dependencies: - dependency-name: com.nimbusds:oauth2-oidc-sdk dependency-version: 11.29.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…pse-basyx#877) Bumps [org.apache.tika:tika-core](https://github.com/apache/tika) from 3.2.2 to 3.2.3. - [Changelog](https://github.com/apache/tika/blob/main/CHANGES.txt) - [Commits](apache/tika@3.2.2...3.2.3) --- updated-dependencies: - dependency-name: org.apache.tika:tika-core dependency-version: 3.2.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
eclipse-basyx#878) Bumps [org.sonatype.central:central-publishing-maven-plugin](https://github.com/sonatype/central-publishing-maven-plugin) from 0.8.0 to 0.9.0. - [Commits](https://github.com/sonatype/central-publishing-maven-plugin/commits) --- updated-dependencies: - dependency-name: org.sonatype.central:central-publishing-maven-plugin dependency-version: 0.9.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
# Conflicts: # basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/Dockerfile # basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/src/main/resources/application.properties # basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile # basyx.aasenvironment/basyx.aasenvironment.component/src/main/resources/application.properties # basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/src/main/resources/application.properties # basyx.submodelrepository/basyx.submodelrepository.component/src/main/resources/application.properties
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.