From a99376be5a498dd97ed103f9831bd94291c69f81 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 11 Jan 2022 17:43:37 +0000 Subject: [PATCH 1/4] [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 9174d038e..e0093604a 100644 --- a/boat-engine/pom.xml +++ b/boat-engine/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.4-SNAPSHOT + 0.15.5-SNAPSHOT boat-engine jar diff --git a/boat-maven-plugin/pom.xml b/boat-maven-plugin/pom.xml index fcb950934..ed87e77c1 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.4-SNAPSHOT + 0.15.5-SNAPSHOT boat-maven-plugin diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml index f57a13dcd..11294a42a 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.4-SNAPSHOT + 0.15.5-SNAPSHOT boat-quay-lint jar diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml index 36a4e6d5c..fdbf40bf6 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.4-SNAPSHOT + 0.15.5-SNAPSHOT boat-quay-rules jar diff --git a/boat-quay/pom.xml b/boat-quay/pom.xml index ce544d3fb..55e654003 100644 --- a/boat-quay/pom.xml +++ b/boat-quay/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.4-SNAPSHOT + 0.15.5-SNAPSHOT diff --git a/boat-scaffold/pom.xml b/boat-scaffold/pom.xml index 18303bdff..046b6a4b8 100644 --- a/boat-scaffold/pom.xml +++ b/boat-scaffold/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.4-SNAPSHOT + 0.15.5-SNAPSHOT boat-scaffold @@ -86,7 +86,7 @@ com.backbase.oss boat-trail-resources - 0.15.4-SNAPSHOT + 0.15.5-SNAPSHOT test diff --git a/boat-terminal/pom.xml b/boat-terminal/pom.xml index a944c3838..6f84f0d79 100644 --- a/boat-terminal/pom.xml +++ b/boat-terminal/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.4-SNAPSHOT + 0.15.5-SNAPSHOT boat-terminal diff --git a/boat-trail-resources/pom.xml b/boat-trail-resources/pom.xml index 1f462a0ee..010acd835 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.4-SNAPSHOT + 0.15.5-SNAPSHOT boat-trail-resources diff --git a/pom.xml b/pom.xml index 7341bf9a9..fb761bd31 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.4-SNAPSHOT + 0.15.5-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 38703eddf..c7069ffe3 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.4-SNAPSHOT + 0.15.5-SNAPSHOT tests From 1cb681b5d934bceba5e0a30d53a554817617ef47 Mon Sep 17 00:00:00 2001 From: jasper linschoten Date: Mon, 4 Apr 2022 15:28:13 +0200 Subject: [PATCH 2/4] Update zally to 2.1.0; update kotlin to 1.4.10; exclude one modified rule in test --- .../com/backbase/oss/boat/LintMojoTests.java | 2 +- boat-quay/boat-quay-lint/pom.xml | 4 +- boat-quay/boat-quay-rules/pom.xml | 39 +++++++++---------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/boat-maven-plugin/src/test/java/com/backbase/oss/boat/LintMojoTests.java b/boat-maven-plugin/src/test/java/com/backbase/oss/boat/LintMojoTests.java index 86d252f93..011f02667 100644 --- a/boat-maven-plugin/src/test/java/com/backbase/oss/boat/LintMojoTests.java +++ b/boat-maven-plugin/src/test/java/com/backbase/oss/boat/LintMojoTests.java @@ -21,7 +21,7 @@ class LintMojoTests { @Test void testFailOnWarningNoWarnings() throws MojoFailureException, MojoExecutionException { LintMojo lintMojo = new LintMojo(); - lintMojo.setIgnoreRules(Arrays.array("219", "105", "104", "151", "134", "115","M0012")); + lintMojo.setIgnoreRules(Arrays.array("219", "105", "104", "151", "134", "115","M0012", "224")); lintMojo.setInput(getFile("/oas-examples/no-lint-warnings.yaml")); lintMojo.setFailOnWarning(true); lintMojo.execute(); diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml index 11294a42a..5c8700a97 100644 --- a/boat-quay/boat-quay-lint/pom.xml +++ b/boat-quay/boat-quay-lint/pom.xml @@ -16,7 +16,7 @@ ${basedir}/../${aggregate.report.dir} - 1.3.61 + 1.4.10 false @@ -25,7 +25,7 @@ org.jetbrains.kotlin kotlin-stdlib - 1.3.61 + ${kotlin.version} diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml index fdbf40bf6..9a5ac25a2 100644 --- a/boat-quay/boat-quay-rules/pom.xml +++ b/boat-quay/boat-quay-rules/pom.xml @@ -16,10 +16,11 @@ ${basedir}/../${aggregate.report.dir} - 1.3.61 + 1.4.10 false 1.0-rc7 1.4.10.2 + 2.1.0 @@ -49,39 +50,37 @@ - org.zalando - zally-core - 2.0.0 - - - io.github.config4k - config4k - - + org.jetbrains.kotlin + kotlin-stdlib - - io.github.config4k - config4k - 0.4.2 + org.jetbrains.kotlin + kotlin-reflect + + + de.mpg.mpi-inf + javatools + 2017-06-28 + + + org.zalando + zally-core + ${zally.version} - org.zalando zally-rule-api - 2.0.0 + ${zally.version} - org.zalando zally-ruleset-zalando - 2.0.0 + ${zally.version} - org.zalando zally-ruleset-zally - 2.0.0 + ${zally.version} From c7dde5cd8858be9e8a17f66f25aae32ae3abf6e0 Mon Sep 17 00:00:00 2001 From: Bart Veenstra Date: Mon, 4 Apr 2022 16:06:21 +0200 Subject: [PATCH 3/4] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 2f6be4442..5ee887576 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.5 +* *Boat Lint* + * Bumped version of Zally Linting Libraries that contain several vulnerability fixes ## 0.15.4 * *Boat Angular generator* * Enable partial Ivy compilation for libraries. From 8feaec1e1b0fc7bd0875699d3604d854e16a6c18 Mon Sep 17 00:00:00 2001 From: baasbot Date: Mon, 4 Apr 2022 19:49:38 +0200 Subject: [PATCH 4/4] Fixed pom.xml --- boat-quay/boat-quay-lint/pom.xml | 3 ++- boat-quay/boat-quay-rules/pom.xml | 5 +++-- boat-quay/pom.xml | 5 ++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml index 5c8700a97..53288c512 100644 --- a/boat-quay/boat-quay-lint/pom.xml +++ b/boat-quay/boat-quay-lint/pom.xml @@ -7,6 +7,7 @@ boat-quay 0.15.5-SNAPSHOT + boat-quay-lint jar Backbase Open Api Tools QUAlitY module @@ -98,4 +99,4 @@ - \ No newline at end of file + diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml index 9206433f0..12896da23 100644 --- a/boat-quay/boat-quay-rules/pom.xml +++ b/boat-quay/boat-quay-rules/pom.xml @@ -4,9 +4,10 @@ com.backbase.oss - backbase-openapi-tools + boat-quay 0.15.5-SNAPSHOT + boat-quay-rules jar Backbase Open Api Tools QUAlitY Lint Rules @@ -171,4 +172,4 @@ - \ No newline at end of file + diff --git a/boat-quay/pom.xml b/boat-quay/pom.xml index 55e654003..0357a5156 100644 --- a/boat-quay/pom.xml +++ b/boat-quay/pom.xml @@ -19,7 +19,7 @@ ${basedir}/../${aggregate.report.dir} - 1.3.61 + 1.4.10 false 1.0-rc7 @@ -27,7 +27,6 @@ boat-quay-rules boat-quay-lint - - \ No newline at end of file +