BLADE-728 upgrade configuration to support gradle 7

.github/workflows/verify.yml

@@ -13,7 +13,7 @@ env:
 jobs:
   CheckSourceFormatting:
     name: Check source formatting
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -34,17 +34,19 @@ jobs:
           ./gradlew --no-daemon checkSourceFormatting
   LinuxJDK8:
     name: Linux JDK8
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Set up JDK8
-        uses: actions/setup-java@v1
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - name: Setup Java 8
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          java-version: 8
+          distribution: 'zulu'
+          cache: gradle
       - name: Cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -71,17 +73,19 @@ jobs:
           token: "7793a209-c075-4644-9bdb-9205dbe5c4e7"
   LinuxJDK11:
     name: Linux JDK11
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Set up JDK11
-        uses: actions/setup-java@v1
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - name: Setup Java 11
+        uses: actions/setup-java@v3
         with:
           java-version: 11
+          distribution: 'zulu'
+          cache: gradle
       - name: Cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -106,19 +110,21 @@ jobs:
           label: "Linux JDK11 test reports"
           report: "**/TEST-*.xml"
           token: "7793a209-c075-4644-9bdb-9205dbe5c4e7"
-  MacOSJDK8:
-    name: MacOS JDK8
+  MacOSJDK11:
+    name: MacOS JDK11
     runs-on: macos-latest
     timeout-minutes: 60
     steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Set up JDK8
-        uses: actions/setup-java@v1
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - name: Setup Java 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          java-version: 11
+          distribution: 'zulu'
+          cache: gradle
       - name: Cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -134,13 +140,13 @@ jobs:
         uses: actions/upload-artifact@v1
         if: failure()
         with:
-          name: MacOSJDK8-tests.zip
+          name: MacOSJDK11-tests.zip
           path: tests.zip
       - name: Run reporter
         uses: check-run-reporter/[email protected]
         if: ${{ always() }}
         with:
-          label: "MacOS JDK8 test reports"
+          label: "MacOS JDK11 test reports"
           report: "**/TEST-*.xml"
           token: "7793a209-c075-4644-9bdb-9205dbe5c4e7"
   #WindowsJDK8:

RELEASE.markdown

@@ -0,0 +1,39 @@
+# How to Release
+
+## Create a stable release
+
+1. Create a BLADE jira ticket for the new release
+
+1. Create a new branch based on ticket
+
+1. Run `gradlew prepareRelease`
+
+1. Commit the changes
+
+1. Generate changelog`./gradlew -b changelogs-sdk.gradle buildChangelogs`
+
+1. Commit the changelog
+
+1. Create PR on `liferay/liferay-blade-cli` repo from this branch
+
+1. If the PR passes all the tests, merge the PR to master.
+
+1. Generate a new tag based on the new version `git tag 4.1.2`
+
+1. Push the tags to upstream `git push --tags upstream`
+
+By merging this PR to master, and since all of the versions of the components are set to stable versions, this will cause the GitHub workflow to release the binaries to nexus which will cause the existing blade CLIs to report a new stable release/version is available and anyone who runs `blade update` will get the new version. See [Create a snapshot release](#create-a-snapshot-release) right after releasing a stable version.
+
+## Create a snapshot release
+
+1. Create a new branch based for updating to new snapshot release
+
+1. Run `gradlew prepareSnapshot`
+
+1. Commit the changes using the release ticket
+
+1. Create a PR
+
+1. If it passes CI, merge the PR
+
+By merging this PR to master with all the version numbers for components that end in `-SNAPSHOT` this will cause the GitHub workflow to release the binaries for a new snapshot release.

build.gradle

@@ -3,7 +3,7 @@ import org.osgi.framework.Version
 buildscript {
 	dependencies {
 		classpath group: "com.liferay", name: "com.liferay.gradle.plugins.change.log.builder", version: "1.1.1"
-		classpath group: "com.liferay", name: "com.liferay.gradle.plugins.source.formatter", version: "5.1.75"
+		classpath group: "com.liferay", name: "com.liferay.gradle.plugins.source.formatter", version: "latest.release"
 		classpath group: "nu.studer", name: "gradle-credentials-plugin", version: "2.1"
 		classpath group: "org.osgi", name: "osgi.core", version: "6.0.0"
 	}
@@ -180,7 +180,7 @@ repositories {
 
 	if (!remoteNexus) {
 		maven {
-			url "http://localhost:8081/nexus/content/groups/public/"
+			url "https://localhost:8081/nexus/content/groups/public/"
 		}
 	}
 }
@@ -312,10 +312,10 @@ subprojects {
 					liferayNexusPassword = "admin123"
 
 					if (release) {
-						repoUrl = "http://localhost:8081/nexus/content/repositories/releases/"
+						repoUrl = "https://localhost:8081/nexus/content/repositories/releases/"
 					}
 					else {
-						repoUrl = "http://localhost:8081/nexus/content/repositories/snapshots/"
+						repoUrl = "https://localhost:8081/nexus/content/repositories/snapshots/"
 					}
 				}
 				else {

cli/blade-jar-smoke-tests.gradle

@@ -18,6 +18,7 @@ task testBladeInitCommandLegacy(type: JavaExec)
 task testBladeInitCommandList(type: JavaExec)
 task testBladeInitCommandListAll(type: JavaExec)
 task testBladeReturnCodeFailure(type: Exec)
+task testBladeSamplesClientExtensionCommand(type: JavaExec)
 task testBladeSamplesCommand(type: JavaExec)
 task testBladeVersionCommand(type: JavaExec)
 
@@ -403,6 +404,22 @@ testBladeReturnCodeFailure {
 	}
 }
 
+testBladeSamplesClientExtensionCommand {
+	args = [jar.archivePath, "samples", "client-extensions", "-d", clientExtensionDir.path, "liferay-sample-global-css"]
+	standardOutput = standardStream
+	errorOutput = errorStream
+
+	doLast{
+		File projectDir = new File(clientExtensionDir, "liferay-sample-global-css")
+		String error = errorStream.toString().toLowerCase()
+
+		errorStream.reset()
+		standardStream.reset()
+
+		assert projectDir.exists()
+	}
+}
+
 testBladeSamplesCommand {
 	args = [jar.archivePath, "samples", "-v", "7.1"]
 	standardOutput = standardStream

cli/bnd.bnd

@@ -20,13 +20,6 @@ Private-Package:\
 	\
 	com.liferay.blade.gradle.tooling,\
 	\
-	com.liferay.portal.tools.bundle.support,\
-	com.liferay.portal.tools.bundle.support.commands,\
-	com.liferay.portal.tools.bundle.support.constants,\
-	com.liferay.portal.tools.bundle.support.internal,\
-	com.liferay.portal.tools.bundle.support.internal.util,\
-	com.liferay.portal.tools.bundle.support.util,\
-	\
 	groovy.json,\
 	\
 	org.apache.commons.beanutils,\
@@ -203,7 +196,7 @@ Private-Package:\
 	\
 	org.objectweb.asm.*,\
 	\
-	org.osgi.dto,\
+	org.osgi.dto;-split-package:=merge-first,\
 	org.osgi.framework;-split-package:=merge-first,\
 	org.osgi.framework.dto,\
 	org.osgi.resource;-split-package:=merge-first,\