From b2c6600c77509c83f9bc59c440f4c028b99005fc Mon Sep 17 00:00:00 2001 From: Martin Chalupa Date: Tue, 2 Nov 2021 14:26:10 -0700 Subject: [PATCH] change isSubmodule to submodule flag name to better play with jackson expectations at reading side --- .../dependencylock/diff/PathAwareDiffReportGenerator.kt | 2 +- .../plugin/dependencylock/PathAwareDependencyDiffSpec.groovy | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/nebula/plugin/dependencylock/diff/PathAwareDiffReportGenerator.kt b/src/main/kotlin/nebula/plugin/dependencylock/diff/PathAwareDiffReportGenerator.kt index 18f191e..cc5d2d1 100644 --- a/src/main/kotlin/nebula/plugin/dependencylock/diff/PathAwareDiffReportGenerator.kt +++ b/src/main/kotlin/nebula/plugin/dependencylock/diff/PathAwareDiffReportGenerator.kt @@ -121,7 +121,7 @@ class PathAwareDiffReportGenerator : DiffReportGenerator { "repeated" to true }, if (dependencyPathElement.isSubmodule()) - "isSubmodule" to true + "submodule" to true else "version" to dependencyPathElement.selected.moduleVersion() ) diff --git a/src/test/groovy/nebula/plugin/dependencylock/PathAwareDependencyDiffSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/PathAwareDependencyDiffSpec.groovy index f2e750f..1114db5 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/PathAwareDependencyDiffSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/PathAwareDependencyDiffSpec.groovy @@ -794,7 +794,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { def allConfigurations = lockdiff[0] def directDependencies = allConfigurations["differentPaths"] def common = directDependencies.find { it.dependency == "test:common"} - common.isSubmodule == true + common.submodule == true def foo = common.children.find { it.dependency == "test.example:foo" } foo.version == "2.0.1" foo.change.description == "requested" @@ -845,7 +845,7 @@ class PathAwareDependencyDiffSpec extends IntegrationTestKitSpec { def allConfigurations = lockdiff[0] def directDependencies = allConfigurations["differentPaths"] def common = directDependencies.find { it.dependency == "test:common"} - common.isSubmodule == true + common.submodule == true common.change.description == "new local submodule" common.change.type == "NEW" }