From 07c62755ea7fdc3f504c7ab9c2cccdb577b86647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20J=C4=99draszczyk?= Date: Fri, 11 Sep 2020 12:39:17 +0200 Subject: [PATCH 1/3] Upgraded GAP to the latest version. --- buildSrc/build.gradle.kts | 2 +- env/build.gradle.kts | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index aed4749b3..2934761ea 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -32,5 +32,5 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72") implementation("org.apache.sling:org.apache.sling.caconfig.bnd-plugin:1.0.2") implementation("com.cognifide.gradle:environment-plugin:0.1.12") - implementation("com.cognifide.gradle:aem-plugin:13.2.1") + implementation("com.cognifide.gradle:aem-plugin:14.2.13") } \ No newline at end of file diff --git a/env/build.gradle.kts b/env/build.gradle.kts index dd93961a9..c9319d14c 100644 --- a/env/build.gradle.kts +++ b/env/build.gradle.kts @@ -4,10 +4,8 @@ plugins { aem { instance { - satisfier { - packages { - "cq.actions"("https://github.com/Cognifide/APM/releases/download/apm-4.3.0/cq-actions-msg-replication-6.4.0.zip") - } + provisioner { + deployPackage("https://github.com/Cognifide/APM/releases/download/apm-4.3.0/cq-actions-msg-replication-6.4.0.zip") } } } From 6090d937388487854e54ca1838f0da2ca428d73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20J=C4=99draszczyk?= Date: Fri, 11 Sep 2020 12:40:26 +0200 Subject: [PATCH 2/3] Antlr and kotlin bundles changed to private packages. --- app/aem/actions.checks/build.gradle.kts | 4 ++++ app/aem/core/build.gradle.kts | 8 ++++++-- app/aem/ui.apps/build.gradle.kts | 7 ++++++- build.gradle.kts | 5 ++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/aem/actions.checks/build.gradle.kts b/app/aem/actions.checks/build.gradle.kts index 22430361e..f8e20b91e 100644 --- a/app/aem/actions.checks/build.gradle.kts +++ b/app/aem/actions.checks/build.gradle.kts @@ -39,6 +39,10 @@ dependencies { } tasks { + getByName("packageDeploy") { + mustRunAfter(":app:aem:ui.apps:packageDeploy") + } + register("sourcesJar") { from(sourceSets.main.get().allSource) archiveClassifier.set("sources") diff --git a/app/aem/core/build.gradle.kts b/app/aem/core/build.gradle.kts index fa7cbf6fe..0974195c3 100644 --- a/app/aem/core/build.gradle.kts +++ b/app/aem/core/build.gradle.kts @@ -4,7 +4,7 @@ import org.gradle.jvm.tasks.Jar plugins { id("com.cognifide.aem.bundle") kotlin("jvm") - id("org.jetbrains.kotlin.plugin.noarg") version "1.3.70" + id("org.jetbrains.kotlin.plugin.noarg") version "1.3.72" antlr groovy java @@ -32,6 +32,10 @@ aem { ).joinToString(",")) attribute("Sling-Nodetypes", "CQ-INF/nodetypes/apm_nodetypes.cnd") attribute("APM-Actions", "com.cognifide.apm.foundation.actions") + excludePackage("org.antlr.stringtemplate") + embedPackage("org.antlr:antlr4:4.7.2", "org.antlr.v4.*", "org.antlr.runtime.v4.*", "org.antlr.runtime.*", "org.stringtemplate.v4.*", "com.ibm.icu.*", "org.abego.treelayout.*") + embedPackage("org.jetbrains.kotlin:kotlin-reflect:1.3.72", "kotlin.reflect.*") + embedPackage("org.jetbrains.kotlin:kotlin-stdlib:1.3.72", "kotlin.*") } } } @@ -48,7 +52,7 @@ dependencies { compileOnly("com.cognifide.cq.actions:com.cognifide.cq.actions.api:6.0.2") compileOnly(kotlin("stdlib-jdk8")) - compileOnly(kotlin("osgi-bundle")) + compileOnly(kotlin("reflect")) } sourceSets { diff --git a/app/aem/ui.apps/build.gradle.kts b/app/aem/ui.apps/build.gradle.kts index 2af205c1d..1c5de6cb1 100644 --- a/app/aem/ui.apps/build.gradle.kts +++ b/app/aem/ui.apps/build.gradle.kts @@ -13,7 +13,6 @@ apply(from = rootProject.file("app/aem/common.gradle.kts")) aem { tasks { packageCompose { - installBundle("org.jetbrains.kotlin:kotlin-osgi-bundle:1.3.72") installBundleProject(":app:aem:api") installBundleProject(":app:aem:core") installBundleProject(":app:aem:actions.main") @@ -25,6 +24,12 @@ aem { } } +tasks { + getByName("packageDeploy") { + mustRunAfter(":env:instanceProvision") + } +} + publishing { publications { register("apmCrx") { diff --git a/build.gradle.kts b/build.gradle.kts index f373a07db..faeab4b46 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { signing } -defaultTasks("instanceSatisfy", ":app:aem:ui.apps:packageDeploy", ":app:aem:actions.checks:packageDeploy") +defaultTasks("deployAll") scmVersion { useHighestVersion = true @@ -26,6 +26,9 @@ allprojects { } tasks { + register("deployAll") { + dependsOn(":env:instanceProvision", ":app:aem:ui.apps:packageDeploy", ":app:aem:actions.checks:packageDeploy") + } withType().configureEach { // Files that don't require a license header excludes.add("**/LICENSE") From 30d84e555b9bf24b28775727bf5a96504fa300dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20J=C4=99draszczyk?= Date: Fri, 11 Sep 2020 12:42:30 +0200 Subject: [PATCH 3/3] Antlr and kotlin bundles changed to private packages. --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08f1744e8..21a4a80c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,4 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Fixed -- #258 - Fixed actions which use @Flag annotation \ No newline at end of file +- #258 - Fixed actions which use @Flag annotation + +### Changed +- #260 - Updated GAP to the latest version. Fixed default task to deploy packages in proper order. Changed antlr and kotlin bundles to private packages \ No newline at end of file