Lps 122767 10 29

build-common.xml

@@ -786,33 +786,6 @@ information.
 				</then>
 			</if>
 
-			<local name="task.gradle.jvmargs" />
-
-			<if>
-				<not>
-					<equals arg1="@{gradlejvmargs}" arg2="" />
-				</not>
-				<then>
-					<property name="task.gradle.jvmargs" value="@{gradlejvmargs}" />
-				</then>
-				<elseif>
-					<isset property="env.JENKINS_HOME" />
-					<then>
-						<if>
-							<os family="windows" />
-							<then>
-								<antelope:stringutil property="task.gradle.jvmargs" string="${env.ANT_OPTS}">
-									<antelope:replace regex="&quot;" replacement="" />
-								</antelope:stringutil>
-							</then>
-							<else>
-								<property name="task.gradle.jvmargs" value="${env.ANT_OPTS}" />
-							</else>
-						</if>
-					</then>
-				</elseif>
-			</if>
-
 			<if>
 				<os family="unix" />
 				<then>
@@ -828,6 +801,20 @@ information.
 				</else>
 			</if>
 
+			<local name="ci.jvmargs" />
+
+			<if>
+				<and>
+					<isset property="env.JENKINS_HOME" />
+					<not>
+						<os family="windows" />
+					</not>
+				</and>
+				<then>
+					<property name="ci.jvmargs" value="${env.ANT_OPTS}" />
+				</then>
+			</if>
+
 			<local name="task.available" />
 
 			<if>
@@ -836,7 +823,8 @@ information.
 					<local name="tasks.output" />
 
 					<exec dir="@{dir}" executable="${project.dir}/gradlew${gradlew.suffix}" failonerror="@{failonerror}">
-						<arg if:set="env.JENKINS_HOME" value="--max-workers=${gradle.ci.max.workers}" />
+						<arg if:set="env.JENKINS_HOME" value="--max-workers=4" />
+						<arg if:set="env.JENKINS_HOME" value="--no-daemon" />
 						<arg unless:true="${gradle.build.parallel.enabled}" value="--no-parallel" />
 						<arg if:true="${gradle.profile.enabled}" value="--profile" />
 						<arg if:set="env.JENKINS_HOME" value="--profile" />
@@ -846,9 +834,9 @@ information.
 						<arg value="-Dapp.server.parent.dir=${app.server.parent.dir}" />
 						<arg value="-Dforced.cache.enabled=@{forcedcacheenabled}" />
 						<arg value="-Dliferay.home=${liferay.home}" />
-						<arg if:set="env.JENKINS_HOME" value="-Dorg.gradle.internal.http.connectionTimeout=${gradle.ci.http.connection.timeout}" />
-						<arg if:set="env.JENKINS_HOME" value="-Dorg.gradle.internal.http.socketTimeout=${gradle.ci.http.socket.timeout}" />
-						<arg if:set="task.gradle.jvmargs" value="-Dorg.gradle.jvmargs=${task.gradle.jvmargs}" />
+						<arg if:set="env.JENKINS_HOME" value="-Dorg.gradle.internal.http.connectionTimeout=120000" />
+						<arg if:set="env.JENKINS_HOME" value="-Dorg.gradle.internal.http.socketTimeout=120000" />
+						<arg if:set="ci.jvmargs" value="-Dorg.gradle.jvmargs=${ci.jvmargs}" />
 						<arg if:set="env.FIX_PACKS_RELEASE_ENVIRONMENT" value="-Dpatcher.hotfix.dirs=${build.patcher.hotfix.dirs}" />
 						<arg if:set="env.FIX_PACKS_RELEASE_ENVIRONMENT" value="-Dpatcher.hotfix.qualifier=${build.patcher.hotfix.qualifier}" />
 						<arg value="tasks" />
@@ -955,7 +943,8 @@ information.
 
 							<exec dir="@{dir}" executable="${project.dir}/gradlew${gradlew.suffix}" failonerror="@{failonerror}">
 								<args />
-								<arg if:set="env.JENKINS_HOME" value="--max-workers=${gradle.ci.max.workers}" />
+								<arg if:set="env.JENKINS_HOME" value="--max-workers=4" />
+								<arg if:set="env.JENKINS_HOME" value="--no-daemon" />
 								<arg unless:true="${gradle.build.parallel.enabled}" value="--no-parallel" />
 								<arg if:true="${gradle.profile.enabled}" value="--profile" />
 								<arg if:set="env.JENKINS_HOME" value="--profile" />
@@ -965,9 +954,9 @@ information.
 								<arg value="-Dapp.server.parent.dir=${app.server.parent.dir}" />
 								<arg value="-Dforced.cache.enabled=@{forcedcacheenabled}" />
 								<arg value="-Dliferay.home=${liferay.home}" />
-								<arg if:set="env.JENKINS_HOME" value="-Dorg.gradle.internal.http.connectionTimeout=${gradle.ci.http.connection.timeout}" />
-								<arg if:set="env.JENKINS_HOME" value="-Dorg.gradle.internal.http.socketTimeout=${gradle.ci.http.socket.timeout}" />
-								<arg if:set="task.gradle.jvmargs" value="-Dorg.gradle.jvmargs=${task.gradle.jvmargs}" />
+								<arg if:set="env.JENKINS_HOME" value="-Dorg.gradle.internal.http.connectionTimeout=120000" />
+								<arg if:set="env.JENKINS_HOME" value="-Dorg.gradle.internal.http.socketTimeout=120000" />
+								<arg if:set="ci.jvmargs" value="-Dorg.gradle.jvmargs=${ci.jvmargs}" />
 								<arg if:set="env.FIX_PACKS_RELEASE_ENVIRONMENT" value="-Dpatcher.hotfix.dirs=${build.patcher.hotfix.dirs}" />
 								<arg if:set="env.FIX_PACKS_RELEASE_ENVIRONMENT" value="-Dpatcher.hotfix.qualifier=${build.patcher.hotfix.qualifier}" />
 								<arg line="@{task}" />
@@ -991,7 +980,8 @@ information.
 							<echoxml>
 								<exec dir="@{dir}" executable="${project.dir}/gradlew${gradlew.suffix}" failonerror="@{failonerror}">
 									<args />
-									<arg if:set="env.JENKINS_HOME" value="--max-workers=${gradle.ci.max.workers}" />
+									<arg if:set="env.JENKINS_HOME" value="--max-workers=4" />
+									<arg if:set="env.JENKINS_HOME" value="--no-daemon" />
 									<arg unless:true="${gradle.build.parallel.enabled}" value="--no-parallel" />
 									<arg if:true="${gradle.profile.enabled}" value="--profile" />
 									<arg if:set="env.JENKINS_HOME" value="--profile" />
@@ -1001,9 +991,9 @@ information.
 									<arg value="-Dapp.server.parent.dir=${app.server.parent.dir}" />
 									<arg value="-Dforced.cache.enabled=@{forcedcacheenabled}" />
 									<arg value="-Dliferay.home=${liferay.home}" />
-									<arg if:set="env.JENKINS_HOME" value="-Dorg.gradle.internal.http.connectionTimeout=${gradle.ci.http.connection.timeout}" />
-									<arg if:set="env.JENKINS_HOME" value="-Dorg.gradle.internal.http.socketTimeout=${gradle.ci.http.socket.timeout}" />
-									<arg if:set="task.gradle.jvmargs" value="-Dorg.gradle.jvmargs=${task.gradle.jvmargs}" />
+									<arg if:set="env.JENKINS_HOME" value="-Dorg.gradle.internal.http.connectionTimeout=120000" />
+									<arg if:set="env.JENKINS_HOME" value="-Dorg.gradle.internal.http.socketTimeout=120000" />
+									<arg if:set="ci.jvmargs" value="-Dorg.gradle.jvmargs=${ci.jvmargs}" />
 									<arg if:set="env.FIX_PACKS_RELEASE_ENVIRONMENT" value="-Dpatcher.hotfix.dirs=${build.patcher.hotfix.dirs}" />
 									<arg if:set="env.FIX_PACKS_RELEASE_ENVIRONMENT" value="-Dpatcher.hotfix.qualifier=${build.patcher.hotfix.qualifier}" />
 									<arg line="@{task}" />

build.properties

@@ -61,7 +61,7 @@
     build.binaries.cache.dir=../${build.binaries.cache.repository.name}
     build.binaries.cache.repository.name=liferay-binaries-cache-2020
     build.binaries.cache.url=https://github.com/liferay/${build.binaries.cache.repository.name}.git
-    build.binaries.gradle.file=gradle-5.6.4.LIFERAY-PATCHED-2-bin.zip
+    build.binaries.gradle.file=gradle-6.6.1.LIFERAY-PATCHED-1-bin.zip
     build.binaries.gradle.url=https://github.com/liferay/${build.binaries.cache.repository.name}/raw/master/${build.binaries.gradle.file}
     build.bnd.print.enabled=false
 
@@ -373,10 +373,6 @@
 
     gradle.build.parallel.enabled=true
 
-    gradle.ci.http.connection.timeout=120000
-    gradle.ci.http.socket.timeout=120000
-    gradle.ci.max.workers=4
-
     #gradle.execute.silent=false
 
     gradle.profile.enabled=false

build.xml

@@ -333,75 +333,13 @@ message.
 					<arg value="-Dbuild.profile=portal-pre" />
 				</gradle-execute>
 
-				<if>
-					<or>
-						<not>
-							<available file="${project.dir}/modules/private" type="dir" />
-						</not>
-						<not>
-							<isset property="env.JENKINS_HOME" />
-						</not>
-					</or>
-					<then>
-						<gradle-execute dir="${project.dir}/modules" task="deploy">
-							<arg value="--parallel" />
-							<arg value="-Dbuild.exclude.dirs=${build.exclude.dirs}" />
-							<arg value="-Dbuild.include.dirs=${build.include.dirs}" />
-							<arg value="-Dbuild.profile=${build.profile}" />
-							<env key="WAS_HOME" value="${app.server.websphere.dir}" />
-						</gradle-execute>
-					</then>
-					<else>
-						<gradle-execute dir="${project.dir}/modules/private" failonerror="false" outputproperty="private.modules.project.paths" task="printProjectPath">
-							<arg value="--quiet" />
-							<arg value="-Dbuild.exclude.dirs=${build.exclude.dirs}" />
-							<arg value="-Dbuild.include.dirs=${build.include.dirs}" />
-							<arg value="-Dbuild.profile=${build.profile}" />
-							<env key="WAS_HOME" value="${app.server.websphere.dir}" />
-						</gradle-execute>
-
-						<if>
-							<not>
-								<equals arg1="${private.modules.project.paths}" arg2="" />
-							</not>
-							<then>
-								<gradle-execute checktask="true" dir="${project.dir}/modules/private" task="deploy">
-									<arg value="-Dbuild.exclude.dirs=${build.exclude.dirs}" />
-									<arg value="-Dbuild.include.dirs=${build.include.dirs}" />
-									<arg value="-Dbuild.profile=${build.profile}" />
-									<env key="WAS_HOME" value="${app.server.websphere.dir}" />
-								</gradle-execute>
-							</then>
-						</if>
-
-						<if>
-							<and>
-								<isset property="build.exclude.dirs" />
-								<not>
-									<equals arg1="${build.exclude.dirs}" arg2="" />
-								</not>
-							</and>
-							<then>
-								<gradle-execute dir="${project.dir}/modules" task="deploy">
-									<arg value="--parallel" />
-									<arg value="-Dbuild.exclude.dirs=private,${build.exclude.dirs}" />
-									<arg value="-Dbuild.include.dirs=${build.include.dirs}" />
-									<arg value="-Dbuild.profile=${build.profile}" />
-									<env key="WAS_HOME" value="${app.server.websphere.dir}" />
-								</gradle-execute>
-							</then>
-							<else>
-								<gradle-execute dir="${project.dir}/modules" task="deploy">
-									<arg value="--parallel" />
-									<arg value="-Dbuild.exclude.dirs=private" />
-									<arg value="-Dbuild.include.dirs=${build.include.dirs}" />
-									<arg value="-Dbuild.profile=${build.profile}" />
-									<env key="WAS_HOME" value="${app.server.websphere.dir}" />
-								</gradle-execute>
-							</else>
-						</if>
-					</else>
-				</if>
+				<gradle-execute dir="${project.dir}/modules" task="deploy">
+					<arg value="--parallel" />
+					<arg value="-Dbuild.exclude.dirs=${build.exclude.dirs}" />
+					<arg value="-Dbuild.include.dirs=${build.include.dirs}" />
+					<arg value="-Dbuild.profile=${build.profile}" />
+					<env key="WAS_HOME" value="${app.server.websphere.dir}" />
+				</gradle-execute>
 
 				<if>
 					<equals arg1="${marker.files.lfrbuild.ci.enabled}" arg2="true" />

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=../../tools/gradle-5.6.4.LIFERAY-PATCHED-2-bin.zip
+distributionUrl=../../tools/gradle-6.6.1.LIFERAY-PATCHED-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -176,14 +178,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "--init-script=$APP_HOME/modules/init.gradle" "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,29 +64,15 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 set DEFAULT_JVM_OPTS=%DEFAULT_JVM_OPTS% "-Dgradle.user.home=%APP_HOME%\.gradle"
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain "--init-script=%APP_HOME%\modules\init.gradle" %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain "--init-script=%APP_HOME%\modules\init.gradle" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

modules/.releng/dxp/apps/antivirus/app.properties

@@ -1,4 +1,4 @@
-app.marketplace.id=
+app.marketplace.id=178304538
 app.marketplace.title=Liferay Antivirus
 app.marketplace.version=1.0.0
 app.portal.build=7310

modules/.releng/sdk/gradle-plugins-css-builder/artifact.properties

@@ -1,4 +1,4 @@
-artifact.git.id=3951ea67f5d1bec669bac186d683e5276bf208b2
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.css.builder/3.1.3/com.liferay.gradle.plugins.css.builder-3.1.3-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.css.builder/3.1.3/com.liferay.gradle.plugins.css.builder-3.1.3-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.css.builder/3.1.3/com.liferay.gradle.plugins.css.builder-3.1.3.jar
+artifact.git.id=63a6c80227b3851f20539b2d8f8cdab06e662264
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.css.builder/5.0.0/com.liferay.gradle.plugins.css.builder-5.0.0-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.css.builder/5.0.0/com.liferay.gradle.plugins.css.builder-5.0.0-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.css.builder/5.0.0/com.liferay.gradle.plugins.css.builder-5.0.0.jar

modules/.releng/sdk/gradle-plugins-defaults/artifact.properties

@@ -1,5 +1,5 @@
-artifact.git.id=7104c4c96f8982b4bce883f50dda527348636491
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/6.1.396/com.liferay.gradle.plugins.defaults-6.1.396-javadoc.jar
-artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/6.1.396/com.liferay.gradle.plugins.defaults-6.1.396-sources-commercial.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/6.1.396/com.liferay.gradle.plugins.defaults-6.1.396-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/6.1.396/com.liferay.gradle.plugins.defaults-6.1.396.jar
+artifact.git.id=23b88e421784ab28278e93acdb48e5be508f1667
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/6.1.399/com.liferay.gradle.plugins.defaults-6.1.399-javadoc.jar
+artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/6.1.399/com.liferay.gradle.plugins.defaults-6.1.399-sources-commercial.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/6.1.399/com.liferay.gradle.plugins.defaults-6.1.399-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/6.1.399/com.liferay.gradle.plugins.defaults-6.1.399.jar