From 7b86ac71e25d193aae668a9edce8c513162dede2 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 1 Aug 2023 05:38:52 -0700 Subject: [PATCH] LPS-192082 prep next --- .../sdk/gradle-plugins-workspace/artifact.properties | 8 ++++---- .../src/gradleTest/targetPlatformModulesExt/build.gradle | 2 +- modules/sdk/gradle-plugins-workspace/README.markdown | 2 +- modules/sdk/gradle-plugins-workspace/bnd.bnd | 2 +- .../main/resources/archetype-resources/settings.gradle | 2 +- workspaces/liferay-sample-workspace/settings.gradle | 2 +- workspaces/refresh_liferay_sample_workspace.sh | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/.releng/sdk/gradle-plugins-workspace/artifact.properties b/modules/.releng/sdk/gradle-plugins-workspace/artifact.properties index d4c1af9e5bb835..80efc32584f47d 100644 --- a/modules/.releng/sdk/gradle-plugins-workspace/artifact.properties +++ b/modules/.releng/sdk/gradle-plugins-workspace/artifact.properties @@ -1,4 +1,4 @@ -artifact.git.id=346805f7509c61c9b51c6050abec3980b3e2ba2f -artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/6.1.15/com.liferay.gradle.plugins.workspace-6.1.15-javadoc.jar -artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/6.1.15/com.liferay.gradle.plugins.workspace-6.1.15-sources.jar -artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/6.1.15/com.liferay.gradle.plugins.workspace-6.1.15.jar \ No newline at end of file +artifact.git.id=e271be917913387b2ba7fdb2adb3522683f94ebf +artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/7.0.0/com.liferay.gradle.plugins.workspace-7.0.0-javadoc.jar +artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/7.0.0/com.liferay.gradle.plugins.workspace-7.0.0-sources.jar +artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/7.0.0/com.liferay.gradle.plugins.workspace-7.0.0.jar \ No newline at end of file diff --git a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformModulesExt/build.gradle b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformModulesExt/build.gradle index 2cd2ba08ef22b9..3df5c54a3a8f1c 100644 --- a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformModulesExt/build.gradle +++ b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformModulesExt/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath(group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "6.1.15") { + classpath(group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "7.0.0") { exclude group: "com.liferay", module: "com.liferay.gradle.util" } } diff --git a/modules/sdk/gradle-plugins-workspace/README.markdown b/modules/sdk/gradle-plugins-workspace/README.markdown index ce57705d9201e6..14723a9d9e68a8 100644 --- a/modules/sdk/gradle-plugins-workspace/README.markdown +++ b/modules/sdk/gradle-plugins-workspace/README.markdown @@ -13,7 +13,7 @@ To use the plugin, include it in your `settings.gradle`: ```gradle buildscript { dependencies { - classpath group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "6.1.15" + classpath group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "7.0.0" } repositories { diff --git a/modules/sdk/gradle-plugins-workspace/bnd.bnd b/modules/sdk/gradle-plugins-workspace/bnd.bnd index a0127bee3a4581..673b07374a7b58 100644 --- a/modules/sdk/gradle-plugins-workspace/bnd.bnd +++ b/modules/sdk/gradle-plugins-workspace/bnd.bnd @@ -1,6 +1,6 @@ Bundle-Name: Liferay Gradle Plugins Workspace Bundle-SymbolicName: com.liferay.gradle.plugins.workspace -Bundle-Version: 7.0.0 +Bundle-Version: 7.0.1 Export-Package:\ com.liferay.gradle.plugins.gulp,\ com.liferay.gradle.plugins.js.module.config.generator,\ diff --git a/modules/sdk/project-templates/project-templates-workspace/src/main/resources/archetype-resources/settings.gradle b/modules/sdk/project-templates/project-templates-workspace/src/main/resources/archetype-resources/settings.gradle index 4f008a4db0485b..8ab4912bd459e8 100644 --- a/modules/sdk/project-templates/project-templates-workspace/src/main/resources/archetype-resources/settings.gradle +++ b/modules/sdk/project-templates/project-templates-workspace/src/main/resources/archetype-resources/settings.gradle @@ -3,7 +3,7 @@ buildscript { classpath group: "org.yaml", name: "snakeyaml", version: "1.32" classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd", version: "@biz.aQute.bnd.version@" - classpath(group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "6.1.15") { + classpath(group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "7.0.0") { exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd" } } diff --git a/workspaces/liferay-sample-workspace/settings.gradle b/workspaces/liferay-sample-workspace/settings.gradle index 5398d7ed17356f..4623ca2d76806c 100644 --- a/workspaces/liferay-sample-workspace/settings.gradle +++ b/workspaces/liferay-sample-workspace/settings.gradle @@ -1,7 +1,7 @@ buildscript { dependencies { classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.2.0" - classpath(group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "6.1.15") { + classpath(group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "7.0.0") { exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd" } } diff --git a/workspaces/refresh_liferay_sample_workspace.sh b/workspaces/refresh_liferay_sample_workspace.sh index 370f2a6b4d6478..d4540e840cbc69 100755 --- a/workspaces/refresh_liferay_sample_workspace.sh +++ b/workspaces/refresh_liferay_sample_workspace.sh @@ -65,7 +65,7 @@ function refresh_liferay_sample_workspace { mv gradle.properties.tmp gradle.properties sed -i 's/name: "biz.aQute.bnd", version: ".*"/name: "biz.aQute.bnd.gradle", version: "5.2.0"/' settings.gradle - sed -i 's/name: "com.liferay.gradle.plugins.workspace", version: ".*"/name: "com.liferay.gradle.plugins.workspace", version: "6.1.15"/' settings.gradle + sed -i 's/name: "com.liferay.gradle.plugins.workspace", version: ".*"/name: "com.liferay.gradle.plugins.workspace", version: "7.0.0"/' settings.gradle echo -en "\ninclude \"poshi\"" >> settings.gradle