LPS-84493

modules/apps/asset/asset-link-test/bnd.bnd

@@ -3,5 +3,4 @@ Bundle-SymbolicName: com.liferay.asset.link.test
 Bundle-Version: 1.0.0
 -includeresource:\
 	test-classes/integration,\
-	@lib/com.liferay.bookmarks.test.jar!/com/liferay/bookmarks/util/test/BookmarksTestUtil.class,\
-	@lib/com.liferay.journal.test.jar!/com/liferay/journal/test/util/JournalTestUtil.class
+	@lib/com.liferay.bookmarks.test.jar!/com/liferay/bookmarks/util/test/BookmarksTestUtil.class

modules/apps/asset/asset-publisher-test/bnd.bnd

@@ -1,6 +1,4 @@
 Bundle-Name: Liferay Asset Publisher Test
 Bundle-SymbolicName: com.liferay.asset.publisher.test
 Bundle-Version: 1.0.0
--includeresource:\
-	test-classes/integration,\
-	@lib/com.liferay.journal.test.jar!/com/liferay/journal/test/util/JournalTestUtil.class
+-includeresource: test-classes/integration

modules/apps/asset/asset-test/bnd.bnd

@@ -3,5 +3,4 @@ Bundle-SymbolicName: com.liferay.asset.test
 Bundle-Version: 1.0.0
 -includeresource:\
 	test-classes/integration,\
-	@lib/com.liferay.bookmarks.test.jar!/com/liferay/bookmarks/util/test/BookmarksTestUtil.class,\
-	@lib/com.liferay.journal.test.jar!/com/liferay/journal/test/util/JournalTestUtil.class
+	@lib/com.liferay.bookmarks.test.jar!/com/liferay/bookmarks/util/test/BookmarksTestUtil.class

modules/apps/asset/asset-test/build.gradle

@@ -7,7 +7,6 @@ copyLibs {
 
 dependencies {
 	compileOnly project(":apps:bookmarks:bookmarks-test")
-	compileOnly project(":apps:journal:journal-test")
 
 	testIntegrationCompile group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
 	testIntegrationCompile group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"

modules/apps/export-import/export-import-test/bnd.bnd

@@ -3,5 +3,4 @@ Bundle-SymbolicName: com.liferay.exportimport.test
 Bundle-Version: 1.0.0
 -includeresource:\
 	test-classes/integration,\
-	@lib/com.liferay.bookmarks.test.jar!/com/liferay/bookmarks/util/test/BookmarksTestUtil.class,\
-	@lib/com.liferay.journal.test.jar!/com/liferay/journal/test/util/JournalTestUtil.class
+	@lib/com.liferay.bookmarks.test.jar!/com/liferay/bookmarks/util/test/BookmarksTestUtil.class

modules/apps/frontend-compatibility/frontend-compatibility-ie/build.gradle

@@ -1,6 +1,7 @@
 import com.liferay.gradle.util.copy.StripPathSegmentsAction
 
 configurations {
+	arrayFill
 	arrayFind
 	arrayFrom
 	fetch
@@ -10,6 +11,7 @@ configurations {
 	urlSearchParams
 }
 
+task buildArrayFill(type: Copy)
 task buildArrayFind(type: Copy)
 task buildArrayFrom(type: Copy)
 task buildFetch(type: Copy)
@@ -18,6 +20,22 @@ task buildObjectEntries(type: Copy)
 task buildObjectValues(type: Copy)
 task buildUrlSearchParams(type: Copy)
 
+buildArrayFill {
+	eachFile new StripPathSegmentsAction(5)
+
+	from {
+		zipTree(configurations.arrayFill.singleFile)
+	}
+
+	include "META-INF/resources/webjars/array.prototype.fill/1.0.2/index.js"
+	includeEmptyDirs = false
+	into "classes/META-INF/resources"
+
+	rename {
+		it.replace "index", "array.fill"
+	}
+}
+
 buildArrayFind {
 	eachFile new StripPathSegmentsAction(5)
 
@@ -127,6 +145,7 @@ buildUrlSearchParams {
 }
 
 classes {
+	dependsOn buildArrayFill
 	dependsOn buildArrayFind
 	dependsOn buildArrayFrom
 	dependsOn buildFetch
@@ -137,6 +156,8 @@ classes {
 }
 
 dependencies {
+	arrayFill group: "org.webjars.npm", name: "array.prototype.fill", transitive: false, version: "1.0.2"
+
 	arrayFind group: "org.webjars.bower", name: "Array.prototype.find", transitive: false, version: "1.0.0"
 
 	arrayFrom group: "org.webjars.npm", name: "mdn-polyfills", transitive: false, version: "5.8.0"

modules/apps/frontend-compatibility/frontend-compatibility-ie/src/main/java/com/liferay/frontend/compatibility/ie/internal/servlet/taglib/IETopHeadDynamicInclude.java

@@ -71,8 +71,9 @@ public void register(DynamicIncludeRegistry dynamicIncludeRegistry) {
 	}
 
 	private static final String[] _FILE_NAMES = {
-		"array.find.js", "array.from.js", "fetch.js", "object.assign.js",
-		"object.entries.js", "object.values.js", "url.search.params.js"
+		"array.fill.js", "array.find.js", "array.from.js", "fetch.js",
+		"object.assign.js", "object.entries.js", "object.values.js",
+		"url.search.params.js"
 	};
 
 	@Reference

modules/apps/frontend-theme/frontend-theme-classic/src/css/components/_navbars.scss

@@ -3,6 +3,10 @@
 	padding-top: 0.907rem;
 }
 
+.navbar-blank {
+	flex-wrap: wrap;
+}
+
 .navbar-classic {
 	background-color: #FFF;
 

modules/apps/portal-security/portal-security-ldap-impl/src/main/java/com/liferay/portal/security/ldap/internal/configuration/LDAPServerConfigurationProviderImpl.java

@@ -354,9 +354,13 @@ public void unregisterConfiguration(String pid) {
 			Long ldapServerId = _pidServerConfigurations.remove(pid);
 
 			Map<Long, ObjectValuePair<Configuration, LDAPServerConfiguration>>
+				objectValuePairs = null;
+
+			if (companyId != null) {
 				objectValuePairs = _configurations.get(companyId);
+			}
 
-			if (!MapUtil.isEmpty(objectValuePairs)) {
+			if ((ldapServerId != null) && !MapUtil.isEmpty(objectValuePairs)) {
 				objectValuePairs.remove(ldapServerId);
 			}
 		}

modules/apps/portal-workflow/portal-workflow-web/src/main/java/com/liferay/portal/workflow/web/internal/display/context/WorkflowDefinitionDisplayContext.java

@@ -123,7 +123,10 @@ public JSPCreationMenu getCreationMenu(PageContext pageContext) {
 						dropdownItem.setHref(
 							response.createRenderURL(), "mvcPath",
 							"/definition/edit_workflow_definition.jsp");
-						dropdownItem.setLabel("new-workflow");
+						dropdownItem.setLabel(
+							LanguageUtil.get(
+								_workflowDefinitionRequestHelper.getRequest(),
+								"new-workflow"));
 					});
 			}
 		};

modules/apps/staging/staging-bar-web/src/main/resources/META-INF/resources/css/main.scss

@@ -200,4 +200,8 @@
 		right: 0;
 		top: 100%;
 	}
+}
+
+.header-title-with-overflow {
+	overflow: visible !important;
 }

modules/apps/staging/staging-bar-web/src/main/resources/META-INF/resources/merge_layout_set_branch.jsp

@@ -32,72 +32,74 @@ if (layoutSetBranches.contains(layoutSetBranch)) {
 }
 %>
 
-<div class="site-pages-variation taglib-header">
-	<a class="icon-monospaced list-unstyled portlet-icon-back text-default" href="<%= HtmlUtil.escapeAttribute(redirect) %>" title="<%= HtmlUtil.escapeAttribute(LanguageUtil.get(resourceBundle, "back")) %>">
-		<liferay-ui:icon
-			icon="angle-left"
-			markupView="lexicon"
-		/>
-	</a>
-
-	<h3 class="header-title">
-		<span>
-			<%= HtmlUtil.escape(LanguageUtil.get(resourceBundle, "merge-site-pages-variation")) %>
-		</span>
-	</h3>
-</div>
-
-<div id="<portlet:namespace />mergeLayoutSetBranch">
-	<portlet:actionURL name="mergeLayoutSetBranch" var="mergeLayoutSetBranchURL">
-		<portlet:param name="mvcRenderCommandName" value="viewLayoutSetBranches" />
-	</portlet:actionURL>
-
-	<aui:form action="<%= mergeLayoutSetBranchURL %>" enctype="multipart/form-data" method="post" name="fm4">
-		<aui:input name="redirect" type="hidden" value="<%= redirect %>" />
-		<aui:input name="groupId" type="hidden" value="<%= groupId %>" />
-		<aui:input name="layoutSetBranchId" type="hidden" value="<%= layoutSetBranchId %>" />
-		<aui:input name="mergeLayoutSetBranchId" type="hidden" />
-
-		<liferay-ui:search-container
-			id="layoutSetBranchesSearchContainer"
-			total="<%= layoutSetBranches.size() %>"
-		>
-			<liferay-ui:search-container-results
-				results="<%= layoutSetBranches %>"
+<div class="container-fluid-1280">
+	<div class="site-pages-variation taglib-header">
+		<a class="icon-monospaced list-unstyled portlet-icon-back text-default" href="<%= HtmlUtil.escapeAttribute(redirect) %>" title="<%= HtmlUtil.escapeAttribute(LanguageUtil.get(resourceBundle, "back")) %>">
+			<liferay-ui:icon
+				icon="angle-left"
+				markupView="lexicon"
 			/>
-
-			<liferay-ui:search-container-row
-				className="com.liferay.portal.kernel.model.LayoutSetBranch"
-				escapedModel="<%= true %>"
-				keyProperty="layoutSetBranchId"
-				modelVar="curLayoutSetBranch"
+		</a>
+
+		<h3 class="header-title header-title-with-overflow">
+			<span>
+				<%= HtmlUtil.escape(LanguageUtil.get(resourceBundle, "merge-site-pages-variation")) %>
+			</span>
+		</h3>
+	</div>
+
+	<div id="<portlet:namespace />mergeLayoutSetBranch">
+		<portlet:actionURL name="mergeLayoutSetBranch" var="mergeLayoutSetBranchURL">
+			<portlet:param name="mvcRenderCommandName" value="viewLayoutSetBranches" />
+		</portlet:actionURL>
+
+		<aui:form action="<%= mergeLayoutSetBranchURL %>" enctype="multipart/form-data" method="post" name="fm4">
+			<aui:input name="redirect" type="hidden" value="<%= redirect %>" />
+			<aui:input name="groupId" type="hidden" value="<%= groupId %>" />
+			<aui:input name="layoutSetBranchId" type="hidden" value="<%= layoutSetBranchId %>" />
+			<aui:input name="mergeLayoutSetBranchId" type="hidden" />
+
+			<liferay-ui:search-container
+				id="layoutSetBranchesSearchContainer"
+				total="<%= layoutSetBranches.size() %>"
 			>
-
-				<%
-				long curLayoutSetBranchId = curLayoutSetBranch.getLayoutSetBranchId();
-
-				String layoutSetBranchDisplayName = layoutSetBranchDisplayContext.getLayoutSetBranchDisplayName(curLayoutSetBranch);
-				%>
-
-				<liferay-ui:search-container-column-text
-					name="branch"
-					value="<%= layoutSetBranchDisplayName %>"
+				<liferay-ui:search-container-results
+					results="<%= layoutSetBranches %>"
 				/>
 
-				<liferay-ui:search-container-column-text>
-					<a class="layout-set-branch" data-layoutSetBranchId="<%= curLayoutSetBranchId %>" data-layoutSetBranchMessage="<%= LanguageUtil.format(request, "are-you-sure-you-want-to-merge-changes-from-x", layoutSetBranchDisplayName, false) %>" data-layoutSetBranchName="<%= HtmlUtil.escapeAttribute(curLayoutSetBranch.getName()) %>" href="#" id="<portlet:namespace /><%= curLayoutSetBranchId %>" onClick="<portlet:namespace />selectLayoutSetBranch('<%= curLayoutSetBranchId %>');">
-						<liferay-ui:message key="select" />
-					</a>
-				</liferay-ui:search-container-column-text>
-			</liferay-ui:search-container-row>
-
-			<liferay-ui:search-iterator
-				markupView="lexicon"
-				paginate="<%= false %>"
-				searchContainer="<%= searchContainer %>"
-			/>
-		</liferay-ui:search-container>
-	</aui:form>
+				<liferay-ui:search-container-row
+					className="com.liferay.portal.kernel.model.LayoutSetBranch"
+					escapedModel="<%= true %>"
+					keyProperty="layoutSetBranchId"
+					modelVar="curLayoutSetBranch"
+				>
+
+					<%
+					long curLayoutSetBranchId = curLayoutSetBranch.getLayoutSetBranchId();
+
+					String layoutSetBranchDisplayName = layoutSetBranchDisplayContext.getLayoutSetBranchDisplayName(curLayoutSetBranch);
+					%>
+
+					<liferay-ui:search-container-column-text
+						name="branch"
+						value="<%= layoutSetBranchDisplayName %>"
+					/>
+
+					<liferay-ui:search-container-column-text>
+						<a class="layout-set-branch" data-layoutSetBranchId="<%= curLayoutSetBranchId %>" data-layoutSetBranchMessage="<%= LanguageUtil.format(request, "are-you-sure-you-want-to-merge-changes-from-x", layoutSetBranchDisplayName, false) %>" data-layoutSetBranchName="<%= HtmlUtil.escapeAttribute(curLayoutSetBranch.getName()) %>" href="#" id="<portlet:namespace /><%= curLayoutSetBranchId %>" onClick="<portlet:namespace />selectLayoutSetBranch('<%= curLayoutSetBranchId %>');">
+							<liferay-ui:message key="select" />
+						</a>
+					</liferay-ui:search-container-column-text>
+				</liferay-ui:search-container-row>
+
+				<liferay-ui:search-iterator
+					markupView="lexicon"
+					paginate="<%= false %>"
+					searchContainer="<%= searchContainer %>"
+				/>
+			</liferay-ui:search-container>
+		</aui:form>
+	</div>
 </div>
 
 <aui:script>

modules/apps/staging/staging-test/bnd.bnd

@@ -1,6 +1,4 @@
 Bundle-Name: Liferay Staging Test
 Bundle-SymbolicName: com.liferay.staging.test
 Bundle-Version: 1.0.0
--includeresource:\
-	test-classes/integration,\
-	@lib/com.liferay.journal.test.jar!/com/liferay/journal/test/util/JournalTestUtil.class
+-includeresource: test-classes/integration

modules/build-buildscript.gradle

@@ -1,5 +1,5 @@
 dependencies {
-	classpath group: "com.liferay", name: "com.liferay.gradle.plugins.defaults", version: "5.5.18"
+	classpath group: "com.liferay", name: "com.liferay.gradle.plugins.defaults", version: "5.5.19"
 	classpath group: "com.liferay", name: "com.liferay.gradle.plugins.maven.plugin.builder", version: "1.2.1"
 	classpath group: "de.undercouch", name: "gradle-download-task", version: "3.3.0"
 	classpath group: "gradle.plugin.org.ysb33r.gradle", name: "gradletest", version: "1.1"

modules/sdk/gradle-plugins-defaults/CHANGELOG.markdown

@@ -4367,6 +4367,12 @@ applies the `com.liferay.test.integration.base` plugin. Configure the
 - [LPS-83790]: Update the [Liferay Gradle Plugins] dependency to version
 3.12.110.
 
+## 5.5.18 - 2018-08-20
+
+### Changed
+- [LPS-84624]: The `com.liferay.spring.boot.defaults` plugin configures the
+`test` and `testIntegration` tasks with sensible defaults.
+
 [Find Security Bugs]: https://github.com/liferay/liferay-portal/tree/master/modules/third-party/com-h3xstream-findsecbugs
 [Gradle Dependency Management]: https://github.com/spring-gradle-plugins/dependency-management-plugin
 [Gradle License Report]: https://github.com/jk1/Gradle-License-Report
@@ -4827,6 +4833,7 @@ applies the `com.liferay.test.integration.base` plugin. Configure the
 [LPS-84307]: https://issues.liferay.com/browse/LPS-84307
 [LPS-84313]: https://issues.liferay.com/browse/LPS-84313
 [LPS-84473]: https://issues.liferay.com/browse/LPS-84473
+[LPS-84624]: https://issues.liferay.com/browse/LPS-84624
 [LRDOCS-2594]: https://issues.liferay.com/browse/LRDOCS-2594
 [LRDOCS-2841]: https://issues.liferay.com/browse/LRDOCS-2841
 [LRDOCS-2981]: https://issues.liferay.com/browse/LRDOCS-2981

modules/sdk/gradle-plugins-defaults/bnd.bnd

@@ -1,6 +1,6 @@
 Bundle-Name: Liferay Gradle Plugins Defaults
 Bundle-SymbolicName: com.liferay.gradle.plugins.defaults
-Bundle-Version: 5.5.19
+Bundle-Version: 5.5.20
 Export-Package:\
 	com.liferay.gradle.plugins.defaults,\
 	com.liferay.gradle.plugins.defaults.extensions,\

modules/sdk/gradle-plugins-defaults/build.gradle

@@ -10,7 +10,7 @@ configurations {
 
 dependencies {
 	compile group: "com.gradle.publish", name: "plugin-publish-plugin", version: "0.9.9"
-	compile group: "com.liferay", name: "com.liferay.gradle.plugins", version: "3.12.110"
+	compile group: "com.liferay", name: "com.liferay.gradle.plugins", version: "3.12.111"
 	compile group: "com.liferay", name: "com.liferay.gradle.plugins.app.javadoc.builder", version: "1.2.0"
 	compile group: "com.liferay", name: "com.liferay.gradle.plugins.baseline", version: "1.3.1"
 	compile group: "com.liferay", name: "com.liferay.gradle.plugins.cache", version: "1.0.12"