Hotfix release for instance list being filted

Author: krystian.panek

README.md

@@ -63,7 +63,7 @@ buildscript {
     }
     
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:2.0.9'
+        classpath 'com.cognifide.gradle:aem-plugin:2.0.11'
     }
 }
 
@@ -221,12 +221,15 @@ Related configuration:
 
 ```
 aem {
-    fileProperties = [
-        "organization": "My Company"
-    ]
-    filesExpanded = [
-        "**/META-INF/vault/*.xml"
-    ]
+    config {
+    
+        fileProperties = [
+            "organization": "My Company"
+        ]
+        filesExpanded = [
+            "**/META-INF/vault/*.xml"
+        ]
+    }
 }
 ```
 

build.gradle

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

src/main/kotlin/com/cognifide/gradle/aem/instance/Instance.kt

@@ -66,9 +66,13 @@ interface Instance : Serializable {
             val config = AemConfig.of(project)
             val instanceValues = project.properties[LIST_PROP] as String?
 
-            val instances = if (!instanceValues.isNullOrBlank()) {
-                parse(instanceValues!!)
-            } else if (!config.instances.values.isEmpty()) {
+            // Specified directly should not be filtered
+            if (!instanceValues.isNullOrBlank()) {
+                return parse(instanceValues!!)
+            }
+
+            // Predefined and defaults are filterable
+            val instances = if (!config.instances.values.isEmpty()) {
                 config.instances.values
             } else {
                 defaults()

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

@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    classpath 'com.cognifide.gradle:aem-plugin:2.0.10'
+    classpath 'com.cognifide.gradle:aem-plugin:2.0.11'
     classpath "org.dm.gradle:gradle-bundle-plugin:0.10.0"
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.4"
 }

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

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:2.0.10'
+        classpath 'com.cognifide.gradle:aem-plugin:2.0.11'
         classpath 'org.dm.gradle:gradle-bundle-plugin:0.10.0'
     }
 }

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

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:2.0.10'
+        classpath 'com.cognifide.gradle:aem-plugin:2.0.11'
     }
 }