Skip to content

Commit 154fda7

Browse files
author
jorge
committed
fix conflicts
2 parents 663675d + ec93cdb commit 154fda7

19 files changed

Lines changed: 147 additions & 45 deletions

File tree

‎.github/workflows/boat.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ jobs:
9393
uses: samuelmeuli/action-maven-publish@v1
9494
with:
9595
maven_args: "-DskipTests=true"
96-
gpg_private_key: ${{ secrets.gpg_private_key }}
97-
gpg_passphrase: ${{ secrets.gpg_passphrase }}
98-
nexus_username: ${{ secrets.nexus_username }}
99-
nexus_password: ${{ secrets.nexus_password }}
96+
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
97+
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
98+
nexus_username: ${{ secrets.NEXUS_USERNAME }}
99+
nexus_password: ${{ secrets.NEXUS_PASSWORD }}
100100
env:
101101
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
102102

@@ -155,4 +155,4 @@ jobs:
155155
uses: ad-m/github-push-action@master
156156
with:
157157
github_token: ${{ secrets.GITHUB_TOKEN }}
158-
branch: main
158+
branch: main

‎README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ The project is very much Work In Progress and will be published on maven central
1818

1919
# Release Notes
2020
BOAT is still under development and subject to change.
21+
## 0.15.6
22+
* *Maven Plugin*
23+
* Add example of use the additional properties like createApiComponent
24+
## 0.15.5
25+
* *Boat Lint*
26+
* Bumped version of Zally Linting Libraries that contain several vulnerability fixes
27+
## 0.15.4
28+
* *Boat Angular generator*
29+
* Enable partial Ivy compilation for libraries.
2130
## 0.15.3
2231
* *Boat Scaffold*
2332
* A fix for mapping of Map for query params (in client code).

‎boat-engine/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8+
<<<<<<< HEAD
89
<version>0.15.4-SNAPSHOT</version>
10+
=======
11+
<version>0.15.6-SNAPSHOT</version>
12+
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
913
</parent>
1014
<artifactId>boat-engine</artifactId>
1115
<packaging>jar</packaging>

‎boat-maven-plugin/README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,15 @@ Same with `generate` but with opinionated defaults for Rest Template Client
8787
</configOptions>
8888
</configuration>
8989

90+
### Sample usage with additional feature
91+
92+
<configuration>
93+
...
94+
<additionalProperties>
95+
<additionalProperty>createApiComponent=false</additionalProperty>
96+
</additionalProperties>
97+
</configuration>
98+
9099
## boat:generate-webclient-embedded
91100

92101
Same with `generate` but with opinionated defaults for Web Client

‎boat-maven-plugin/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8+
<<<<<<< HEAD
89
<version>0.15.4-SNAPSHOT</version>
10+
=======
11+
<version>0.15.6-SNAPSHOT</version>
12+
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
913
</parent>
1014
<artifactId>boat-maven-plugin</artifactId>
1115

‎boat-maven-plugin/src/test/java/com/backbase/oss/boat/LintMojoTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class LintMojoTests {
2121
@Test
2222
void testFailOnWarningNoWarnings() throws MojoFailureException, MojoExecutionException {
2323
LintMojo lintMojo = new LintMojo();
24-
lintMojo.setIgnoreRules(Arrays.array("219", "105", "104", "151", "134", "115","M0012"));
24+
lintMojo.setIgnoreRules(Arrays.array("219", "105", "104", "151", "134", "115","M0012", "224"));
2525
lintMojo.setInput(getFile("/oas-examples/no-lint-warnings.yaml"));
2626
lintMojo.setFailOnWarning(true);
2727
lintMojo.execute();

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>boat-quay</artifactId>
8+
<<<<<<< HEAD
89
<version>0.15.4-SNAPSHOT</version>
10+
=======
11+
<version>0.15.6-SNAPSHOT</version>
12+
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
913
</parent>
14+
1015
<artifactId>boat-quay-lint</artifactId>
1116
<packaging>jar</packaging>
1217
<description>Backbase Open Api Tools QUAlitY module</description>
@@ -16,7 +21,7 @@
1621
<properties>
1722
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}
1823
</sonar.coverage.jacoco.xmlReportPaths>
19-
<kotlin.version>1.3.61</kotlin.version>
24+
<kotlin.version>1.4.10</kotlin.version>
2025
<kotlin.compiler.incremental>false</kotlin.compiler.incremental>
2126
</properties>
2227

@@ -25,7 +30,7 @@
2530
<dependency>
2631
<groupId>org.jetbrains.kotlin</groupId>
2732
<artifactId>kotlin-stdlib</artifactId>
28-
<version>1.3.61</version>
33+
<version>${kotlin.version}</version>
2934
</dependency>
3035
</dependencies>
3136
</dependencyManagement>
@@ -98,4 +103,4 @@
98103
</plugins>
99104
</build>
100105

101-
</project>
106+
</project>

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

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>boat-quay</artifactId>
8+
<<<<<<< HEAD
89
<version>0.15.4-SNAPSHOT</version>
10+
=======
11+
<version>0.15.6-SNAPSHOT</version>
12+
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
913
</parent>
14+
1015
<artifactId>boat-quay-rules</artifactId>
1116
<packaging>jar</packaging>
1217
<description>Backbase Open Api Tools QUAlitY Lint Rules</description>
@@ -16,10 +21,11 @@
1621
<properties>
1722
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}
1823
</sonar.coverage.jacoco.xmlReportPaths>
19-
<kotlin.version>1.3.61</kotlin.version>
24+
<kotlin.version>1.4.10</kotlin.version>
2025
<kotlin.compiler.incremental>false</kotlin.compiler.incremental>
2126
<auto-service.version>1.0-rc7</auto-service.version>
2227
<dokka.version>1.4.10.2</dokka.version>
28+
<zally.version>2.1.0</zally.version>
2329
</properties>
2430

2531
<dependencyManagement>
@@ -49,39 +55,37 @@
4955
<dependencies>
5056

5157
<dependency>
52-
<groupId>org.zalando</groupId>
53-
<artifactId>zally-core</artifactId>
54-
<version>2.0.0</version>
55-
<exclusions>
56-
<exclusion>
57-
<groupId>io.github.config4k</groupId>
58-
<artifactId>config4k</artifactId>
59-
</exclusion>
60-
</exclusions>
58+
<groupId>org.jetbrains.kotlin</groupId>
59+
<artifactId>kotlin-stdlib</artifactId>
6160
</dependency>
62-
6361
<dependency>
64-
<groupId>io.github.config4k</groupId>
65-
<artifactId>config4k</artifactId>
66-
<version>0.4.2</version>
62+
<groupId>org.jetbrains.kotlin</groupId>
63+
<artifactId>kotlin-reflect</artifactId>
64+
</dependency>
65+
<dependency>
66+
<groupId>de.mpg.mpi-inf</groupId>
67+
<artifactId>javatools</artifactId>
68+
<version>2017-06-28</version>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.zalando</groupId>
72+
<artifactId>zally-core</artifactId>
73+
<version>${zally.version}</version>
6774
</dependency>
68-
6975
<dependency>
7076
<groupId>org.zalando</groupId>
7177
<artifactId>zally-rule-api</artifactId>
72-
<version>2.0.0</version>
78+
<version>${zally.version}</version>
7379
</dependency>
74-
7580
<dependency>
7681
<groupId>org.zalando</groupId>
7782
<artifactId>zally-ruleset-zalando</artifactId>
78-
<version>2.0.0</version>
83+
<version>${zally.version}</version>
7984
</dependency>
80-
8185
<dependency>
8286
<groupId>org.zalando</groupId>
8387
<artifactId>zally-ruleset-zally</artifactId>
84-
<version>2.0.0</version>
88+
<version>${zally.version}</version>
8589
</dependency>
8690

8791
<dependency>
@@ -172,4 +176,4 @@
172176
</plugins>
173177
</build>
174178

175-
</project>
179+
</project>

‎boat-quay/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8+
<<<<<<< HEAD
89
<version>0.15.4-SNAPSHOT</version>
10+
=======
11+
<version>0.15.6-SNAPSHOT</version>
12+
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
913
</parent>
1014

1115

@@ -19,15 +23,14 @@
1923
<properties>
2024
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}
2125
</sonar.coverage.jacoco.xmlReportPaths>
22-
<kotlin.version>1.3.61</kotlin.version>
26+
<kotlin.version>1.4.10</kotlin.version>
2327
<kotlin.compiler.incremental>false</kotlin.compiler.incremental>
2428
<auto-service.version>1.0-rc7</auto-service.version>
2529
</properties>
2630

2731
<modules>
2832
<module>boat-quay-rules</module>
2933
<module>boat-quay-lint</module>
30-
3134
</modules>
3235

33-
</project>
36+
</project>

‎boat-scaffold/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8+
<<<<<<< HEAD
89
<version>0.15.4-SNAPSHOT</version>
10+
=======
11+
<version>0.15.6-SNAPSHOT</version>
12+
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
913
</parent>
14+
1015
<artifactId>boat-scaffold</artifactId>
1116

1217
<packaging>jar</packaging>
@@ -86,7 +91,11 @@
8691
<dependency>
8792
<groupId>com.backbase.oss</groupId>
8893
<artifactId>boat-trail-resources</artifactId>
94+
<<<<<<< HEAD
8995
<version>0.15.4-SNAPSHOT</version>
96+
=======
97+
<version>0.15.6-SNAPSHOT</version>
98+
>>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f
9099
<scope>test</scope>
91100
</dependency>
92101
</dependencies>

0 commit comments

Comments
 (0)