Lpd 41036 DRAFT

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

@@ -1,4 +1,4 @@
-artifact.git.id=1382281d80babcd31d90abbb3f080392b1ca2fd3
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.203/com.liferay.gradle.plugins.defaults-10.1.203-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.203/com.liferay.gradle.plugins.defaults-10.1.203-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.203/com.liferay.gradle.plugins.defaults-10.1.203.jar
+artifact.git.id=5c299f67868a1350af6d7a8f90aa85be086fbc99
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.204/com.liferay.gradle.plugins.defaults-10.1.204-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.204/com.liferay.gradle.plugins.defaults-10.1.204-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.204/com.liferay.gradle.plugins.defaults-10.1.204.jar

modules/.releng/sdk/gradle-plugins-source-formatter/artifact.properties

@@ -1,4 +1,4 @@
-artifact.git.id=3484725f9c38a4d2e7391eac15959d973bab2a51
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.173/com.liferay.gradle.plugins.source.formatter-5.2.173-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.173/com.liferay.gradle.plugins.source.formatter-5.2.173-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.173/com.liferay.gradle.plugins.source.formatter-5.2.173.jar
+artifact.git.id=8b11a10ecdd2e98dc4c9f685eddbbc0b0cd439b6
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.174/com.liferay.gradle.plugins.source.formatter-5.2.174-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.174/com.liferay.gradle.plugins.source.formatter-5.2.174-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.174/com.liferay.gradle.plugins.source.formatter-5.2.174.jar

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

@@ -1,4 +1,4 @@
-artifact.git.id=1382281d80babcd31d90abbb3f080392b1ca2fd3
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/12.1.3/com.liferay.gradle.plugins.workspace-12.1.3-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/12.1.3/com.liferay.gradle.plugins.workspace-12.1.3-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/12.1.3/com.liferay.gradle.plugins.workspace-12.1.3.jar
+artifact.git.id=60ce8540b01cb71380b678d5f3acd019face8621
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/12.1.4/com.liferay.gradle.plugins.workspace-12.1.4-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/12.1.4/com.liferay.gradle.plugins.workspace-12.1.4-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/12.1.4/com.liferay.gradle.plugins.workspace-12.1.4.jar

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

@@ -1,4 +1,4 @@
-artifact.git.id=1382281d80babcd31d90abbb3f080392b1ca2fd3
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.114/com.liferay.gradle.plugins-15.0.114-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.114/com.liferay.gradle.plugins-15.0.114-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.114/com.liferay.gradle.plugins-15.0.114.jar
+artifact.git.id=5c299f67868a1350af6d7a8f90aa85be086fbc99
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.115/com.liferay.gradle.plugins-15.0.115-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.115/com.liferay.gradle.plugins-15.0.115-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.115/com.liferay.gradle.plugins-15.0.115.jar

modules/.releng/util/source-formatter/artifact.properties

@@ -1,5 +1,5 @@
-artifact.git.id=3484725f9c38a4d2e7391eac15959d973bab2a51
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1456/com.liferay.source.formatter-1.0.1456-sources.jar
-artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1456/com.liferay.source.formatter-1.0.1456.tar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1456/com.liferay.source.formatter-1.0.1456.jar
-artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1456/com.liferay.source.formatter-1.0.1456.zip
+artifact.git.id=8b11a10ecdd2e98dc4c9f685eddbbc0b0cd439b6
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1457/com.liferay.source.formatter-1.0.1457-sources.jar
+artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1457/com.liferay.source.formatter-1.0.1457.tar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1457/com.liferay.source.formatter-1.0.1457.jar
+artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1457/com.liferay.source.formatter-1.0.1457.zip

modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/internal/exportimport/portlet/preferences/processor/test/BlogsAggregatorExportImportPortletPreferencesProcessorTest.java

@@ -7,30 +7,44 @@
 
 import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian;
 import com.liferay.blogs.constants.BlogsPortletKeys;
+import com.liferay.exportimport.kernel.configuration.ExportImportConfigurationParameterMapFactoryUtil;
 import com.liferay.exportimport.kernel.lar.PortletDataContext;
+import com.liferay.exportimport.kernel.lar.PortletDataHandlerKeys;
 import com.liferay.exportimport.kernel.lar.StagedModelDataHandler;
 import com.liferay.exportimport.kernel.lar.StagedModelDataHandlerRegistryUtil;
+import com.liferay.exportimport.kernel.service.StagingLocalServiceUtil;
+import com.liferay.exportimport.kernel.staging.StagingUtil;
+import com.liferay.exportimport.kernel.staging.constants.StagingConstants;
 import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
 import com.liferay.exportimport.test.util.ExportImportTestUtil;
 import com.liferay.layout.test.util.LayoutTestUtil;
+import com.liferay.petra.lang.SafeCloseable;
+import com.liferay.petra.string.StringPool;
 import com.liferay.portal.kernel.model.Group;
 import com.liferay.portal.kernel.model.Layout;
 import com.liferay.portal.kernel.model.Organization;
 import com.liferay.portal.kernel.model.Portlet;
 import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil;
+import com.liferay.portal.kernel.service.GroupLocalServiceUtil;
 import com.liferay.portal.kernel.service.OrganizationLocalServiceUtil;
 import com.liferay.portal.kernel.service.PortletLocalService;
+import com.liferay.portal.kernel.service.ServiceContext;
+import com.liferay.portal.kernel.service.persistence.GroupUtil;
 import com.liferay.portal.kernel.test.rule.AggregateTestRule;
 import com.liferay.portal.kernel.test.rule.DeleteAfterTestRun;
 import com.liferay.portal.kernel.test.util.GroupTestUtil;
 import com.liferay.portal.kernel.test.util.OrganizationTestUtil;
+import com.liferay.portal.kernel.test.util.PropsValuesTestUtil;
+import com.liferay.portal.kernel.test.util.ServiceContextTestUtil;
 import com.liferay.portal.kernel.test.util.TestPropsValues;
 import com.liferay.portal.kernel.test.util.UserTestUtil;
 import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.PortalUtil;
 import com.liferay.portal.test.rule.Inject;
 import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.portlet.PortletPreferences;
 
@@ -153,6 +167,78 @@ public void testProcessOrganizationId() throws Exception {
 			GetterUtil.getLong(importedOrganizationId));
 	}
 
+	@Test
+	public void testRemoteStagedOrganizationMissingRefValidation()
+		throws Exception {
+
+		Group remoteLiveGroup = GroupTestUtil.addGroup();
+
+		try {
+			_enableRemoteStaging(remoteLiveGroup, _group);
+
+			remoteLiveGroup = GroupLocalServiceUtil.getGroup(
+				remoteLiveGroup.getGroupId());
+
+			Map<String, String[]> parameters =
+				ExportImportConfigurationParameterMapFactoryUtil.
+					buildFullPublishParameterMap();
+
+			StagingUtil.publishLayouts(
+				TestPropsValues.getUserId(), _group.getGroupId(),
+				remoteLiveGroup.getGroupId(), false, parameters);
+
+			Assert.assertEquals(1, remoteLiveGroup.getPublicLayoutsPageCount());
+		}
+		finally {
+			GroupTestUtil.deleteGroup(remoteLiveGroup);
+		}
+	}
+
+	private void _enableRemoteStaging(
+			Group remoteLiveGroup, Group remoteStagingGroup)
+		throws Exception {
+
+		try (SafeCloseable safeCloseable1 =
+				PropsValuesTestUtil.swapWithSafeCloseable(
+					"TUNNELING_SERVLET_SHARED_SECRET",
+					"F0E1D2C3B4A5968778695A4B3C2D1E0F");
+			SafeCloseable safeCloseable2 =
+				PropsValuesTestUtil.swapWithSafeCloseable(
+					"TUNNELING_SERVLET_SHARED_SECRET_HEX", true)) {
+
+			ServiceContext serviceContext =
+				ServiceContextTestUtil.getServiceContext();
+
+			serviceContext.setAddGroupPermissions(true);
+			serviceContext.setAddGuestPermissions(true);
+			serviceContext.setScopeGroupId(remoteStagingGroup.getGroupId());
+
+			_setStagingAttribute(
+				serviceContext, PortletDataHandlerKeys.PORTLET_DATA_ALL, false);
+			_setStagingAttribute(
+				serviceContext, PortletDataHandlerKeys.PORTLET_SETUP_ALL,
+				false);
+
+			UserTestUtil.setUser(TestPropsValues.getUser());
+
+			StagingLocalServiceUtil.enableRemoteStaging(
+				TestPropsValues.getUserId(), remoteStagingGroup, false, false,
+				"localhost", PortalUtil.getPortalServerPort(false),
+				PortalUtil.getPathContext(), false,
+				remoteLiveGroup.getGroupId(), serviceContext);
+
+			GroupUtil.clearCache();
+		}
+	}
+
+	private void _setStagingAttribute(
+		ServiceContext serviceContext, String key, Object value) {
+
+		serviceContext.setAttribute(
+			StagingConstants.STAGED_PREFIX + key + StringPool.DOUBLE_DASH,
+			String.valueOf(value));
+	}
+
 	@Inject(filter = "javax.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR)
 	private ExportImportPortletPreferencesProcessor
 		_exportImportPortletPreferencesProcessor;

modules/apps/change-tracking/change-tracking-api/src/main/java/com/liferay/change/tracking/configuration/CTConflictConfiguration.java

@@ -29,4 +29,11 @@ public interface CTConflictConfiguration {
 	)
 	public boolean modificationDeletionConflictCheckEnabled();
 
+	@Meta.AD(
+		deflt = "false",
+		description = "schema-version-check-enabled-description",
+		name = "schema-version-check-enabled", required = false
+	)
+	public boolean schemaVersionCheckEnabled();
+
 }

modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/util/CTSchemaVersionHelper.java

@@ -31,6 +31,12 @@
 public class CTSchemaVersionHelper {
 
 	public void expireCTCollection(CTCollection ctCollection) {
+		if (_ctSchemaVersionLocalService.isLatestCTSchemaVersion(
+				ctCollection.getSchemaVersionId())) {
+
+			return;
+		}
+
 		try {
 			Map<Long, List<ConflictInfo>> conflictMap =
 				_ctCollectionLocalService.checkConflicts(ctCollection);

modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/service/impl/CTSchemaVersionLocalServiceImpl.java

@@ -5,11 +5,17 @@
 
 package com.liferay.change.tracking.service.impl;
 
+import com.liferay.change.tracking.configuration.CTConflictConfiguration;
 import com.liferay.change.tracking.model.CTSchemaVersion;
 import com.liferay.change.tracking.service.base.CTSchemaVersionLocalServiceBaseImpl;
 import com.liferay.portal.aop.AopService;
+import com.liferay.portal.configuration.module.configuration.ConfigurationProvider;
 import com.liferay.portal.kernel.dao.orm.QueryUtil;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.model.Release;
+import com.liferay.portal.kernel.module.configuration.ConfigurationException;
+import com.liferay.portal.kernel.security.auth.CompanyThreadLocal;
 import com.liferay.portal.kernel.service.ReleaseLocalService;
 import com.liferay.portal.kernel.version.Version;
 
@@ -27,6 +33,7 @@
  * @author Preston Crary
  */
 @Component(
+	configurationPid = "com.liferay.change.tracking.configuration.CTConflictConfiguration",
 	property = "model.class.name=com.liferay.change.tracking.model.CTSchemaVersion",
 	service = AopService.class
 )
@@ -74,6 +81,24 @@ public CTSchemaVersion getLatestCTSchemaVersion(long companyId) {
 	public boolean isLatestCTSchemaVersion(
 		CTSchemaVersion ctSchemaVersion, boolean strict) {
 
+		try {
+			CTConflictConfiguration ctConflictConfiguration =
+				_configurationProvider.getCompanyConfiguration(
+					CTConflictConfiguration.class,
+					CompanyThreadLocal.getCompanyId());
+
+			if (!ctConflictConfiguration.schemaVersionCheckEnabled()) {
+				return true;
+			}
+		}
+		catch (ConfigurationException configurationException) {
+			_log.error(configurationException);
+		}
+
+		if (ctSchemaVersion == null) {
+			return false;
+		}
+
 		Map<String, Serializable> schemaContext =
 			ctSchemaVersion.getSchemaContext();
 
@@ -119,13 +144,15 @@ public boolean isLatestCTSchemaVersion(long ctSchemaVersionId) {
 		CTSchemaVersion ctSchemaVersion =
 			ctSchemaVersionPersistence.fetchByPrimaryKey(ctSchemaVersionId);
 
-		if (ctSchemaVersion == null) {
-			return false;
-		}
-
 		return isLatestCTSchemaVersion(ctSchemaVersion, false);
 	}
 
+	private static final Log _log = LogFactoryUtil.getLog(
+		CTSchemaVersionLocalServiceImpl.class);
+
+	@Reference
+	private ConfigurationProvider _configurationProvider;
+
 	@Reference
 	private ReleaseLocalService _releaseLocalService;
 

modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/instance/lifecycle/test/CheckCTSchemaVersionPortalInstanceLifecycleListenerTest.java

@@ -68,7 +68,7 @@ public void testPortalInstanceRegistered() throws Exception {
 		ctCollection = _ctCollectionLocalService.fetchCTCollection(
 			ctCollection.getCtCollectionId());
 
-		Assert.assertNotEquals(
+		Assert.assertEquals(
 			ctSchemaVersion.getSchemaVersionId(),
 			ctCollection.getSchemaVersionId());
 		Assert.assertEquals(