Merge remote-tracking branch 'origin/main' into main

Author: santam85

boat-maven-plugin/pom.xml

@@ -217,7 +217,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>4.9.1</version>
+            <version>4.10.0</version>
             <scope>test</scope>
         </dependency>
 

boat-maven-plugin/src/it/example/boat-generate/angular/pom.xml

@@ -64,7 +64,7 @@
                             <goal>install-node-and-npm</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v12.19.0</nodeVersion>
+                            <nodeVersion>v16.15.1</nodeVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -93,4 +93,3 @@
 
 
 </project>
-

boat-quay/boat-quay-rules/pom.xml

@@ -17,7 +17,7 @@
     <properties>
         <sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}
         </sonar.coverage.jacoco.xmlReportPaths>
-        <kotlin.version>1.4.10</kotlin.version>
+        <kotlin.version>1.7.0</kotlin.version>
         <kotlin.compiler.incremental>false</kotlin.compiler.incremental>
         <auto-service.version>1.0-rc7</auto-service.version>
         <dokka.version>1.4.10.2</dokka.version>

boat-scaffold/pom.xml

@@ -38,6 +38,18 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.jknack</groupId>
+            <artifactId>handlebars</artifactId>
+            <version>4.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.jknack</groupId>
+            <artifactId>handlebars-jackson2</artifactId>
+            <version>4.3.0</version>
+        </dependency>
+
         <dependency>
             <groupId>com.backbase.oss</groupId>
             <artifactId>boat-engine</artifactId>

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");
             }
         }

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);

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}}}"

package-lock.json

@@ -56,15 +56,15 @@
         <aggregate.report.dir>tests/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
         <sonar.coverage.jacoco.xmlReportPaths>${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
 
-        <lombok.version>1.18.16</lombok.version>
-        <jackson.version>2.11.3</jackson.version>
-        <mockito.version>3.8.0</mockito.version>
+        <lombok.version>1.18.24</lombok.version>
+        <jackson.version>2.13.3</jackson.version>
+        <mockito.version>4.6.1</mockito.version>
 
         <slf4j.version>1.7.30</slf4j.version>
         <swagger-core.version>2.1.5</swagger-core.version>
         <swagger-parser.version>2.0.23</swagger-parser.version>
         <snakeyaml.version>1.26</snakeyaml.version>
-        <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
     </properties>
 
     <modules>
@@ -98,7 +98,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.2.3</version>
+                <version>1.2.9</version>
             </dependency>