Merge pull request #309 from simonjhy/BLADE-730-1

BLADE-730 blade should support proxy when no userName and password"

.github/workflows/verify.yml

@@ -48,8 +48,10 @@ jobs:
       - name: Cache
         uses: actions/cache@v3
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/build.gradle', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Build
@@ -58,19 +60,6 @@ jobs:
           GITHUB_CI: "true"
         run: |
           ./run-tests.sh
-      - name: Upload tests zip
-        uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: LinuxJDK8-tests.zip
-          path: tests.zip
-      - name: Run reporter
-        uses: check-run-reporter/action@v2.0.0
-        if: ${{ always() }}
-        with:
-          label: "Linux JDK8 test reports"
-          report: "**/TEST-*.xml"
-          token: "7793a209-c075-4644-9bdb-9205dbe5c4e7"
   LinuxJDK11:
     name: Linux JDK11
     runs-on: ubuntu-latest
@@ -87,8 +76,10 @@ jobs:
       - name: Cache
         uses: actions/cache@v3
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/build.gradle', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Build
@@ -103,13 +94,6 @@ jobs:
         with:
           name: LinuxJDK11-tests.zip
           path: tests.zip
-      - name: Run reporter
-        uses: check-run-reporter/action@v2.0.0
-        if: ${{ always() }}
-        with:
-          label: "Linux JDK11 test reports"
-          report: "**/TEST-*.xml"
-          token: "7793a209-c075-4644-9bdb-9205dbe5c4e7"
   #MacOSJDK11:
   #  name: MacOS JDK11
   #  runs-on: macos-latest
@@ -148,4 +132,4 @@ jobs:
   #      with:
   #        label: "MacOS JDK11 test reports"
   #        report: "**/TEST-*.xml"
-  #        token: "7793a209-c075-4644-9bdb-9205dbe5c4e7"
+  #        token: "7793a209-c075-4644-9bdb-9205dbe5c4e7"

build.gradle

@@ -31,13 +31,13 @@ buildscript {
 apply plugin: "com.liferay.change.log.builder"
 apply plugin: "com.liferay.source.formatter"
 
-task clean(type:Delete)
-task dockerImageBuild(type:Exec)
-task dockerNexusDelete(type:Exec)
-task dockerNexusStart(type:Exec)
-task dockerNexusStop(type:Exec)
-task dockerPublishRelease(type:Exec)
-task dockerPublishSnapshots(type:Exec)
+tasks.register('clean', Delete)
+tasks.register('dockerImageBuild', Exec)
+tasks.register('dockerNexusDelete', Exec)
+tasks.register('dockerNexusStart', Exec)
+tasks.register('dockerNexusStop', Exec)
+tasks.register('dockerPublishRelease', Exec)
+tasks.register('dockerPublishSnapshots', Exec)
 
 String userHome = System.getProperty("user.home")
 
@@ -206,13 +206,13 @@ subprojects {
 		targetCompatibility = "1.8"
 	}
 
-	tasks.withType(GenerateModuleMetadata) {
+	tasks.withType(GenerateModuleMetadata).configureEach {
 		enabled = false
 	}
 
 	pluginManager.withPlugin("maven-publish") {
-		task prepareRelease
-		task prepareSnapshot
+		tasks.register('prepareRelease')
+		tasks.register('prepareSnapshot')
 
 		prepareRelease {
 			doLast {

cli/bnd.bnd

@@ -22,10 +22,6 @@ Private-Package:\
 	\
 	groovy.json,\
 	\
-	org.apache.commons.beanutils,\
-	org.apache.commons.beanutils.converters,\
-	org.apache.commons.beanutils.expression,\
-	\
 	org.apache.commons.compress.archivers;-split-package:=merge-first,\
 	org.apache.commons.compress.archivers.tar;-split-package:=merge-first,\
 	org.apache.commons.compress.archivers.zip;-split-package:=merge-first,\

cli/build.gradle

@@ -22,16 +22,18 @@ apply plugin: "biz.aQute.bnd.builder"
 apply plugin: "java-library"
 apply plugin: "maven-publish"
 
-task bladeExtensionsVersions
-task cliSourcesJar(type: Jar)
-task cliTestJar(type: Jar, dependsOn: testClasses)
-task copyMavenProfileJar(type: Copy)
-task createToolingZip(type:Zip)
-task createWrapperZip(type:Zip)
-task downloadPortal(type: Download)
-task downloadProductInfo(type: Download)
-task unzipManifest(type: Copy)
-task unzipPortal(type: Copy)
+tasks.register('bladeExtensionsVersions')
+tasks.register('cliSourcesJar', Jar)
+tasks.register('cliTestJar', Jar) {
+	dependsOn testClasses
+}
+tasks.register('copyMavenProfileJar', Copy)
+tasks.register('createToolingZip', Zip)
+tasks.register('createWrapperZip', Zip)
+tasks.register('downloadPortal', Download)
+tasks.register('downloadProductInfo', Download)
+tasks.register('unzipManifest', Copy)
+tasks.register('unzipPortal', Copy)
 
 configurations {
 	bladeExtensions {
@@ -75,19 +77,18 @@ 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.257"
-	api group: "commons-beanutils", name: "commons-beanutils", version: "1.9.4"
-	api group: "commons-io", name: "commons-io", version: "2.6"
+	api group: "com.liferay", name: "com.liferay.project.templates", version: "5.0.262"
+	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.7"
-	api group: "org.apache.commons", name: "commons-compress", version: "1.18"
-	api group: "org.apache.commons", name: "commons-configuration2", version: "2.7"
-	api group: "org.apache.commons", name: "commons-text", version: "1.8"
+	api group: "org.apache.ant", name: "ant", version: "1.10.11"
+	api group: "org.apache.commons", name: "commons-compress", version: "1.21"
+	api group: "org.apache.commons", name: "commons-configuration2", version: "2.8.0"
+	api group: "org.apache.commons", name: "commons-text", version: "1.10.0"
 	api group: "org.apache.httpcomponents", name: "httpclient", version: "4.5.13"
 	api group: "org.apache.httpcomponents", name: "httpcore", version: "4.4.14"
-	api group: "org.apache.maven", name: "maven-aether-provider", version: "3.3.9"
-	api group: "org.apache.maven", name: "maven-settings", version: "3.3.9"
-	api group: "org.apache.maven", name: "maven-settings-builder", version: "3.3.9"
+	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"
@@ -101,8 +102,8 @@ dependencies {
 	api group: "org.gradle", name: "gradle-base-services-groovy", version: "5.6.4"
 	api group: "org.gradle", name: "gradle-core", version: "5.6.4"
 	api group: "org.gradle", name: "gradle-tooling-api", version: "5.6.4"
-	api group: "org.json", name: "json", version: "20190722"
-	api group: "org.jsoup", name: "jsoup", version: "1.11.3"
+	api group: "org.json", name: "json", version: "20230227"
+	api group: "org.jsoup", name: "jsoup", version: "1.15.3"
 	api group: "org.tukaani", name: "xz", version: "1.6"
 	api name: "org.objectweb.asm-6.0.0"
 	api name: "org.objectweb.asm.analysis-6.0.0"
@@ -120,14 +121,10 @@ dependencies {
 
 	testImplementation gradleTestKit()
 	testImplementation group: "com.googlecode.java-diff-utils", name: "diffutils", version: "1.3.0"
-	testImplementation group: "junit", name: "junit", version: "4.12"
+	testImplementation group: "junit", name: "junit", version: "4.13.1"
 	testImplementation group: "net.diibadaaba.zipdiff", name: "zipdiff", version: "1.0"
 	testImplementation group: "org.easymock", name: "easymock", version: "3.5.1"
 	testImplementation group: "org.osgi", name: "osgi.core", version: "6.0.0"
-	testImplementation group: "org.powermock", name: "powermock-api-easymock", version: "2.0.4"
-	testImplementation group: "org.powermock", name: "powermock-classloading-xstream", version: "2.0.4"
-	testImplementation group: "org.powermock", name: "powermock-module-junit4", version: "2.0.4"
-	testImplementation group: "org.powermock", name: "powermock-module-junit4-rule", version: "2.0.4"
 	testImplementation group: "org.zeroturnaround", name: "zt-process-killer", version: "1.9"
 	testImplementation project(":gradle-tooling")
 }
@@ -320,10 +317,6 @@ unzipManifest {
 	finalizedBy("compileTestJava")
 }
 
-processZipsResources{
-	dependsOn("unzipPortal")
-}
-
 unzipPortal {
 	dependsOn downloadPortal
 	from tarTree(resources.gzip(downloadPortal.dest))

cli/src/main/java/com/liferay/blade/cli/BladeCLI.java

@@ -1,17 +1,6 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
+ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
  */
 
 package com.liferay.blade.cli;

cli/src/main/java/com/liferay/blade/cli/BladeCLIDefaultProvider.java

@@ -1,17 +1,6 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
+ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
  */
 
 package com.liferay.blade.cli;

cli/src/main/java/com/liferay/blade/cli/BladeSettings.java

@@ -1,17 +1,6 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
+ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
  */
 
 package com.liferay.blade.cli;

cli/src/main/java/com/liferay/blade/cli/Extensions.java

@@ -1,17 +1,6 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
+ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
  */
 
 package com.liferay.blade.cli;

cli/src/main/java/com/liferay/blade/cli/ExtensionsClassLoaderSupplier.java

@@ -1,17 +1,6 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
+ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
  */
 
 package com.liferay.blade.cli;

cli/src/main/java/com/liferay/blade/cli/LiferayBundleDeployer.java

@@ -1,17 +1,6 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
+ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
  */
 
 package com.liferay.blade.cli;

cli/src/main/java/com/liferay/blade/cli/StringConverter.java

@@ -1,17 +1,6 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
+ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
  */
 
 package com.liferay.blade.cli;

cli/src/main/java/com/liferay/blade/cli/StringPrintStream.java

@@ -1,17 +1,6 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
+ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
  */
 
 package com.liferay.blade.cli;

cli/src/main/java/com/liferay/blade/cli/WorkspaceConstants.java

@@ -1,17 +1,6 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
+ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
  */
 
 package com.liferay.blade.cli;