Merge pull request #124 from Cognifide/satisfy-install-retry-default

Satisfy install retry default

Author: pun-ky

README.md

@@ -110,7 +110,7 @@ buildscript {
     }
     
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:3.0.2'
+        classpath 'com.cognifide.gradle:aem-plugin:3.0.3'
     }
 }
 

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'com.cognifide.gradle'
-version '3.0.2'
+version '3.0.3'
 description = 'Gradle AEM Plugin'
 defaultTasks = ['clean', 'build', 'publishToMavenLocal']
 

src/main/kotlin/com/cognifide/gradle/aem/api/AemConfig.kt

@@ -64,13 +64,11 @@ class AemConfig(
     var deployInstanceList: String = propParser.string("aem.deploy.instance.list", "")
 
     /**
-     * Determines instance which will be used when:
-     *
-     * - CRX package activation from author to publishers will be performed (only if distributed deploy is enabled).
-     * - Task 'aemCheckout' or 'aemSync' will be executed.
+     * Determines instance which will be used when CRX package activation from author to publishers
+     * will be performed (only if distributed deploy is enabled).
      */
     @Input
-    var deployInstanceAuthorName: String = "$deployEnvironment-${InstanceType.AUTHOR.type}"
+    var deployInstanceAuthorName: String = propParser.string("aem.deploy.instance.author.name", "$deployEnvironment-${InstanceType.AUTHOR.type}")
 
     /**
      * Defines maximum time after which initializing connection to AEM will be aborted (e.g on upload, install).
@@ -125,7 +123,7 @@ class AemConfig(
      * Repeat install when failed (brute-forcing).
      */
     @Input
-    var installRetryTimes: Int = propParser.int("aem.install.retry.times", 0)
+    var installRetryTimes: Int = propParser.int("aem.install.retry.times", 3)
 
     /**
      * Time to wait after repeating failed install.

src/test/resources/com/cognifide/gradle/aem/test/compose/assembly/gradle/buildscript.gradle

@@ -6,7 +6,7 @@ repositories {
 }
 
 dependencies {
-    classpath 'com.cognifide.gradle:aem-plugin:3.0.2'
+    classpath 'com.cognifide.gradle:aem-plugin:3.0.3'
     classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:3.5.0'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.21"
 }

src/test/resources/com/cognifide/gradle/aem/test/compose/bundle-and-content/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:3.0.2'
+        classpath 'com.cognifide.gradle:aem-plugin:3.0.3'
         classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:3.5.0'
     }
 }

src/test/resources/com/cognifide/gradle/aem/test/debug/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:3.0.2'
+        classpath 'com.cognifide.gradle:aem-plugin:3.0.3'
     }
 }