From 4478859a8aa99e7404194628b95e6baef1fc6879 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 10:33:46 +0000 Subject: [PATCH 01/16] Bump openapi-generator.version from 6.6.0 to 7.2.0 Bumps `openapi-generator.version` from 6.6.0 to 7.2.0. Updates `org.openapitools:openapi-generator` from 6.6.0 to 7.2.0 - [Release notes](https://github.com/openapitools/openapi-generator/releases) - [Changelog](https://github.com/OpenAPITools/openapi-generator/blob/master/docs/3.0.0-release-note.md) - [Commits](https://github.com/openapitools/openapi-generator/compare/v6.6.0...v7.2.0) Updates `org.openapitools:openapi-generator-maven-plugin` from 6.6.0 to 7.2.0 --- updated-dependencies: - dependency-name: org.openapitools:openapi-generator dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.openapitools:openapi-generator-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2af9d2b74..cfc1b2f62 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ backbase https://sonarcloud.io - 6.6.0 + 7.2.0 tests/target/site/jacoco-aggregate/jacoco.xml ${aggregate.report.dir} From 236dcf157bab41b13a83ff63c603b8f586da6be6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 10:55:32 +0000 Subject: [PATCH 02/16] Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.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] --- boat-quay/boat-quay-lint/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml index ad91fcc15..fca178e92 100644 --- a/boat-quay/boat-quay-lint/pom.xml +++ b/boat-quay/boat-quay-lint/pom.xml @@ -86,7 +86,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.0 diff --git a/pom.xml b/pom.xml index cfc1b2f62..62c5d1ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -353,7 +353,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.0 org.apache.maven.plugins From c937508c7c9105080ba2536f0a947965f9448f50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 10:55:18 +0000 Subject: [PATCH 03/16] Bump swagger-core.version from 2.2.19 to 2.2.20 Bumps `swagger-core.version` from 2.2.19 to 2.2.20. Updates `io.swagger.core.v3:swagger-models` from 2.2.19 to 2.2.20 Updates `io.swagger.core.v3:swagger-core` from 2.2.19 to 2.2.20 - [Release notes](https://github.com/swagger-api/swagger-core/releases) - [Commits](https://github.com/swagger-api/swagger-core/compare/v2.2.19...v2.2.20) --- updated-dependencies: - dependency-name: io.swagger.core.v3:swagger-models dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.swagger.core.v3:swagger-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62c5d1ee5..0716356a5 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 5.8.0 1.7.30 - 2.2.19 + 2.2.20 2.1.6 2.2 0.8.11 From 9ff7b987b9d90811926e064667cb78f3e6f9d2ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 10:26:46 +0000 Subject: [PATCH 04/16] Bump org.openapitools.openapidiff:openapi-diff-core Bumps [org.openapitools.openapidiff:openapi-diff-core](https://github.com/OpenAPITools/openapi-diff) from 2.1.0-beta.6 to 2.1.0-beta.8. - [Release notes](https://github.com/OpenAPITools/openapi-diff/releases) - [Commits](https://github.com/OpenAPITools/openapi-diff/compare/2.1.0-beta.6...2.1.0-beta.8) --- updated-dependencies: - dependency-name: org.openapitools.openapidiff:openapi-diff-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- boat-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boat-maven-plugin/pom.xml b/boat-maven-plugin/pom.xml index 0e5141cd4..4f50dc967 100644 --- a/boat-maven-plugin/pom.xml +++ b/boat-maven-plugin/pom.xml @@ -52,7 +52,7 @@ org.openapitools.openapidiff openapi-diff-core - 2.1.0-beta.6 + 2.1.0-beta.8 From b9c3a0f1759138b99eda78c87d8ad75ba13caaa6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 10:09:24 +0000 Subject: [PATCH 05/16] Bump github/codeql-action from 2 to 3 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8df4b1c03..42186f9f2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -18,10 +18,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 From 4d582a59ee3e97286338cf048ef1ec0f82786417 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 10:58:41 +0000 Subject: [PATCH 06/16] Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.2 to 3.2.3 Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.2...surefire-3.2.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0716356a5..a89b28ed8 100644 --- a/pom.xml +++ b/pom.xml @@ -378,7 +378,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.2 + 3.2.3 org.sonarsource.scanner.maven From ef4d41fd77b01958e67146397ca9fae4b2bbecb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 10:36:37 +0000 Subject: [PATCH 07/16] Bump kotlin.version from 1.9.21 to 1.9.22 Bumps `kotlin.version` from 1.9.21 to 1.9.22. Updates `org.jetbrains.kotlin:kotlin-stdlib` from 1.9.21 to 1.9.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.21...v1.9.22) Updates `org.jetbrains.kotlin:kotlin-reflect` from 1.9.21 to 1.9.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.21...v1.9.22) Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 1.9.21 to 1.9.22 --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- boat-quay/boat-quay-lint/pom.xml | 2 +- boat-quay/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml index fca178e92..f0cc3cf8d 100644 --- a/boat-quay/boat-quay-lint/pom.xml +++ b/boat-quay/boat-quay-lint/pom.xml @@ -17,7 +17,7 @@ ${basedir}/../${aggregate.report.dir} - 1.9.21 + 1.9.22 false diff --git a/boat-quay/pom.xml b/boat-quay/pom.xml index 26df2af89..0c2a08fc8 100644 --- a/boat-quay/pom.xml +++ b/boat-quay/pom.xml @@ -19,7 +19,7 @@ ${basedir}/../${aggregate.report.dir} - 1.9.21 + 1.9.22 false 1.1.1 From 836853700348b8194f9d468460a1b940aa04c349 Mon Sep 17 00:00:00 2001 From: jasper linschoten Date: Tue, 2 Jan 2024 11:27:26 +0100 Subject: [PATCH 08/16] Adjust to updated libs --- .../java/com/backbase/oss/boat/DiffMojo.java | 25 ++++++++++++------- .../oss/boat/diff/BatchOpenApiDiff.java | 24 ++++++++++-------- boat-quay/boat-quay-rules/pom.xml | 7 ++++++ .../codegen/angular/BoatAngularGenerator.java | 2 +- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/DiffMojo.java b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/DiffMojo.java index 60089fb0d..5c2b476be 100644 --- a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/DiffMojo.java +++ b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/DiffMojo.java @@ -1,12 +1,7 @@ package com.backbase.oss.boat; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; - import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.FileUtils; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; @@ -19,6 +14,8 @@ import org.openapitools.openapidiff.core.output.MarkdownRender; import org.openapitools.openapidiff.core.output.Render; +import java.io.*; + /** * Calculates a Change log for APIs. */ @@ -52,12 +49,12 @@ public void execute() throws MojoExecutionException { ConsoleRender consoleRender = new ConsoleRender(); if (changedOpenApi.isIncompatible()) { - log.error("\n{}", consoleRender.render(changedOpenApi)); + log.error("\n{}", renderChangedOpenApi(consoleRender, changedOpenApi)); if (breakOnBreakingChanges) { throw new MojoExecutionException("newFile: " + newFile + " contains breaking changes!"); } } else { - log.info("\n{}", consoleRender.render(changedOpenApi)); + log.info("\n{}", renderChangedOpenApi(consoleRender, changedOpenApi)); } if (writeChangelog) { @@ -73,8 +70,9 @@ public void execute() throws MojoExecutionException { } else { throw new MojoExecutionException("Invalid changelogRender. Supported types are 'markdown' and 'html"); } - try { - FileUtils.write(new File(changelogOutput, "changelog." + extension), render.render(changedOpenApi), StandardCharsets.UTF_8); + File output = new File(changelogOutput, "changelog." + extension); + try (FileOutputStream outputStream = new FileOutputStream(output)) { + render.render(changedOpenApi, new OutputStreamWriter(outputStream)); } catch (IOException e) { throw new MojoExecutionException("Failed to write output", e); } @@ -82,6 +80,15 @@ public void execute() throws MojoExecutionException { } + public static String renderChangedOpenApi(Render render, ChangedOpenApi changedOpenApi) { + try (OutputStream outputStream = new ByteArrayOutputStream()) { + render.render(changedOpenApi, new OutputStreamWriter(outputStream)); + return outputStream.toString(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + public void setNewFile(File newFile) { this.newFile = newFile; } diff --git a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/diff/BatchOpenApiDiff.java b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/diff/BatchOpenApiDiff.java index 17b72fb4f..90e58bb5f 100644 --- a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/diff/BatchOpenApiDiff.java +++ b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/diff/BatchOpenApiDiff.java @@ -1,10 +1,21 @@ package com.backbase.oss.boat.diff; +import com.backbase.oss.boat.DiffMojo; import com.backbase.oss.boat.serializer.SerializerUtils; import io.swagger.parser.OpenAPIParser; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.parser.core.models.ParseOptions; import io.swagger.v3.parser.core.models.SwaggerParseResult; +import lombok.experimental.UtilityClass; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.maven.artifact.versioning.DefaultArtifactVersion; +import org.openapitools.openapidiff.core.compare.OpenApiDiff; +import org.openapitools.openapidiff.core.compare.OpenApiDiffOptions; +import org.openapitools.openapidiff.core.model.ChangedOpenApi; +import org.openapitools.openapidiff.core.output.MarkdownRender; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -15,14 +26,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import lombok.experimental.UtilityClass; -import org.apache.commons.lang3.tuple.Pair; -import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -import org.openapitools.openapidiff.core.compare.OpenApiDiff; -import org.openapitools.openapidiff.core.model.ChangedOpenApi; -import org.openapitools.openapidiff.core.output.MarkdownRender; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @UtilityClass public class BatchOpenApiDiff { @@ -44,6 +47,7 @@ public static void diff(Path outputDirectory, Map success, Map oldVersionPair = sortedSpecs.get(i-1); Pair newVersionPair = sortedSpecs.get(i); @@ -53,7 +57,7 @@ public static void diff(Path outputDirectory, Map success, Map changeLog = getChangeLog(oldOpenAPI); changeLog.add(compare); String changelogMarkdown = renderChangeLog(changeLog); @@ -126,7 +130,7 @@ private static String renderChangeLog(List changeLog) { if (diff.isIncompatible()) { markDown.append("**Note:** API has incompatible changes!!\n"); } - String changes = BatchOpenApiDiff.markdownRender.render(diff); + String changes = DiffMojo.renderChangedOpenApi(markdownRender, diff); markDown.append(changes); } }); diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml index be66290fc..983a6fb1d 100644 --- a/boat-quay/boat-quay-rules/pom.xml +++ b/boat-quay/boat-quay-rules/pom.xml @@ -168,6 +168,13 @@ true + + org.apache.maven.plugins + maven-compiler-plugin + + true + + diff --git a/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java b/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java index 0c083f418..bd078a0b5 100644 --- a/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java +++ b/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java @@ -151,7 +151,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) { @Override protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) { - codegenModel.additionalPropertiesType = getTypeDeclaration(ModelUtils.getAdditionalProperties(openAPI, schema)); + codegenModel.additionalPropertiesType = getTypeDeclaration(ModelUtils.getAdditionalProperties(schema)); addImport(codegenModel, codegenModel.additionalPropertiesType); } From 4d5893139d7ff562ebcfe23519c4386d20af2534 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 10:10:44 +0000 Subject: [PATCH 09/16] Bump jackson.version from 2.16.0 to 2.16.1 Bumps `jackson.version` from 2.16.0 to 2.16.1. Updates `com.fasterxml.jackson.core:jackson-core` from 2.16.0 to 2.16.1 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.16.0...jackson-core-2.16.1) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.16.0 to 2.16.1 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-yaml` from 2.16.0 to 2.16.1 - [Commits](https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.16.0...jackson-dataformats-text-2.16.1) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.16.0 to 2.16.1 Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.16.0 to 2.16.1 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-guava` from 2.16.0 to 2.16.1 - [Commits](https://github.com/FasterXML/jackson-datatypes-collections/compare/jackson-datatypes-collections-2.16.0...jackson-datatypes-collections-2.16.1) Updates `com.fasterxml.jackson.datatype:jackson-datatype-joda` from 2.16.0 to 2.16.1 - [Commits](https://github.com/FasterXML/jackson-datatype-joda/compare/jackson-datatype-joda-2.16.0...jackson-datatype-joda-2.16.1) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-guava dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-joda dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a89b28ed8..19ea1a14a 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ ${aggregate.report.dir} 1.18.30 - 2.16.0 + 2.16.1 5.8.0 1.7.30 From 8079d55e0579c114963aa5cedc65004cd6cbda4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 10:10:55 +0000 Subject: [PATCH 10/16] Bump org.codehaus.plexus:plexus-archiver from 4.9.0 to 4.9.1 Bumps [org.codehaus.plexus:plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 4.9.0 to 4.9.1. - [Release notes](https://github.com/codehaus-plexus/plexus-archiver/releases) - [Changelog](https://github.com/codehaus-plexus/plexus-archiver/blob/master/ReleaseNotes.md) - [Commits](https://github.com/codehaus-plexus/plexus-archiver/compare/plexus-archiver-4.9.0...plexus-archiver-4.9.1) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-archiver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- boat-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boat-maven-plugin/pom.xml b/boat-maven-plugin/pom.xml index 4f50dc967..05b16b382 100644 --- a/boat-maven-plugin/pom.xml +++ b/boat-maven-plugin/pom.xml @@ -101,7 +101,7 @@ org.codehaus.plexus plexus-archiver - 4.9.0 + 4.9.1 From b9eedaa9e7b3bf1f2c6c3801b562cef527f678d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 10:11:14 +0000 Subject: [PATCH 11/16] Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.1) --- 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] --- boat-quay/boat-quay-lint/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml index f0cc3cf8d..eba88b978 100644 --- a/boat-quay/boat-quay-lint/pom.xml +++ b/boat-quay/boat-quay-lint/pom.xml @@ -86,7 +86,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.0 + 3.12.1 diff --git a/pom.xml b/pom.xml index 19ea1a14a..7fef31b1c 100644 --- a/pom.xml +++ b/pom.xml @@ -353,7 +353,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.0 + 3.12.1 org.apache.maven.plugins From 995a6b94191160547a6f3e6de4fcfdefc24743d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 10:57:33 +0000 Subject: [PATCH 12/16] Bump org.slf4j:slf4j-ext from 2.0.9 to 2.0.10 Bumps org.slf4j:slf4j-ext from 2.0.9 to 2.0.10. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-ext dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7fef31b1c..3ba707319 100644 --- a/pom.xml +++ b/pom.xml @@ -203,7 +203,7 @@ org.slf4j slf4j-ext - 2.0.9 + 2.0.10 From b3499551c0e2154bf33585b8e4a6b91ab4aec4ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 10:57:44 +0000 Subject: [PATCH 13/16] Bump org.slf4j:slf4j-api from 2.0.9 to 2.0.10 Bumps org.slf4j:slf4j-api from 2.0.9 to 2.0.10. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ba707319..17b1d0baa 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ org.slf4j slf4j-api - 2.0.9 + 2.0.10 From 578c88499a157574764c53150ed7e44b97aecd4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 10:35:51 +0000 Subject: [PATCH 14/16] Bump org.assertj:assertj-core from 3.24.2 to 3.25.0 Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.0. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.0) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- boat-quay/boat-quay-rules/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml index 983a6fb1d..f669f9b03 100644 --- a/boat-quay/boat-quay-rules/pom.xml +++ b/boat-quay/boat-quay-rules/pom.xml @@ -92,7 +92,7 @@ org.assertj assertj-core - 3.24.2 + 3.25.0 From d4a2b99189f8d22d6081d046ba6dc1e0b2ed71f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 10:23:16 +0000 Subject: [PATCH 15/16] Bump com.github.javaparser:javaparser-core from 3.25.7 to 3.25.8 Bumps [com.github.javaparser:javaparser-core](https://github.com/javaparser/javaparser) from 3.25.7 to 3.25.8. - [Release notes](https://github.com/javaparser/javaparser/releases) - [Changelog](https://github.com/javaparser/javaparser/blob/master/changelog.md) - [Commits](https://github.com/javaparser/javaparser/compare/javaparser-parent-3.25.7...javaparser-parent-3.25.8) --- updated-dependencies: - dependency-name: com.github.javaparser:javaparser-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- boat-scaffold/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boat-scaffold/pom.xml b/boat-scaffold/pom.xml index 9b39d5941..8bfb1bb45 100644 --- a/boat-scaffold/pom.xml +++ b/boat-scaffold/pom.xml @@ -155,7 +155,7 @@ com.github.javaparser javaparser-core - 3.25.7 + 3.25.8 test From 3112967b62eb1523578a41b4b078842badea6318 Mon Sep 17 00:00:00 2001 From: jasper linschoten Date: Tue, 2 Jan 2024 12:32:56 +0100 Subject: [PATCH 16/16] Adjust to updated libs --- .../com/backbase/oss/codegen/java/BoatSpringCodeGen.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java b/boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java index 177837e28..827cd98ca 100644 --- a/boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java +++ b/boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java @@ -17,6 +17,7 @@ import java.io.File; import java.io.IOException; import java.io.Writer; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Set; @@ -354,9 +355,9 @@ public void processOpts() { writePropertyBack(USE_PROTECTED_FIELDS, this.useProtectedFields); - this.additionalProperties.put("indent4", new IndentedLambda(4, " ")); + this.additionalProperties.put("indent4", new IndentedLambda(4, " ", true, true)); this.additionalProperties.put("newLine4", new NewLineIndent(4, " ")); - this.additionalProperties.put("indent8", new IndentedLambda(8, " ")); + this.additionalProperties.put("indent8", new IndentedLambda(8, " ", true, true)); this.additionalProperties.put("newLine8", new NewLineIndent(8, " ")); this.additionalProperties.put("toOneLine", new FormatToOneLine()); this.additionalProperties.put("trimAndIndent4", new TrimAndIndent(4, " ")); @@ -381,6 +382,9 @@ private boolean needApiUtil() { */ @Override public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, List servers) { + if (operation.getExtensions() == null) { + operation.setExtensions(new LinkedHashMap<>()); + } final CodegenOperation codegenOperation = super.fromOperation(path, httpMethod, operation, servers); if (this.addServletRequest) { final CodegenParameter codegenParameter = new CodegenParameter() {