BLADE-728 fix error

liferay · Sep 22, 2023 · 3774edb · 3774edb
1 parent 6a74bc9
commit 3774edb
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 25 deletions.
diff --git a/liferay-workspace-test-integration-sample/gradle.properties b/liferay-workspace-test-integration-sample/gradle.properties
@@ -1,5 +1,5 @@
 liferay.workspace.modules.dir = modules
 liferay.workspace.themes.dir = themes
 liferay.workspace.wars.dir = modules
-liferay.workspace.product = portal-7.4-ga93
+liferay.workspace.product = portal-7.4-ga94
 target.platform.index.sources = false
diff --git a/liferay-workspace-test-integration-sample/modules/sample/sample-test/build.gradle b/liferay-workspace-test-integration-sample/modules/sample/sample-test/build.gradle
@@ -9,8 +9,8 @@ dependencies {
 	testIntegrationImplementation project(":modules:sample:sample-service")
 
 	testModules group: "com.liferay", name: "com.liferay.arquillian.extension.junit.bridge.connector"
-	testModules group: "com.liferay.portal", name: "com.liferay.portal.test.integration", version: "6.0.34"
-	testModules group: "com.liferay.portal", name: "com.liferay.portal.test", version: "19.0.0"
+	testModules group: "com.liferay.portal", name: "com.liferay.portal.test.integration", version: "latest.release"
+	testModules group: "com.liferay.portal", name: "com.liferay.portal.test", version: "latest.release"
 	testModules group: "com.liferay.portal", name: "com.liferay.portal.test.integration", version: "latest.release"
 	testModules group: "org.apache.aries.jmx", name: "org.apache.aries.jmx.core", version: "latest.release"
 	testModules project(":modules:sample:sample-api")

diff --git a/liferay-workspace-test-integration-sample/settings.gradle b/liferay-workspace-test-integration-sample/settings.gradle
@@ -1,13 +1,7 @@
 buildscript {
 	dependencies {
-		classpath group: "org.yaml", name: "snakeyaml", version: "1.32"
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd", version: "5.3.0"
-		classpath group: "com.github.docker-java", name: "docker-java-transport", version: "3.2.8"
-		classpath(group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "8.0.8") {
-			exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd"
-		}
+		classpath group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "8.0.8"
 	}
-	1
 	repositories {
 		maven {
 			url "https://repository.liferay.com/nexus/content/groups/public"

diff --git a/liferay-workspace/settings.gradle b/liferay-workspace/settings.gradle
@@ -1,12 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "org.yaml", name: "snakeyaml", version: "1.32"
-
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd", version: "5.3.0"
-		classpath group: "com.github.docker-java", name: "docker-java-transport", version: "3.2.8"
-		classpath(group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "8.0.3") {
-			exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd"
-		}
+		classpath group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "8.0.8"
 	}
 
 	repositories {

diff --git a/...ray-workspace/wars/simple-theme/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/...ray-workspace/wars/simple-theme/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -5,7 +5,7 @@ liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+,7.4.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1
-name=untitled2333333333333
+name=blade.theme
 page-url=http://www.liferay.com
 #required-deployment-contexts=\
 #	resources-importer-web

diff --git a/yarn-workspace/settings.gradle b/yarn-workspace/settings.gradle
@@ -1,12 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "org.yaml", name: "snakeyaml", version: "1.32"
-
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd", version: "5.3.0"
-		classpath group: "com.github.docker-java", name: "docker-java-transport", version: "3.2.8"
-		classpath(group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "8.0.3") {
-			exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd"
-		}
+		classpath group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "8.0.8"
 	}
 
 	repositories {