From c996d99d32d550a63e09b7efc473547b10f8e562 Mon Sep 17 00:00:00 2001 From: Matthias Raab Date: Tue, 3 Sep 2019 15:07:42 +0200 Subject: [PATCH] fix issue with property name --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../intershop/gradle/icm/tasks/WriteCartridgeDescriptor.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8d58bda..dbe85ee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/com/intershop/gradle/icm/tasks/WriteCartridgeDescriptor.kt b/src/main/kotlin/com/intershop/gradle/icm/tasks/WriteCartridgeDescriptor.kt index f8a53e0..756a4e6 100644 --- a/src/main/kotlin/com/intershop/gradle/icm/tasks/WriteCartridgeDescriptor.kt +++ b/src/main/kotlin/com/intershop/gradle/icm/tasks/WriteCartridgeDescriptor.kt @@ -139,9 +139,9 @@ open class WriteCartridgeDescriptor : WriteProperties() { } if(cartridgestTransitivDependsOn is List<*>) { - property("cartridge.transitive.dependsOn", cartridgestTransitivDependsOn.joinToString(separator = ";")) + property("cartridge.dependsOn.transitive", cartridgestTransitivDependsOn.joinToString(separator = ";")) } else { - property("cartridge.transitive.dependsOn", + property("cartridge.dependsOn.transitive", if( cartridgestTransitivDependsOn != null) cartridgestTransitivDependsOn else