Fix merge conflicts on main #235
Closed
Conversation
This file contains 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
Create first POC Version to test integration with all components
Create POC Version to test integration with all components
Create a new release
Create new release with library updates and bugfixes
New release
New release
New release
Signed-off-by: Flurb <private@tjalma.com>
Bumps `quarkus.platform.version` from 2.8.3.Final to 2.9.0.Final. Updates `quarkus-universe-bom` from 2.8.3.Final to 2.9.0.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](quarkusio/quarkus-platform@2.8.3.Final...2.9.0.Final) Updates `quarkus-maven-plugin` from 2.8.3.Final to 2.9.0.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps ubi8/ubi-minimal from 8.5 to 8.6. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…cker/ubi8/ubi-minimal-8.6 Bump ubi8/ubi-minimal from 8.5 to 8.6 in /app/src/main/docker
….version-2.9.0.Final Bump quarkus.platform.version from 2.8.3.Final to 2.9.0.Final
CII Best Practices Badge
New release
Bumps `quarkus.platform.version` from 2.9.0.Final to 2.9.1.Final. Updates `quarkus-universe-bom` from 2.9.0.Final to 2.9.1.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](quarkusio/quarkus-platform@2.9.0.Final...2.9.1.Final) Updates `quarkus-maven-plugin` from 2.9.0.Final to 2.9.1.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
….version-2.9.1.Final Bump quarkus.platform.version from 2.9.0.Final to 2.9.1.Final
Bumps `quarkus.platform.version` from 2.9.1.Final to 2.9.2.Final. Updates `quarkus-universe-bom` from 2.9.1.Final to 2.9.2.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](quarkusio/quarkus-platform@2.9.1.Final...2.9.2.Final) Updates `quarkus-maven-plugin` from 2.9.1.Final to 2.9.2.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…m.version-2.9.2.Final Bump quarkus.platform.version from 2.9.1.Final to 2.9.2.Final
Bumps `surefire-plugin.version` from 3.0.0-M6 to 3.0.0-M7. Updates `maven-surefire-plugin` from 3.0.0-M6 to 3.0.0-M7 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.0.0-M6...surefire-3.0.0-M7) Updates `maven-failsafe-plugin` from 3.0.0-M6 to 3.0.0-M7 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.0.0-M6...surefire-3.0.0-M7) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
….version-3.0.0-M7 Bump surefire-plugin.version from 3.0.0-M6 to 3.0.0-M7
Bumps [powsybl-single-line-diagram-core](https://github.com/powsybl/powsybl-single-line-diagram) from 2.10.0 to 2.11.0. - [Release notes](https://github.com/powsybl/powsybl-single-line-diagram/releases) - [Commits](powsybl/powsybl-diagram@v2.10.0...v2.11.0) --- updated-dependencies: - dependency-name: com.powsybl:powsybl-single-line-diagram-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3.3.0...v3.4.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…s/setup-java-3.4.0 Bump actions/setup-java from 3.3.0 to 3.4.0
Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com>
…sybl-single-line-diagram-core-2.11.0 Bump powsybl-single-line-diagram-core from 2.10.0 to 2.11.0
Bumps `quarkus.platform.version` from 2.9.2.Final to 2.10.0.Final. Updates `quarkus-universe-bom` from 2.9.2.Final to 2.10.0.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](quarkusio/quarkus-platform@2.9.2.Final...2.10.0.Final) Updates `quarkus-maven-plugin` from 2.9.2.Final to 2.10.0.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…m.version-2.10.0.Final Bump quarkus.platform.version from 2.9.2.Final to 2.10.0.Final
New release
Bumps `compas.core.version` from 0.9.0 to 0.9.1. Updates `commons` from 0.9.0 to 0.9.1 Updates `jaxrs-commons` from 0.9.0 to 0.9.1 --- updated-dependencies: - dependency-name: org.lfenergy.compas.core:commons dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.lfenergy.compas.core:jaxrs-commons dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…sion-0.9.1 Bump compas.core.version from 0.9.0 to 0.9.1
…b-project-automation-plus-0.8.3
…age/github-project-automation-plus-0.8.3 Bump alex-page/github-project-automation-plus from 0.8.2 to 0.8.3
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3.9.0...v3.10.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…s/setup-java-3.10.0 Bump actions/setup-java from 3.9.0 to 3.10.0
Bumps `quarkus.platform.version` from 2.16.1.Final to 2.16.2.Final. Updates `quarkus-universe-bom` from 2.16.1.Final to 2.16.2.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](quarkusio/quarkus-platform@2.16.1.Final...2.16.2.Final) Updates `quarkus-maven-plugin` from 2.16.1.Final to 2.16.2.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps ubi8/ubi-minimal from 8.7-1049 to 8.7-1049.1675784874. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
…ocker/ubi8/ubi-minimal-8.7-1049.1675784874 Bump ubi8/ubi-minimal from 8.7-1049 to 8.7-1049.1675784874 in /app/src/main/docker
…m.version-2.16.2.Final Bump quarkus.platform.version from 2.16.1.Final to 2.16.2.Final
Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.4.1...maven-javadoc-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps `surefire-plugin.version` from 3.0.0-M8 to 3.0.0-M9. Updates `maven-surefire-plugin` from 3.0.0-M8 to 3.0.0-M9 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.0.0-M8...surefire-3.0.0-M9) Updates `maven-failsafe-plugin` from 3.0.0-M8 to 3.0.0-M9 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.0.0-M8...surefire-3.0.0-M9) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…n.plugins-maven-javadoc-plugin-3.5.0 Bump maven-javadoc-plugin from 3.4.1 to 3.5.0
….version-3.0.0-M9 Bump surefire-plugin.version from 3.0.0-M8 to 3.0.0-M9
Bumps `quarkus.platform.version` from 2.16.2.Final to 2.16.3.Final. Updates `quarkus-universe-bom` from 2.16.2.Final to 2.16.3.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](quarkusio/quarkus-platform@2.16.2.Final...2.16.3.Final) Updates `quarkus-maven-plugin` from 2.16.2.Final to 2.16.3.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…m.version-2.16.3.Final Bump quarkus.platform.version from 2.16.2.Final to 2.16.3.Final
Bumps `log4j2.version` from 2.19.0 to 2.20.0. Updates `log4j-api` from 2.19.0 to 2.20.0 - [Release notes](https://github.com/apache/logging-log4j2/releases) - [Changelog](https://github.com/apache/logging-log4j2/blob/release-2.x/CHANGELOG.adoc) - [Commits](apache/logging-log4j2@rel/2.19.0...rel/2.20.0) Updates `log4j-core` from 2.19.0 to 2.20.0 - [Release notes](https://github.com/apache/logging-log4j2/releases) - [Changelog](https://github.com/apache/logging-log4j2/blob/release-2.x/CHANGELOG.adoc) - [Commits](apache/logging-log4j2@rel/2.19.0...rel/2.20.0) Updates `log4j-slf4j-impl` from 2.19.0 to 2.20.0 - [Release notes](https://github.com/apache/logging-log4j2/releases) - [Changelog](https://github.com/apache/logging-log4j2/blob/release-2.x/CHANGELOG.adoc) - [Commits](apache/logging-log4j2@rel/2.19.0...rel/2.20.0) --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps ubi8/ubi-minimal from 8.7-1049.1675784874 to 8.7-1085. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
…ocker/ubi8/ubi-minimal-8.7-1085 Bump ubi8/ubi-minimal from 8.7-1049.1675784874 to 8.7-1085 in /app/src/main/docker
…2.20.0 Bump log4j2.version from 2.19.0 to 2.20.0
New Release
* Bump quarkus.platform.version from 2.16.3.Final to 2.16.4.Final Bumps `quarkus.platform.version` from 2.16.3.Final to 2.16.4.Final. Updates `quarkus-universe-bom` from 2.16.3.Final to 2.16.4.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](quarkusio/quarkus-platform@2.16.3.Final...2.16.4.Final) Updates `quarkus-maven-plugin` from 2.16.3.Final to 2.16.4.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-compiler-plugin from 3.10.1 to 3.11.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump surefire-plugin.version from 3.0.0-M9 to 3.0.0 Bumps `surefire-plugin.version` from 3.0.0-M9 to 3.0.0. Updates `maven-surefire-plugin` from 3.0.0-M9 to 3.0.0 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.0.0-M9...surefire-3.0.0) Updates `maven-failsafe-plugin` from 3.0.0-M9 to 3.0.0 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.0.0-M9...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump quarkus.platform.version from 2.16.4.Final to 2.16.5.Final Bumps `quarkus.platform.version` from 2.16.4.Final to 2.16.5.Final. Updates `quarkus-universe-bom` from 2.16.4.Final to 2.16.5.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](quarkusio/quarkus-platform@2.16.4.Final...2.16.5.Final) Updates `quarkus-maven-plugin` from 2.16.4.Final to 2.16.5.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump actions/setup-java from 3.10.0 to 3.11.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.10.0 to 3.11.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3.10.0...v3.11.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.7-1085 to 8.7-1085.1679482090. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Bump jacoco-maven-plugin from 0.8.8 to 0.8.9 Bumps [jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.8 to 0.8.9. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](jacoco/jacoco@v0.8.8...v0.8.9) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump quarkus.platform.version from 2.16.5.Final to 2.16.6.Final Bumps `quarkus.platform.version` from 2.16.5.Final to 2.16.6.Final. Updates `quarkus-universe-bom` from 2.16.5.Final to 2.16.6.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](quarkusio/quarkus-platform@2.16.5.Final...2.16.6.Final) Updates `quarkus-maven-plugin` from 2.16.5.Final to 2.16.6.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.7-1085.1679482090 to 8.7-1107. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Bump powsybl-single-line-diagram-core from 3.1.0 to 3.2.0 Bumps powsybl-single-line-diagram-core from 3.1.0 to 3.2.0. --- updated-dependencies: - dependency-name: com.powsybl:powsybl-single-line-diagram-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fixed import * Bump jacoco-maven-plugin from 0.8.9 to 0.8.10 Bumps [jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.9 to 0.8.10. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](jacoco/jacoco@v0.8.9...v0.8.10) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pascal Wilbrink <pascal.wilbrink@gmail.com> Co-authored-by: Pascal Wilbrink <pascal.wilbrink@alliander.com>
# Conflicts: # .github/workflows/build-project.yml # .github/workflows/release-project.yml # .github/workflows/sonarcloud-analysis.yml # app/src/main/docker/Dockerfile.jvm # app/src/main/docker/Dockerfile.native # pom.xml # service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java
Signed-off-by: Pascal Wilbrink <pascal.wilbrink@alliander.com>
|
Kudos, SonarCloud Quality Gate passed!
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.