Merge pull request #316 from simonjhy/BLADE-739

BLADE-739 upgrade project template and change aether related libs name

cli/build.gradle

@@ -77,7 +77,7 @@ createWrapperZip {
 dependencies {
 	api group: "biz.aQute.bnd", name: "biz.aQute.bndlib", version: "5.3.0"
 	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.264"
+	api group: "com.liferay", name: "com.liferay.project.templates", version: "5.0.269"
 	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"
@@ -89,15 +89,15 @@ dependencies {
 	api group: "org.apache.maven", name: "maven-resolver-provider", version: "3.6.3"
 	api group: "org.apache.maven", name: "maven-settings", version: "3.6.3"
 	api group: "org.apache.maven", name: "maven-settings-builder", version: "3.6.3"
-	api group: "org.eclipse.aether", name: "aether-api", version: "1.0.2.v20150114"
-	api group: "org.eclipse.aether", name: "aether-connector-basic", version: "1.0.2.v20150114"
-	api group: "org.eclipse.aether", name: "aether-impl", version: "1.0.2.v20150114"
-	api group: "org.eclipse.aether", name: "aether-spi", version: "1.0.2.v20150114"
-	api group: "org.eclipse.aether", name: "aether-transport-classpath", version: "1.0.2.v20150114"
-	api group: "org.eclipse.aether", name: "aether-transport-file", version: "1.0.2.v20150114"
-	api group: "org.eclipse.aether", name: "aether-transport-http", version: "1.0.2.v20150114"
-	api group: "org.eclipse.aether", name: "aether-transport-wagon", version: "1.0.2.v20150114"
-	api group: "org.eclipse.aether", name: "aether-util", version: "1.0.2.v20150114"
+	api group: "org.apache.maven.resolver", name: "maven-resolver-api", version: "1.9.17"
+	api group: "org.apache.maven.resolver", name: "maven-resolver-connector-basic", version: "1.9.17"
+	api group: "org.apache.maven.resolver", name: "maven-resolver-impl", version: "1.9.17"
+	api group: "org.apache.maven.resolver", name: "maven-resolver-spi", version: "1.9.17"
+	api group: "org.apache.maven.resolver", name: "maven-resolver-transport-classpath", version: "1.9.17"
+	api group: "org.apache.maven.resolver", name: "maven-resolver-transport-file", version: "1.9.17"
+	api group: "org.apache.maven.resolver", name: "maven-resolver-transport-http", version: "1.9.17"
+	api group: "org.apache.maven.resolver", name: "maven-resolver-transport-wagon", version: "1.9.17"
+	api group: "org.apache.maven.resolver", name: "maven-resolver-util", version: "1.9.17"
 	api group: "org.fusesource.jansi", name: "jansi", version: "1.17.1"
 	api group: "org.gradle", name: "gradle-base-services-groovy", version: "5.6.4"
 	api group: "org.gradle", name: "gradle-core", version: "5.6.4"

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

@@ -1694,7 +1694,7 @@ public void testCreateWorkspaceNpmAngularPortletProject() throws Exception {
 		_contains(
 			_checkFileExists(projectPath + "/foo/package.json"),
 			new String[] {
-				".*@angular/animations.*", ".*liferay-npm-bundler\": \"2.30.0.*",
+				".*@angular/animations.*", ".*liferay-npm-bundler\": \"2.31.2.*",
 				".*build\": \"tsc && liferay-npm-bundler.*"
 			});
 

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

@@ -668,7 +668,7 @@ private void _verifyGradleBuild() throws Exception {
 		GradleRunnerUtil.verifyBuildOutput(projectPath.toString(), "foo-1.0.0.jar");
 	}
 
-	private static final String _GRADLE_PLUGINS_WORKSPACE_VERSION = "9.0.2";
+	private static final String _GRADLE_PLUGINS_WORKSPACE_VERSION = "9.0.12";
 
 	private File _extensionsDir = null;
 	private File _workspaceDir = null;