From b6235105d3511f2e8a3dfb8c8b1ecc48ef783c52 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 30 May 2022 12:22:17 +0000 Subject: [PATCH 1/3] [version bump] new dev version --- boat-engine/pom.xml | 2 +- boat-maven-plugin/pom.xml | 2 +- boat-quay/boat-quay-lint/pom.xml | 2 +- boat-quay/boat-quay-rules/pom.xml | 2 +- boat-quay/pom.xml | 2 +- boat-scaffold/pom.xml | 4 ++-- boat-terminal/pom.xml | 2 +- boat-trail-resources/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/boat-engine/pom.xml b/boat-engine/pom.xml index e65319ce8..45f7fb7e0 100644 --- a/boat-engine/pom.xml +++ b/boat-engine/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.7-SNAPSHOT + 0.15.8-SNAPSHOT boat-engine jar diff --git a/boat-maven-plugin/pom.xml b/boat-maven-plugin/pom.xml index d9183db1d..551150ede 100644 --- a/boat-maven-plugin/pom.xml +++ b/boat-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.7-SNAPSHOT + 0.15.8-SNAPSHOT boat-maven-plugin diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml index 156b6095e..1869c84c1 100644 --- a/boat-quay/boat-quay-lint/pom.xml +++ b/boat-quay/boat-quay-lint/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss boat-quay - 0.15.7-SNAPSHOT + 0.15.8-SNAPSHOT boat-quay-lint diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml index b3b7013ab..08c8c69ae 100644 --- a/boat-quay/boat-quay-rules/pom.xml +++ b/boat-quay/boat-quay-rules/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss boat-quay - 0.15.7-SNAPSHOT + 0.15.8-SNAPSHOT boat-quay-rules diff --git a/boat-quay/pom.xml b/boat-quay/pom.xml index a9289cd77..ebfc66270 100644 --- a/boat-quay/pom.xml +++ b/boat-quay/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.7-SNAPSHOT + 0.15.8-SNAPSHOT diff --git a/boat-scaffold/pom.xml b/boat-scaffold/pom.xml index cc20e7e56..4701b449f 100644 --- a/boat-scaffold/pom.xml +++ b/boat-scaffold/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.7-SNAPSHOT + 0.15.8-SNAPSHOT boat-scaffold @@ -87,7 +87,7 @@ com.backbase.oss boat-trail-resources - 0.15.7-SNAPSHOT + 0.15.8-SNAPSHOT test diff --git a/boat-terminal/pom.xml b/boat-terminal/pom.xml index 464e9e6f4..a4b9f056a 100644 --- a/boat-terminal/pom.xml +++ b/boat-terminal/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.7-SNAPSHOT + 0.15.8-SNAPSHOT boat-terminal diff --git a/boat-trail-resources/pom.xml b/boat-trail-resources/pom.xml index 0184105bc..03e38fcde 100644 --- a/boat-trail-resources/pom.xml +++ b/boat-trail-resources/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.7-SNAPSHOT + 0.15.8-SNAPSHOT boat-trail-resources diff --git a/pom.xml b/pom.xml index 18badbfde..7f68a2399 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.7-SNAPSHOT + 0.15.8-SNAPSHOT pom Backbase Open Api Tools will help you converting RAML to OpenAPI plus many more diff --git a/tests/pom.xml b/tests/pom.xml index d46d64bfa..77796e2fb 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.7-SNAPSHOT + 0.15.8-SNAPSHOT tests From a490442a99329f2a592078c1661acc4f12beaebf Mon Sep 17 00:00:00 2001 From: brianvabb <99819581+brianvabb@users.noreply.github.com> Date: Tue, 5 Jul 2022 09:36:57 +0200 Subject: [PATCH 2/3] boat-angular update ngVersion to use >= range in dependencies (#273) * boat-angular update ngVersion to use >= range in dependencies Co-authored-by: brianva Co-authored-by: Bart Veenstra Co-authored-by: Marco Santarelli --- boat-maven-plugin/pom.xml | 2 +- .../it/example/boat-generate/angular/pom.xml | 3 +-- boat-quay/boat-quay-rules/pom.xml | 2 +- boat-scaffold/pom.xml | 12 ++++++++++ .../codegen/angular/BoatAngularGenerator.java | 4 ++-- .../marina/BoatHandlebarsEngineAdapter.java | 3 +-- .../templates/boat-angular/package.mustache | 24 +++++++++---------- package-lock.json | 3 +++ pom.xml | 10 ++++---- 9 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 package-lock.json diff --git a/boat-maven-plugin/pom.xml b/boat-maven-plugin/pom.xml index 551150ede..a44fc5059 100644 --- a/boat-maven-plugin/pom.xml +++ b/boat-maven-plugin/pom.xml @@ -217,7 +217,7 @@ com.squareup.okhttp3 mockwebserver - 4.9.1 + 4.10.0 test diff --git a/boat-maven-plugin/src/it/example/boat-generate/angular/pom.xml b/boat-maven-plugin/src/it/example/boat-generate/angular/pom.xml index a5efa30fa..960b2f16f 100644 --- a/boat-maven-plugin/src/it/example/boat-generate/angular/pom.xml +++ b/boat-maven-plugin/src/it/example/boat-generate/angular/pom.xml @@ -64,7 +64,7 @@ install-node-and-npm - v12.19.0 + v16.15.1 @@ -93,4 +93,3 @@ - diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml index 08c8c69ae..6747aa321 100644 --- a/boat-quay/boat-quay-rules/pom.xml +++ b/boat-quay/boat-quay-rules/pom.xml @@ -17,7 +17,7 @@ ${basedir}/../${aggregate.report.dir} - 1.4.10 + 1.7.0 false 1.0-rc7 1.4.10.2 diff --git a/boat-scaffold/pom.xml b/boat-scaffold/pom.xml index 4701b449f..261b2d68b 100644 --- a/boat-scaffold/pom.xml +++ b/boat-scaffold/pom.xml @@ -38,6 +38,18 @@ + + com.github.jknack + handlebars + 4.3.0 + + + + com.github.jknack + handlebars-jackson2 + 4.3.0 + + com.backbase.oss boat-engine 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 9304ad587..1034ac245 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 @@ -225,10 +225,10 @@ private void addDependencies(SemVer angularVersion) { additionalProperties.put("rxjsVersion", "6.6.0"); if (angularVersion.atLeast("11.0.0")) { - additionalProperties.put("tsVersion", "~4.1.0"); + additionalProperties.put("tsVersion", ">=4.2.0"); additionalProperties.put("ngPackagrVersion", "11.0.0"); } else { - additionalProperties.put("tsVersion", ">=3.9.2 <4.0.0"); + additionalProperties.put("tsVersion", ">=3.9.2"); additionalProperties.put("ngPackagrVersion", "10.0.3"); } } diff --git a/boat-scaffold/src/main/java/com/backbase/oss/codegen/marina/BoatHandlebarsEngineAdapter.java b/boat-scaffold/src/main/java/com/backbase/oss/codegen/marina/BoatHandlebarsEngineAdapter.java index ea2bdee19..b08fa96b9 100644 --- a/boat-scaffold/src/main/java/com/backbase/oss/codegen/marina/BoatHandlebarsEngineAdapter.java +++ b/boat-scaffold/src/main/java/com/backbase/oss/codegen/marina/BoatHandlebarsEngineAdapter.java @@ -39,8 +39,7 @@ public TemplateSource sourceAt(String location) { .newBuilder(bundle) .resolver( MapValueResolver.INSTANCE, - JavaBeanValueResolver.INSTANCE, - FieldValueResolver.INSTANCE) + JavaBeanValueResolver.INSTANCE) .build(); Handlebars handlebars = new Handlebars(loader); diff --git a/boat-scaffold/src/main/templates/boat-angular/package.mustache b/boat-scaffold/src/main/templates/boat-angular/package.mustache index b1d2e6429..8b293c39d 100644 --- a/boat-scaffold/src/main/templates/boat-angular/package.mustache +++ b/boat-scaffold/src/main/templates/boat-angular/package.mustache @@ -15,26 +15,26 @@ "build": "ng-packagr -p ng-package.json" }, "peerDependencies": { - "@angular/core": "^{{ngVersion}}", + "@angular/core": ">={{ngVersion}}", {{#withMocks}} - "@backbase/foundation-ang": "^{{foundationVersion}}", + "@backbase/foundation-ang": ">={{foundationVersion}}", {{/withMocks}} - "rxjs": "^{{rxjsVersion}}" + "rxjs": ">={{rxjsVersion}}" }, "devDependencies": { - "@angular/common": "~{{ngVersion}}", - "@angular/compiler": "~{{ngVersion}}", - "@angular/compiler-cli": "~{{ngVersion}}", - "@angular/core": "~{{ngVersion}}", - "@angular/platform-browser": "~{{ngVersion}}", - "ng-packagr": "^{{ngPackagrVersion}}", + "@angular/common": ">={{ngVersion}}", + "@angular/compiler": ">={{ngVersion}}", + "@angular/compiler-cli": ">={{ngVersion}}", + "@angular/core": ">={{ngVersion}}", + "@angular/platform-browser": ">={{ngVersion}}", + "ng-packagr": ">={{ngPackagrVersion}}", "reflect-metadata": "^0.1.3", {{#withMocks}} - "@backbase/foundation-ang": "~{{foundationVersion}}", + "@backbase/foundation-ang": ">={{foundationVersion}}", {{/withMocks}} - "rxjs": "~{{rxjsVersion}}", + "rxjs": ">={{rxjsVersion}}", "typescript": "{{{tsVersion}}}", - "zone.js": "^{{zonejsVersion}}" + "zone.js": ">={{zonejsVersion}}" }{{#npmRepository}}, "publishConfig": { "registry": "{{{npmRepository}}}" diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..48e341a09 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +} diff --git a/pom.xml b/pom.xml index 7f68a2399..c6cbbd028 100644 --- a/pom.xml +++ b/pom.xml @@ -56,15 +56,15 @@ tests/target/site/jacoco-aggregate/jacoco.xml ${aggregate.report.dir} - 1.18.16 - 2.11.3 - 3.8.0 + 1.18.24 + 2.13.3 + 4.6.1 1.7.30 2.1.5 2.0.23 1.26 - 0.8.7 + 0.8.8 @@ -98,7 +98,7 @@ ch.qos.logback logback-classic - 1.2.3 + 1.2.9 From b1eb57cfe7cd1c18537740f05328d69c027b5fc2 Mon Sep 17 00:00:00 2001 From: Marco Santarelli Date: Tue, 5 Jul 2022 09:40:42 +0200 Subject: [PATCH 3/3] README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7cfea68e8..60ab748b0 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,9 @@ The project is very much Work In Progress and will be published on maven central # Release Notes BOAT is still under development and subject to change. +## 0.15.8 +* Boat Angular generator + * Use `>=` for main peer dependency to improve forward compatibility ## 0.15.6 * *Maven Plugin* * Add example of use the additional properties like createApiComponent