Merge pull request #327 from drewbrokke/LPD-28093-TECHNICAL-TASK-v0-b…

…lade-gradle-8-workspace

LPD-28093 Update Blade to use the newest project templates that generate a Gradle 8 workspace

cli/build.gradle

@@ -79,7 +79,7 @@ dependencies {
 	api group: "biz.aQute.bnd", name: "biz.aQute.bndlib", version: "5.3.0"
 	api group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.16.1"
 	api group: "com.liferay", name: "com.liferay.gogo.shell.client", version: "1.0.0"
-	api group: "com.liferay", name: "com.liferay.project.templates", version: "5.0.289"
+	api group: "com.liferay", name: "com.liferay.project.templates", version: "5.0.293"
 	api group: "commons-io", name: "commons-io", version: "2.7"
 	api group: "commons-lang", name: "commons-lang", version: "2.6"
 	api group: "org.apache.ant", name: "ant", version: "1.10.11"
@@ -324,6 +324,6 @@ unzipPortal {
 	finalizedBy("processZipsResources")
 }
 
-version = "6.0.1-SNAPSHOT"
+version = "7.0.0-SNAPSHOT"
 
 apply from: "blade-jar-smoke-tests.gradle"

cli/src/test/java/com/liferay/blade/cli/command/InitCommandTest.java

@@ -311,7 +311,7 @@ public void testInitCommandListAll() throws Exception {
 
 		Assert.assertTrue(output, output.contains("dxp-7.4-u110"));
 
-		Assert.assertTrue(output, output.contains("portal-7.0-ga7"));
+		Assert.assertTrue(output, output.contains("portal-7.1-ga2"));
 	}
 
 	@Test
@@ -456,19 +456,11 @@ public void testInitWithNameWorkspaceDirectoryEmpty() throws Exception {
 
 		String contents = new String(Files.readAllBytes(settingsGradlePath));
 
-		if (!contents.contains(_GRADLE_PLUGINS_WORKSPACE_VERSION)) {
-			StringBuilder sb = new StringBuilder("Error checking com.liferay.gradle.plugins.workspace version.");
-
-			sb.append(System.lineSeparator());
-
-			sb.append("Expected " + _GRADLE_PLUGINS_WORKSPACE_VERSION);
-
-			sb.append(System.lineSeparator());
-
-			sb.append(contents);
-
-			Assert.fail(String.valueOf(sb));
-		}
+		Assert.assertTrue(
+			String.join(
+				System.lineSeparator(), "Error checking com.liferay.gradle.plugins.workspace version.",
+				"Expected " + _GRADLE_PLUGINS_WORKSPACE_VERSION, contents),
+			contents.contains(_GRADLE_PLUGINS_WORKSPACE_VERSION));
 	}
 
 	@Test
@@ -621,7 +613,7 @@ private void _verifyGradleBuild() throws Exception {
 		GradleRunnerUtil.verifyBuildOutput(projectPath.toString(), "foo-1.0.0.jar");
 	}
 
-	private static final String _GRADLE_PLUGINS_WORKSPACE_VERSION = "10.0.3";
+	private static final String _GRADLE_PLUGINS_WORKSPACE_VERSION = "10.1.0";
 
 	private File _extensionsDir = null;
 	private File _workspaceDir = null;