Skip to content

Commit a490442

Browse files
brianvabbbrianvabartv-bbsantam85
authored
boat-angular update ngVersion to use >= range in dependencies (#273)
* boat-angular update ngVersion to use >= range in dependencies Co-authored-by: brianva <bvarley@backbase.com> Co-authored-by: Bart Veenstra <bartv@backbase.com> Co-authored-by: Marco Santarelli <marco@backbase.com>
1 parent b623510 commit a490442

9 files changed

Lines changed: 38 additions & 25 deletions

File tree

‎boat-maven-plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
<dependency>
218218
<groupId>com.squareup.okhttp3</groupId>
219219
<artifactId>mockwebserver</artifactId>
220-
<version>4.9.1</version>
220+
<version>4.10.0</version>
221221
<scope>test</scope>
222222
</dependency>
223223

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<goal>install-node-and-npm</goal>
6565
</goals>
6666
<configuration>
67-
<nodeVersion>v12.19.0</nodeVersion>
67+
<nodeVersion>v16.15.1</nodeVersion>
6868
</configuration>
6969
</execution>
7070
<execution>
@@ -93,4 +93,3 @@
9393

9494

9595
</project>
96-

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<properties>
1818
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}
1919
</sonar.coverage.jacoco.xmlReportPaths>
20-
<kotlin.version>1.4.10</kotlin.version>
20+
<kotlin.version>1.7.0</kotlin.version>
2121
<kotlin.compiler.incremental>false</kotlin.compiler.incremental>
2222
<auto-service.version>1.0-rc7</auto-service.version>
2323
<dokka.version>1.4.10.2</dokka.version>

‎boat-scaffold/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,18 @@
3838
</exclusions>
3939
</dependency>
4040

41+
<dependency>
42+
<groupId>com.github.jknack</groupId>
43+
<artifactId>handlebars</artifactId>
44+
<version>4.3.0</version>
45+
</dependency>
46+
47+
<dependency>
48+
<groupId>com.github.jknack</groupId>
49+
<artifactId>handlebars-jackson2</artifactId>
50+
<version>4.3.0</version>
51+
</dependency>
52+
4153
<dependency>
4254
<groupId>com.backbase.oss</groupId>
4355
<artifactId>boat-engine</artifactId>

‎boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,10 @@ private void addDependencies(SemVer angularVersion) {
225225
additionalProperties.put("rxjsVersion", "6.6.0");
226226

227227
if (angularVersion.atLeast("11.0.0")) {
228-
additionalProperties.put("tsVersion", "~4.1.0");
228+
additionalProperties.put("tsVersion", ">=4.2.0");
229229
additionalProperties.put("ngPackagrVersion", "11.0.0");
230230
} else {
231-
additionalProperties.put("tsVersion", ">=3.9.2 <4.0.0");
231+
additionalProperties.put("tsVersion", ">=3.9.2");
232232
additionalProperties.put("ngPackagrVersion", "10.0.3");
233233
}
234234
}

‎boat-scaffold/src/main/java/com/backbase/oss/codegen/marina/BoatHandlebarsEngineAdapter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public TemplateSource sourceAt(String location) {
3939
.newBuilder(bundle)
4040
.resolver(
4141
MapValueResolver.INSTANCE,
42-
JavaBeanValueResolver.INSTANCE,
43-
FieldValueResolver.INSTANCE)
42+
JavaBeanValueResolver.INSTANCE)
4443
.build();
4544

4645
Handlebars handlebars = new Handlebars(loader);

‎boat-scaffold/src/main/templates/boat-angular/package.mustache‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@
1515
"build": "ng-packagr -p ng-package.json"
1616
},
1717
"peerDependencies": {
18-
"@angular/core": "^{{ngVersion}}",
18+
"@angular/core": ">={{ngVersion}}",
1919
{{#withMocks}}
20-
"@backbase/foundation-ang": "^{{foundationVersion}}",
20+
"@backbase/foundation-ang": ">={{foundationVersion}}",
2121
{{/withMocks}}
22-
"rxjs": "^{{rxjsVersion}}"
22+
"rxjs": ">={{rxjsVersion}}"
2323
},
2424
"devDependencies": {
25-
"@angular/common": "~{{ngVersion}}",
26-
"@angular/compiler": "~{{ngVersion}}",
27-
"@angular/compiler-cli": "~{{ngVersion}}",
28-
"@angular/core": "~{{ngVersion}}",
29-
"@angular/platform-browser": "~{{ngVersion}}",
30-
"ng-packagr": "^{{ngPackagrVersion}}",
25+
"@angular/common": ">={{ngVersion}}",
26+
"@angular/compiler": ">={{ngVersion}}",
27+
"@angular/compiler-cli": ">={{ngVersion}}",
28+
"@angular/core": ">={{ngVersion}}",
29+
"@angular/platform-browser": ">={{ngVersion}}",
30+
"ng-packagr": ">={{ngPackagrVersion}}",
3131
"reflect-metadata": "^0.1.3",
3232
{{#withMocks}}
33-
"@backbase/foundation-ang": "~{{foundationVersion}}",
33+
"@backbase/foundation-ang": ">={{foundationVersion}}",
3434
{{/withMocks}}
35-
"rxjs": "~{{rxjsVersion}}",
35+
"rxjs": ">={{rxjsVersion}}",
3636
"typescript": "{{{tsVersion}}}",
37-
"zone.js": "^{{zonejsVersion}}"
37+
"zone.js": ">={{zonejsVersion}}"
3838
}{{#npmRepository}},
3939
"publishConfig": {
4040
"registry": "{{{npmRepository}}}"

‎package-lock.json‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@
5656
<aggregate.report.dir>tests/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
5757
<sonar.coverage.jacoco.xmlReportPaths>${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
5858

59-
<lombok.version>1.18.16</lombok.version>
60-
<jackson.version>2.11.3</jackson.version>
61-
<mockito.version>3.8.0</mockito.version>
59+
<lombok.version>1.18.24</lombok.version>
60+
<jackson.version>2.13.3</jackson.version>
61+
<mockito.version>4.6.1</mockito.version>
6262

6363
<slf4j.version>1.7.30</slf4j.version>
6464
<swagger-core.version>2.1.5</swagger-core.version>
6565
<swagger-parser.version>2.0.23</swagger-parser.version>
6666
<snakeyaml.version>1.26</snakeyaml.version>
67-
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
67+
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
6868
</properties>
6969

7070
<modules>
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>ch.qos.logback</groupId>
100100
<artifactId>logback-classic</artifactId>
101-
<version>1.2.3</version>
101+
<version>1.2.9</version>
102102
</dependency>
103103

104104

0 commit comments

Comments
 (0)