Fixed configuration of releasing and publishing plugins.

wttech · Jul 15, 2019 · 0ba09e6 · 0ba09e6
1 parent 62098a5
commit 0ba09e6
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,4 @@
+import com.cognifide.gradle.aem.pkg.tasks.Compose
 import pl.allegro.tech.build.axion.release.domain.TagNameSerializationConfig
 import pl.allegro.tech.build.axion.release.domain.scm.ScmPosition
 
@@ -13,6 +14,20 @@ plugins {
 defaultTasks = listOf(":aemSatisfy", ":aemDeploy")
 description = "AEM Permission Management :: Root"
 
+scmVersion {
+    useHighestVersion = true
+    ignoreUncommittedChanges = false
+    tag(closureOf<TagNameSerializationConfig> {
+        prefix = "apm"
+    })
+}
+
+project.version = scmVersion.version
+
+allprojects {
+    group = "com.cognifide.aem"
+}
+
 aem {
     tasks {
         satisfy {
@@ -29,24 +44,23 @@ aem {
             fromProject("bundle")
             fromProject("content")
             vaultDefinition {
-                version = rootProject.version as String
+                version = scmVersion.version as String
             }
         }
     }
 }
 
-scmVersion {
-    useHighestVersion = true
-    ignoreUncommittedChanges = false
-    tag(closureOf<TagNameSerializationConfig> {
-        prefix = "apm"
-    })
-}
-
-project.version = scmVersion.version
-
-allprojects {
-    group = "com.cognifide.aem"
+publishing {
+    publications {
+        create<MavenPublication>("apm") {
+            val apmContent by tasks.named(Compose.NAME, Compose::class)
+            artifact(apmContent)
+            afterEvaluate {
+                artifactId = "apm"
+                version = project.version
+            }
+        }
+    }
 }
 
 tasks.rat {

diff --git a/content/build.gradle.kts b/content/build.gradle.kts
@@ -8,6 +8,17 @@ plugins {
 
 description = "AEM Permission Management :: Package"
 
+aem {
+    tasks {
+        compose {
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+            vaultDefinition {
+                version = rootProject.version as String
+            }
+        }
+    }
+}
+
 publishing {
     publications {
         create<MavenPublication>("apm") {