7.0

gradle/.gradle-wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Aug 16 09:11:39 CDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip

gradle/apps/action-command-portlet/build.gradle

@@ -1,4 +1,5 @@
 dependencies {
+	compileOnly group: "com.liferay", name: "com.liferay.petra.lang", version: "3.0.0"
 	compileOnly group: "com.liferay", name: "com.liferay.petra.string", version: "1.1.0"
 	compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0"
 	compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "2.0.0"

gradle/apps/action-command-portlet/src/main/java/com/liferay/blade/samples/portlet/actioncommand/GreeterActionCommand.java

@@ -17,6 +17,8 @@
 package com.liferay.blade.samples.portlet.actioncommand;
 
 import com.liferay.petra.string.StringPool;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
 import com.liferay.portal.kernel.servlet.SessionMessages;
 import com.liferay.portal.kernel.util.ParamUtil;
@@ -26,8 +28,6 @@
 import javax.portlet.PortletException;
 
 import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.log.LogService;
 
 /**
  * @author Liferay
@@ -55,7 +55,9 @@ public boolean processAction(
 	private void _handleActionCommand(ActionRequest actionRequest) {
 		String name = ParamUtil.get(actionRequest, "name", StringPool.BLANK);
 
-		_log.log(LogService.LOG_INFO, "Hello " + name);
+		if (_log.isInfoEnabled()) {
+			_log.info("Hello " + name);
+		}
 
 		String greetingMessage = "Hello " + name + "! Welcome to OSGi";
 
@@ -64,7 +66,7 @@ private void _handleActionCommand(ActionRequest actionRequest) {
 		SessionMessages.add(actionRequest, "greetingMessage", greetingMessage);
 	}
 
-	@Reference
-	private LogService _log;
+	private static final Log _log = LogFactoryUtil.getLog(
+		GreeterActionCommand.class);
 
 }

gradle/apps/action-command-portlet/src/main/resources/META-INF/module-log4j.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-	<category name="osgi.logging.com_liferay_blade_action_command_portlet">
+	<category name="com.liferay.blade.samples.portlet.actioncommand">
 		<priority value="INFO" />
 	</category>
 </log4j:configuration>

gradle/apps/blueprint-portlet/src/main/resources/OSGI-INF/blueprint/blueprint.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 	<service id="com.liferay.blade.samples.portlet.blueprint.BlueprintPortlet.service" interface="javax.portlet.Portlet" ref="com.liferay.blade.samples.portlet.blueprint.BlueprintPortlet">

gradle/apps/configuration-action/build.gradle

@@ -1,7 +1,9 @@
 dependencies {
 	compileOnly group: "biz.aQute.bnd", name: "biz.aQute.bndlib", version: "3.5.0"
+	compileOnly group: "com.liferay", name: "com.liferay.petra.lang", version: "3.0.0"
 	compileOnly group: "com.liferay", name: "com.liferay.portal.configuration.metatype", version: "2.0.0"
 	compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0"
+	compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "2.0.0"
 	compileOnly group: "javax.portlet", name: "portlet-api", version: "2.0"
 	compileOnly group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
 	compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"

gradle/apps/configuration-action/src/main/java/com/liferay/blade/samples/configurationaction/BladeMessagePortlet.java

@@ -18,6 +18,8 @@
 
 import com.liferay.blade.samples.configurationaction.constants.BladeMessagePortletKeys;
 import com.liferay.portal.configuration.metatype.bnd.util.ConfigurableUtil;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
 
 import java.io.IOException;
@@ -32,8 +34,6 @@
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Modified;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.log.LogService;
 
 /**
  * @author Liferay
@@ -61,7 +61,9 @@ public void doView(
 			RenderRequest renderRequest, RenderResponse renderResponse)
 		throws IOException, PortletException {
 
-		_log.log(LogService.LOG_INFO, "Blade Message Portlet render");
+		if (_log.isInfoEnabled()) {
+			_log.info("Blade Message Portlet render");
+		}
 
 		renderRequest.setAttribute(
 			MessageDisplayConfiguration.class.getName(),
@@ -77,8 +79,8 @@ protected void activate(Map<Object, Object> properties) {
 			MessageDisplayConfiguration.class, properties);
 	}
 
-	@Reference
-	private LogService _log;
+	private static final Log _log = LogFactoryUtil.getLog(
+		BladeMessagePortlet.class);
 
 	private volatile MessageDisplayConfiguration _messageDisplayConfiguration;
 

gradle/apps/configuration-action/src/main/java/com/liferay/blade/samples/configurationaction/MessageDisplayConfigurationAction.java

@@ -18,6 +18,8 @@
 
 import com.liferay.blade.samples.configurationaction.constants.BladeMessagePortletKeys;
 import com.liferay.portal.configuration.metatype.bnd.util.ConfigurableUtil;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.portlet.ConfigurationAction;
 import com.liferay.portal.kernel.portlet.DefaultConfigurationAction;
 import com.liferay.portal.kernel.util.ParamUtil;
@@ -35,8 +37,6 @@
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.ConfigurationPolicy;
 import org.osgi.service.component.annotations.Modified;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.log.LogService;
 
 /**
  * @author Liferay
@@ -56,8 +56,9 @@ public void include(
 			HttpServletResponse httpServletResponse)
 		throws Exception {
 
-		_log.log(
-			LogService.LOG_INFO, "Blade Message Portlet configuration include");
+		if (_log.isInfoEnabled()) {
+			_log.info("Blade Message Portlet configuration include");
+		}
 
 		httpServletRequest.setAttribute(
 			MessageDisplayConfiguration.class.getName(),
@@ -72,22 +73,23 @@ public void processAction(
 			ActionResponse actionResponse)
 		throws Exception {
 
-		_log.log(
-			LogService.LOG_INFO, "Blade Message Portlet configuration action");
+		if (_log.isInfoEnabled()) {
+			_log.info("Blade Message Portlet configuration action");
+		}
 
 		String fontColor = ParamUtil.getString(actionRequest, "fontColor");
 		String fontFamily = ParamUtil.getString(actionRequest, "fontFamily");
 		String fontSize = ParamUtil.getString(actionRequest, "fontSize");
 
-		_log.log(
-			LogService.LOG_INFO,
-			"Message Display Configuration: Font Family: " + fontFamily);
-		_log.log(
-			LogService.LOG_INFO,
-			"Message Display Configuration: Font Size: " + fontSize);
-		_log.log(
-			LogService.LOG_INFO,
-			"Message Display Configuration: Font Color: " + fontColor);
+		if (_log.isInfoEnabled()) {
+			_log.info(
+				"Message Display Configuration: Font Family: " + fontFamily);
+
+			_log.info("Message Display Configuration: Font Size: " + fontSize);
+
+			_log.info(
+				"Message Display Configuration: Font Color: " + fontColor);
+		}
 
 		setPreference(actionRequest, "fontColor", fontColor);
 		setPreference(actionRequest, "fontFamily", fontFamily);
@@ -103,8 +105,8 @@ protected void activate(Map<Object, Object> properties) {
 			MessageDisplayConfiguration.class, properties);
 	}
 
-	@Reference
-	private LogService _log;
+	private static final Log _log = LogFactoryUtil.getLog(
+		MessageDisplayConfigurationAction.class);
 
 	private volatile MessageDisplayConfiguration _messageDisplayConfiguration;
 

gradle/apps/configuration-action/src/main/resources/META-INF/module-log4j.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-	<category name="osgi.logging.com_liferay_blade_configuration_action">
+	<category name="com.liferay.blade.samples.configurationaction">
 		<priority value="INFO" />
 	</category>
 </log4j:configuration>

gradle/apps/configuration-action/src/main/resources/META-INF/resources/configuration.jsp

@@ -70,7 +70,7 @@
 			name="fontColor"
 			value="<%= fontColor %>"
 		>
-			<aui:option value="voilet">Voilet</aui:option>
+			<aui:option value="violet">Violet</aui:option>
 			<aui:option value="indigo">Indigo</aui:option>
 			<aui:option value="blue">Blue</aui:option>
 			<aui:option value="green">Green</aui:option>

gradle/apps/configuration-action/src/main/resources/META-INF/resources/init.jsp

@@ -16,9 +16,6 @@
  */
 --%>
 
-<%@ page import="com.liferay.portal.kernel.util.StringPool" %><%@
-page import="com.liferay.portal.kernel.util.Validator" %>
-
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -28,8 +25,9 @@ taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet" %><%@
 taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
 taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %>
 
-<%@page
-	import="com.liferay.blade.samples.configurationaction.MessageDisplayConfiguration" %>
+<%@ page import="com.liferay.blade.samples.configurationaction.MessageDisplayConfiguration" %><%@
+page import="com.liferay.portal.kernel.util.StringPool" %><%@
+page import="com.liferay.portal.kernel.util.Validator" %>
 
 <liferay-theme:defineObjects />
 
@@ -45,13 +43,10 @@ taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %>
 	String fontSize = StringPool.BLANK;
 
 	if (Validator.isNotNull(messageDisplayConfiguration)) {
-		fontFamily =
-			portletPreferences.getValue("fontFamily", messageDisplayConfiguration.fontFamily());
+		fontFamily = portletPreferences.getValue("fontFamily", messageDisplayConfiguration.fontFamily());
 
-		fontColor =
-			portletPreferences.getValue("fontColor", messageDisplayConfiguration.fontColor());
+		fontColor = portletPreferences.getValue("fontColor", messageDisplayConfiguration.fontColor());
 
-		fontSize =
-			portletPreferences.getValue("fontSize", String.valueOf(messageDisplayConfiguration.fontSize()));
+		fontSize = portletPreferences.getValue("fontSize", String.valueOf(messageDisplayConfiguration.fontSize()));
 	}
 %>

gradle/apps/configuration-action/src/main/resources/META-INF/resources/view.jsp

@@ -19,8 +19,7 @@
 <%@ include file="/init.jsp" %>
 
 <%
-boolean doConfigure =
-	Validator.isNull(fontFamily) && Validator.isNull(fontColor) && (Validator.isNull(fontSize) || "0".equals(fontSize));
+boolean doConfigure = Validator.isNull(fontFamily) && Validator.isNull(fontColor) && (Validator.isNull(fontSize) || fontSize.equals("0"));
 %>
 
 <c:choose>

gradle/apps/greedy-policy-option-portlet/service-reference/configs/com.liferay.blade.reluctant.vs.greedy.portlet.portlet.ReluctantPortlet.config

@@ -1 +1 @@
-_someService.target="(component.name\=com.liferay.blade.reluctant.vs.greedy.service.HigherRankedService)"
+_someService.target="(component.name\=com.liferay.blade.reluctant.vs.greedy.service.HigherRankedService)"

gradle/apps/greedy-policy-option-portlet/service-reference/src/main/java/com/liferay/blade/reluctant/vs/greedy/portlet/portlet/GreedyPortlet.java

@@ -60,7 +60,7 @@ public void doView(
 		super.doView(renderRequest, renderResponse);
 	}
 
-	@Reference (policyOption = ReferencePolicyOption.GREEDY)
+	@Reference(policyOption = ReferencePolicyOption.GREEDY)
 	private SomeService _someService;
 
 }

gradle/apps/jsp-portlet/build.gradle

@@ -1,5 +1,6 @@
 dependencies {
 	compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0"
+	compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "2.0.0"
 	compileOnly group: "javax.portlet", name: "portlet-api", version: "2.0"
 	compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
 }

gradle/apps/jsp-war-portlet/src/main/java/com/liferay/blade/samples/portlet/JSPWARPortlet.java

@@ -16,9 +16,9 @@
 
 package com.liferay.blade.samples.portlet;
 
-import com.liferay.blade.samples.servicebuilder.model.Foo;
-import com.liferay.blade.samples.servicebuilder.service.FooLocalService;
-import com.liferay.blade.samples.servicebuilder.service.FooLocalServiceUtil;
+import com.liferay.blade.basic.model.Foo;
+import com.liferay.blade.basic.service.FooLocalService;
+import com.liferay.blade.basic.service.FooLocalServiceUtil;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
@@ -109,7 +109,7 @@ public void updateFoo(
 			foo.setField5(field5);
 			foo.isNew();
 
-			getFooLocalService().addFooWithoutId(foo);
+			getFooLocalService().addFoo(foo);
 		}
 		else {
 			if (_log.isInfoEnabled()) {

gradle/apps/jsp-war-portlet/src/main/webapp/view.jsp

@@ -24,11 +24,11 @@ page import="com.liferay.portal.kernel.log.LogFactoryUtil" %>
 <strong><liferay-ui:message key="welcome-to-the-blade-liferay-mvc-service-builder-web" /></strong>
 
 <%
-	int count = fooLocalService.getFoosCount();
+int count = fooLocalService.getFoosCount();
 
-	Log log = LogFactoryUtil.getLog("com.liferay.blade.samples.portlet.jsp.view");
+Log log = LogFactoryUtil.getLog("com.liferay.blade.samples.portlet.jsp.view");
 
-	log.info("Have " + count + " records.");
+log.info("Have " + count + " records.");
 %>
 
 <aui:button-row>

gradle/apps/kotlin-portlet/build.gradle

@@ -1,15 +1,5 @@
-buildscript {
-	dependencies {
-		classpath group: "org.jetbrains.kotlin", name: "kotlin-gradle-plugin", version: "1.1.2"
-	}
-	repositories {
-		jcenter()
-	}
-}
-
-apply plugin: 'kotlin'
-
 dependencies {
+	compileOnly group: "com.liferay", name: "com.liferay.petra.lang", version: "3.0.0"
 	compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0"
 	compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "2.0.0"
 	compileOnly group: "javax.portlet", name: "portlet-api", version: "2.0"

gradle/apps/kotlin-portlet/src/main/resources/META-INF/resources/init.jsp

@@ -16,8 +16,6 @@
  */
 --%>
 
-<%@ page import="com.liferay.blade.samples.portlet.kotlin.constants.KotlinGreeterPortletKeys" %>
-
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -27,6 +25,8 @@ taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet" %><%@
 taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
 taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %>
 
+<%@ page import="com.liferay.blade.samples.portlet.kotlin.constants.KotlinGreeterPortletKeys" %>
+
 <liferay-theme:defineObjects />
 
 <portlet:defineObjects />

gradle/apps/npm/angular-npm-portlet/README.markdown

@@ -1,7 +1,7 @@
 # Angular npm Portlet
 
-**Important:** This sample works for Liferay DXP Fix Pack 30+ and Liferay Portal
-CE GA5+.
+**Important:** This sample works for Liferay DXP Fix Pack 44+ and Liferay Portal
+CE GA7+. The minifier fails on Liferay DXP 7.0 when JSDoc is present in a portlet. To resolve this, use Grunt uglify to remove the JSDoc comments. This process may take a long time, depending on the number of files that require an update.
 
 The Angular npm Portlet sample provides a portlet that uses the
 [Angular](https://angular.io/) framework to render its output.