Faro v4.6.x lpd 18952

build-test-analytics-cloud.xml

@@ -75,6 +75,57 @@ networks:
 		</sequential>
 	</macrodef>
 
+	<macrodef name="download-gradle-wrapper-binary">
+		<sequential>
+			<if>
+				<and>
+					<available file="${analytics.cloud.asah.dir}/gradle/wrapper/gradle-wrapper.properties" />
+					<not>
+						<available file="${analytics.cloud.asah.dir}/gradle/wrapper/${gradle.wrapper.bin.file.name}" />
+					</not>
+				</and>
+				<then>
+					<local name="gradle.wrapper.bin.file.name" />
+					<local name="gradle.wrapper.bin.file.url" />
+
+					<beanshell>
+						<![CDATA[
+							import com.liferay.jenkins.results.parser.JenkinsResultsParserUtil;
+
+							File gradleWrapperPropertiesFile = new File(project.getProperty("analytics.cloud.asah.dir") + "/gradle/wrapper/gradle-wrapper.properties");
+
+							Properties gradleWrapperProperties = JenkinsResultsParserUtil.getProperties(new File[] {gradleWrapperPropertiesFile});
+
+							String distributionURL = gradleWrapperProperties.getProperty("distributionUrl");
+
+							project.setProperty("gradle.wrapper.bin.file.name", distributionURL.replaceAll(".*/([^/]+)", "$1"));
+							project.setProperty("gradle.wrapper.bin.file.url", distributionURL);
+						]]>
+					</beanshell>
+
+					<mirrors-get
+						dest="${analytics.cloud.asah.dir}/gradle/wrapper/${gradle.wrapper.bin.file.name}"
+						src="${gradle.wrapper.bin.file.url}"
+					/>
+
+					<beanshell>
+						<![CDATA[
+							import com.liferay.jenkins.results.parser.JenkinsResultsParserUtil;
+
+							File gradleWrapperPropertiesFile = new File(project.getProperty("analytics.cloud.asah.dir") + "/gradle/wrapper/gradle-wrapper.properties");
+
+							Properties gradleWrapperProperties = JenkinsResultsParserUtil.getProperties(new File[] {gradleWrapperPropertiesFile});
+
+							gradleWrapperProperties.setProperty("distributionUrl", "./" + project.getProperty("gradle.wrapper.bin.file.name"));
+
+							JenkinsResultsParserUtil.writePropertiesFile(gradleWrapperPropertiesFile, gradleWrapperProperties, true);
+						]]>
+					</beanshell>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
 	<macrodef name="print-analytics-cloud-logs">
 		<sequential>
 			<property location="${analytics.cloud.asah.dir}/docker-compose.test.yml" name="analytics.cloud.docker.test.yaml" />
@@ -239,6 +290,20 @@ OSB_ASAH_POSTGRESQL_ENABLED=false
 OSB_ASAH_PUBLISHER_URL=${analytics.cloud.asah.publisher.url}
 OSB_FARO_FRONTEND_URL=${analytics.cloud.faro.frontend.url}</echo>
 
+			<if>
+				<isset property="test.portal.license.url" />
+				<then>
+					<mkdir dir="${analytics.cloud.faro.dir}/osb-faro-docker/common/license/" />
+
+					<mirrors-get
+						dest="${analytics.cloud.faro.dir}/osb-faro-docker/common/license/"
+						src="${test.portal.license.url}"
+					/>
+				</then>
+			</if>
+
+			<download-gradle-wrapper-binary />
+
 			<if>
 				<equals arg1="${analytics.cloud.asah.build}" arg2="true" />
 				<then>
@@ -317,9 +382,7 @@ OSB_FARO_FRONTEND_URL=${analytics.cloud.faro.frontend.url}</echo>
 
 				docker logs ${analytics.cloud.faro.container.name}
 
-				docker container prune -f
-				docker image prune -f
-				docker volume prune -f
+				docker system df
 			</echo>
 
 			<trycatch>
@@ -475,9 +538,7 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
 
 				docker-compose --file=${analytics.cloud.docker.test.yaml} --project-name=${analytics.cloud.project.name} down --volumes
 
-				docker container prune -f
-				docker image prune -f
-				docker volume prune -f
+				docker system df
 			</execute>
 		</sequential>
 	</macrodef>
@@ -491,9 +552,7 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
 
 				docker-compose -f docker-compose.integration-test.yml down --volumes
 
-				docker container prune -f
-				docker image prune -f
-				docker volume prune -f
+				docker system df
 			</execute>
 		</sequential>
 	</macrodef>

modules/apps/analytics/analytics-batch-export-import-impl/src/main/java/com/liferay/analytics/batch/exportimport/internal/dto/v1_0/converter/DXPEntityDTOConverterImpl.java

@@ -246,7 +246,7 @@ private ExpandoField[] _getExpandoFields(BaseModel<?> baseModel) {
 			ExpandoColumn expandoColumn =
 				_expandoColumnLocalService.getDefaultTableColumn(
 					shardedModel.getCompanyId(), baseModel.getModelClassName(),
-					key.substring(0, key.indexOf("-")));
+					key.substring(0, key.lastIndexOf("-")));
 
 			if (expandoColumn == null) {
 				continue;

modules/apps/analytics/analytics-client-js/package.json

@@ -46,4 +46,4 @@
 		"test": "TZ=Etc/GMT liferay-npm-scripts test"
 	},
 	"version": "1.0.0"
-}
+}