LPS-74205 Build lang

modules/apps/adaptive-media/.gitrepo

@@ -4,8 +4,8 @@
 [subrepo]
 	autopull = true
 	cmdver = liferay
-	commit = de02f7fea2c8b59646d2c649349275e400806126
+	commit = c23d8da1016726a116c08493d53ae3b8ad82e484
 	mergebuttonmergecommits = false
 	mode = pull
-	parent = c9f142ef897189e0c5b6404e1ab7c67706fa70b3
+	parent = 07aaa5ab7448a3bae68ed48d849dd790c37c6120
 	remote = git@github.com:liferay/com-liferay-adaptive-media.git

modules/apps/adaptive-media/adaptive-media-api/build.gradle

@@ -5,7 +5,7 @@ dependencies {
 	provided group: "biz.aQute.bnd", name: "biz.aQute.bndlib", version: "3.1.0"
 	provided group: "com.liferay", name: "com.liferay.osgi.service.tracker.collections", version: "2.0.0"
 	provided group: "com.liferay", name: "com.liferay.portal.configuration.metatype", version: "2.0.0"
-	provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0"
+	provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.49.0"
 	provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
 	provided group: "org.osgi", name: "org.osgi.core", version: "5.0.0"
 	provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"

modules/apps/adaptive-media/adaptive-media-api/src/main/java/com/liferay/adaptive/media/internal/processor/AMAsyncProcessorImpl.java

@@ -23,6 +23,7 @@
 import com.liferay.portal.kernel.messaging.Message;
 import com.liferay.portal.kernel.messaging.MessageBus;
 import com.liferay.portal.kernel.transaction.TransactionCommitCallbackUtil;
+import com.liferay.portal.kernel.util.StringBundler;
 import com.liferay.portal.kernel.util.Validator;
 
 import java.util.List;
@@ -51,9 +52,10 @@ public void cleanQueue(
 
 		if (_log.isInfoEnabled()) {
 			_log.info(
-				"Cleaned queue for model ID " + modelId +
-					" and adaptive media processor command " +
-						amProcessorCommand);
+				StringBundler.concat(
+					"Cleaned queue for model ID ", modelId,
+					" and adaptive media processor command ",
+					String.valueOf(amProcessorCommand)));
 		}
 	}
 

modules/apps/adaptive-media/adaptive-media-blogs-editor-configuration/build.gradle

@@ -12,6 +12,7 @@ dependencies {
 	provided project(":apps:adaptive-media:adaptive-media-image-item-selector-api");
 
 	testCompile group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "2.0.0"
+	testCompile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
 	testCompile group: "org.jabsorb", name: "jabsorb", version: "1.3.1"
 	testCompile group: "org.jodd", name: "jodd-bean", version: "3.6.4"
 	testCompile group: "org.jodd", name: "jodd-core", version: "3.6.4"

modules/apps/adaptive-media/adaptive-media-blogs-web/build.gradle

@@ -5,7 +5,7 @@ dependencies {
 	provided group: "com.liferay", name: "com.liferay.blogs.service", version: "1.1.0"
 	provided group: "com.liferay", name: "com.liferay.blogs.web", version: "1.0.0"
 	provided group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "2.0.0"
-	provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0"
+	provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.49.0"
 	provided group: "javax.portlet", name: "portlet-api", version: "2.0"
 	provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
 	provided group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"

modules/apps/adaptive-media/adaptive-media-blogs-web/src/main/java/com/liferay/adaptive/media/blogs/web/internal/blogs/util/AMBlogsEntryAttachmentContentUpdater.java

@@ -17,6 +17,7 @@
 import com.liferay.blogs.util.BlogsEntryAttachmentContentUpdater;
 import com.liferay.portal.kernel.portletfilerepository.PortletFileRepository;
 import com.liferay.portal.kernel.repository.model.FileEntry;
+import com.liferay.portal.kernel.util.StringBundler;
 import com.liferay.portal.kernel.util.StringPool;
 
 import org.osgi.service.component.annotations.Component;
@@ -48,9 +49,10 @@ protected String getBlogsEntryAttachmentFileEntryImgTag(
 		String fileEntryURL = _portletFileRepository.getPortletFileEntryURL(
 			null, blogsEntryAttachmentFileEntry, StringPool.BLANK);
 
-		return "<img data-fileEntryId=\"" +
-			blogsEntryAttachmentFileEntry.getFileEntryId() + "\" src=\"" +
-				fileEntryURL + "\" />";
+		return StringBundler.concat(
+			"<img data-fileEntryId=\"",
+			String.valueOf(blogsEntryAttachmentFileEntry.getFileEntryId()),
+			"\" src=\"", fileEntryURL, "\" />");
 	}
 
 	@Reference

modules/apps/adaptive-media/adaptive-media-docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM liferay/portal-tomcat-mysql:master-7227093900666b12759b383063ac60a03956fa6c
+FROM liferay/portal-tomcat-mysql:master-2089294ff076c896108e5cffcf0efe66b165afad
 MAINTAINER Sergio González <sergio.gonzalez@liferay.com>
 
 RUN rm $LIFERAY_HOME/osgi/modules/com.liferay.adaptive.media*.jar

modules/apps/adaptive-media/adaptive-media-image-content-transformer/build.gradle

@@ -3,6 +3,7 @@ targetCompatibility = "1.8"
 
 dependencies {
 	provided group: "biz.aQute.bnd", name: "biz.aQute.bndlib", version: "3.1.0"
+	provided group: "com.liferay", name: "com.liferay.petra.string", version: "1.0.0"
 	provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0"
 	provided project(":apps:adaptive-media:adaptive-media-api");
 	provided project(":apps:adaptive-media:adaptive-media-content-transformer-api");

modules/apps/adaptive-media/adaptive-media-image-content-transformer/src/test/java/com/liferay/adaptive/media/image/content/transformer/internal/HtmlContentTransformerImplTest.java

@@ -17,9 +17,9 @@
 import com.liferay.adaptive.media.content.transformer.constants.ContentTransformerContentTypes;
 import com.liferay.adaptive.media.image.html.AMImageHTMLTagFactory;
 import com.liferay.document.library.kernel.service.DLAppLocalService;
+import com.liferay.petra.string.CharPool;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.repository.model.FileEntry;
-import com.liferay.portal.kernel.util.CharPool;
 import com.liferay.portal.kernel.util.StringBundler;
 import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.StringUtil;

modules/apps/adaptive-media/adaptive-media-image-web/build.gradle

@@ -30,6 +30,7 @@ classes {
 dependencies {
 	picturefill group: "org.webjars.bower", name: "picturefill", transitive: false, version: pictureFillVersion
 
+	provided group: "com.liferay", name: "com.liferay.petra.string", version: "1.0.0"
 	provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0"
 	provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
 	provided group: "org.osgi", name: "org.osgi.core", version: "5.0.0"

modules/apps/adaptive-media/adaptive-media-image-web/src/test/java/com/liferay/adaptive/media/image/web/internal/html/AMImageHTMLTagFactoryImplTest.java

@@ -17,9 +17,9 @@
 import com.liferay.adaptive.media.image.media.query.Condition;
 import com.liferay.adaptive.media.image.media.query.MediaQuery;
 import com.liferay.adaptive.media.image.media.query.MediaQueryProvider;
+import com.liferay.petra.string.CharPool;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.repository.model.FileEntry;
-import com.liferay.portal.kernel.util.CharPool;
 import com.liferay.portal.kernel.util.StringBundler;
 import com.liferay.portal.kernel.util.StringUtil;
 

modules/apps/adaptive-media/adaptive-media-journal-editor-configuration/build.gradle

@@ -9,6 +9,7 @@ dependencies {
 	provided project(":apps:adaptive-media:adaptive-media-image-item-selector-api");
 
 	testCompile group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "2.0.0"
+	testCompile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
 	testCompile group: "org.jabsorb", name: "jabsorb", version: "1.3.1"
 	testCompile group: "org.jodd", name: "jodd-bean", version: "3.6.4"
 	testCompile group: "org.jodd", name: "jodd-core", version: "3.6.4"

modules/apps/adaptive-media/adaptive-media-journal-web/todo.bchan

@@ -0,0 +1,10 @@
+1.) In AMJournalTransformerListenerTest
+
+String originalOutput = "some content";
+String transformedOutput = "some transformed content";
+
+String originalScript = "some script content";
+
+Can these be randomString() instead?
+
+Thx.

modules/apps/analytics/.gitrepo

@@ -4,8 +4,8 @@
 [subrepo]
 	autopull = true
 	cmdver = liferay
-	commit = f09913c16cccf4bcf71dba78a7c8b36b53970694
+	commit = 1dc1eee7f37bb9de37408b914e45c49eb56ba296
 	mergebuttonmergecommits = false
 	mode = pull
-	parent = 40e452d095e3c7f2dd93dfeb3fc3cea9b69bcce9
+	parent = e2471e7f7aeafd896607f80216d12a007f15479c
 	remote = git@github.com:liferay/com-liferay-analytics.git