[Log4j]LPS-125550

build-common-plugin.xml

@@ -626,59 +626,6 @@
 		/>
 	</target>
 
-	<target name="format-wsdl">
-		<path id="xml.formatter.classpath">
-			<fileset dir="${sdk.dir}/dependencies/com.liferay.xml.formatter/lib" includes="*.jar" />
-		</path>
-
-		<for param="wsdl.full.path">
-			<path>
-				<fileset
-					dir="."
-					includes="docroot/WEB-INF/wsdl/*.wsdl,docroot/WEB-INF/wsdl/**/*.wsdl"
-				/>
-			</path>
-			<sequential>
-				<java
-					classname="com.liferay.xml.formatter.XMLFormatter"
-					classpathref="xml.formatter.classpath"
-					fork="true"
-					newenvironment="true"
-				>
-					<jvmarg value="-Dxml.formatter.file=@{wsdl.full.path}" />
-					<jvmarg value="-Dxml.formatter.strip.comments=true" />
-				</java>
-			</sequential>
-		</for>
-	</target>
-
-	<target name="format-xsd">
-		<path id="xml.formatter.classpath">
-			<fileset dir="${sdk.dir}/dependencies/com.liferay.xml.formatter/lib" includes="*.jar" />
-		</path>
-
-		<for param="xsd.full.path">
-			<path>
-				<fileset
-					dir="."
-					includes="docroot/WEB-INF/xsd/*.xsd,docroot/WEB-INF/xsd/**/*.xsd"
-				/>
-			</path>
-			<sequential>
-				<java
-					classname="com.liferay.xml.formatter.XMLFormatter"
-					classpathref="xml.formatter.classpath"
-					fork="true"
-					newenvironment="true"
-				>
-					<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
-					<jvmarg value="-Dxml.formatter.file=@{xsd.full.path}" />
-					<jvmarg value="-Dxml.formatter.strip.comments=true" />
-				</java>
-			</sequential>
-		</for>
-	</target>
-
 	<target depends="publish-local-m2-release" name="install" />
 
 	<target depends="javadoc" name="jar-javadoc">

build-common.xml

@@ -61,7 +61,7 @@
 	<path id="plugin.classpath">
 		<path refid="plugin-lib.classpath" />
 		<fileset dir="${app.server.lib.global.dir}" includes="*.jar" />
-		<fileset dir="${app.server.lib.portal.dir}" includes="annotations.jar,commons-logging.jar,log4j.jar,util-bridges.jar,util-java.jar,util-taglib.jar" />
+		<fileset dir="${app.server.lib.portal.dir}" includes="${required.portal.jars}" />
 		<fileset dir="${sdk.dir}/dependencies/aQute.bnd/lib" includes="*.jar" />
 		<fileset dir="${sdk.dir}/lib" includes="activation.jar,javax.servlet-api.jar,jsp-api.jar,mail.jar" />
 	</path>
@@ -162,10 +162,10 @@ Error-Prone was automatically installed. Please rerun your task.
 				outputproperty="build-css.output"
 			>
 				<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
-				<arg value="sass.compiler.class.name=${sass.compiler.class.name}" />
-				<arg value="sass.dir=/" />
-				<arg value="sass.docroot.dir=@{sass.docroot.dir}" />
-				<arg value="sass.portal.common.path=${sdk.dir}/dependencies/com.liferay.css.builder/lib/com.liferay.frontend.css.common.jar" />
+				<arg value="--base-dir=@{sass.docroot.dir}" />
+				<arg value="--compiler=${sass.compiler.class.name}" />
+				<arg value="--dir-names=/" />
+				<arg value="--import-paths=${sdk.dir}/dependencies/com.liferay.css.builder/lib/com.liferay.frontend.css.common.jar" />
 			</java>
 
 			<if>

build.gradle

@@ -32,7 +32,7 @@ configure(subprojects.findAll {!it.childProjects}) {
 		openCVVersion = "2.4.10-0.10"
 		poshiProperties << _getTestProperties(project)
 		poshiPropertiesFile = rootProject.file("${baseDir}/test.properties")
-		version = "1.0.82"
+		version = "1.0.258"
 	}
 
 	repositories {

build.properties

@@ -333,7 +333,7 @@
     ivy.home=${sdk.dir}/.ivy
 
     #ivy.jar.url=http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar
-    ivy.jar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-snapshots/com/liferay/org.apache.ivy/${ivy.version}/org.apache.ivy-${ivy.version}.jar
+    ivy.jar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/org.apache.ivy/${ivy.version}/org.apache.ivy-${ivy.version}.jar
 
     ivy.log.level=quiet
     ivy.pom.developer.name=Brian Wing Shun Chan
@@ -351,7 +351,7 @@
     ivy.resolve.transitive.dependencies=true
 
     #ivy.version=2.4.0
-    ivy.version=2.4.0.LIFERAY-PATCHED-1-SNAPSHOT
+    ivy.version=2.4.0.LIFERAY-PATCHED-1
 
 ##
 ## JMX
@@ -399,7 +399,7 @@
 ## Libraries
 ##
 
-    required.portal.jars=commons-logging.jar,log4j.jar,util-bridges.jar,util-java.jar,util-taglib.jar
+    required.portal.jars=commons-logging.jar,log4j-1.2-api.jar,log4j-api.jar,log4j-core.jar,util-bridges.jar,util-java.jar,util-taglib.jar
 
 ##
 ## Liferay Home

ci.properties

@@ -1 +1 @@
-jira.project.keys=CLDSVCS,LEVP,LOOP,LPS,LRAMF,LRDCOM,LRDOCS,LRIS,LRQA,LRU,SOS,SYNC,ZOE
+jira.project.keys=CLDSVCS,LEVP,LOOP,LPS,LRAMF,LRCI,LRDCOM,LRDOCS,LRIS,LRQA,LRU,SOS,SYNC,ZOE

dependencies/com.liferay.ant.mirrors.get/ivy.xml

@@ -11,6 +11,6 @@
 	</info>
 
 	<dependencies defaultconf="default">
-		<dependency name="com.liferay.ant.mirrors.get" org="com.liferay" rev="1.2.6" />
+		<dependency name="com.liferay.ant.mirrors.get" org="com.liferay" rev="1.2.9" />
 	</dependencies>
 </ivy-module>

dependencies/com.liferay.ant.mirrors.get/ivy.xml.MD5

@@ -1 +1 @@
-438823cb7bd7242d50cfbcf2132f0106
+caded0fcd1ab354826efaa0ac5a48bfc

dependencies/com.liferay.css.builder/ivy.xml

@@ -11,7 +11,7 @@
 	</info>
 
 	<dependencies defaultconf="default">
-		<dependency name="com.liferay.css.builder" org="com.liferay" rev="2.1.0" />
+		<dependency name="com.liferay.css.builder" org="com.liferay" rev="3.0.0" />
 		<dependency name="com.liferay.frontend.css.common" org="com.liferay" rev="2.0.4" />
 		<dependency name="com.liferay.frontend.theme.admin.web" org="com.liferay" rev="1.0.3" />
 		<dependency name="com.liferay.frontend.theme.classic.web" org="com.liferay" rev="2.0.2" />

dependencies/com.liferay.css.builder/ivy.xml.MD5

@@ -1 +1 @@
-4bf676cbc94586910948c57c567a36c7
+8931b17e929a06c49a3958f4962f6830

dependencies/com.liferay.xml.formatter/ivy.xml → dependencies/com.liferay.portal.tools.rest.builder/ivy.xml

@@ -6,11 +6,11 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
 >
-	<info module="com.liferay.sdk.dependencies.com.liferay.xml.formatter" organisation="com.liferay">
+	<info module="com.liferay.sdk.dependencies.com.liferay.portal.tools.rest.builder" organisation="com.liferay">
 		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
 	</info>
 
 	<dependencies defaultconf="default">
-		<dependency name="com.liferay.xml.formatter" org="com.liferay" rev="1.0.5" />
+		<dependency name="com.liferay.portal.tools.rest.builder" org="com.liferay" rev="1.0.24" />
 	</dependencies>
 </ivy-module>

dependencies/com.liferay.portal.tools.rest.builder/ivy.xml.MD5

@@ -0,0 +1 @@
+2db29cc47a1b25cee29bcb18dd06ac9b

dependencies/com.liferay.portal.tools.service.builder/ivy.xml

@@ -11,6 +11,7 @@
 	</info>
 
 	<dependencies defaultconf="default">
-		<dependency name="com.liferay.portal.tools.service.builder" org="com.liferay" rev="1.0.228" />
+		<dependency name="com.liferay.portal.kernel" org="com.liferay.portal" rev="2.50.0" />
+		<dependency name="com.liferay.portal.tools.service.builder" org="com.liferay" rev="1.0.367" />
 	</dependencies>
 </ivy-module>

dependencies/com.liferay.portal.tools.service.builder/ivy.xml.MD5

@@ -1 +1 @@
-462df3e2ea70ba14c39375421776ecc3
+d381dc10095d2b8862dc2cfa2775b482

dependencies/com.liferay.portal.tools.upgrade.table.builder/ivy.xml

@@ -11,6 +11,6 @@
 	</info>
 
 	<dependencies defaultconf="default">
-		<dependency name="com.liferay.portal.tools.upgrade.table.builder" org="com.liferay" rev="1.0.9" />
+		<dependency name="com.liferay.portal.tools.upgrade.table.builder" org="com.liferay" rev="1.0.10" />
 	</dependencies>
 </ivy-module>

dependencies/com.liferay.portal.tools.upgrade.table.builder/ivy.xml.MD5

@@ -1 +1 @@
-9996fde43c0d06231e6c6996ffbe89d9
+0a9c5d03f412d03c14c16345344224af

dependencies/com.liferay.source.formatter/ivy.xml

@@ -11,6 +11,6 @@
 	</info>
 
 	<dependencies defaultconf="default">
-		<dependency name="com.liferay.source.formatter" org="com.liferay" rev="1.0.704" />
+		<dependency name="com.liferay.source.formatter" org="com.liferay" rev="1.0.1049" />
 	</dependencies>
 </ivy-module>

dependencies/com.liferay.source.formatter/ivy.xml.MD5

@@ -1 +1 @@
-55f2ad70234aed2e91e553963377380b
+40fed57244c02ddd404c574ba25f3ddd

ext/sample-ext/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+,7.4.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1

hooks/deploy-listener-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1

hooks/email-to-mb-filter-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1

hooks/google-mail-groups-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1

hooks/google-mail-users-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1

hooks/localization-ja-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -2,7 +2,7 @@ author=Liferay, Inc.
 change-log=
 Import-Package: com.liferay.portal.kernel.security.auth
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+,7.4.0+
 long-description=Liferay's Japanese Localization hook customizes Liferay Portal for Japanese users and administrators. With respect to user name input fields and user name display, the hook properly lists the user's surname first and drops the use of any middle name. In addition, the hook adjusts Liferay Portal to use Japanese compatible address fields.
 module-group-id=liferay
 module-incremental-version=1

hooks/localization-zh-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -2,7 +2,7 @@ author=Liferay, Inc.
 change-log=
 Import-Package: com.liferay.portal.kernel.security.auth
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+,7.4.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1

hooks/mongodb-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=This app replaces the backend storage system used for Liferay's "Expando" service framework to use MongoDB instead of the default SQL database used by the rest of Liferay. Many features in Liferay make use of Expandos (such as Document Data Lists and Custom User Attributes). If you need high performance in these areas, consider using MongoDB. MongoDB is an open source, document-oriented NoSQL database. MongoDB focuses on four main things: flexibility, power, speed, and ease of use. MongoDB stores data in JSON documents and contains built-in redundancy and high availability features. For more detail on MongoDB, visit http://mongodb.org. There are multiple portlets included in this app.<br /><br />This app installs as a Liferay service.
 module-group-id=liferay
 module-incremental-version=1

hooks/sample-authverifier-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1

hooks/sample-scripting-executor-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1

hooks/sample-servlet-filter-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1

hooks/sample-struts-action-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1

hooks/sample-wrapper-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1

hooks/social-bookmarks-hook/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=This app adds additional social bookmarks to Liferay's built-in set of Social Bookmarks. These bookmarks can be used by custom apps, and are also used by Liferay's built-in apps such as its Blogs portlet. Social Bookmarks allow users to easily post a reference to Liferay content on their favorite social networking website. In addition, some websites offer counters that can immediately show users how many people have bookmarked a particular piece of user-generated content.
 module-group-id=liferay
 module-incremental-version=1

layouttpl/1-2-1-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=Layout Templates allow you to choose how portlets will be arranged on a page. They are simple table or CSS-based containers into which portlets can be dropped and sit within the body of the page. Liferay Portal comes with several built-in layout templates, but if you require a more complex page layout you may wish to use this custom layout template. A thumbnail is displayed when the end user clicks Layout Template from the Dock menu. Consult the "Page Creation and Management" section of the Liferay User Guide for details on administering this service. The Liferay User Guide can be found at http://liferay.com/documentation.<br /><br />This layout will appear in your Page Layouts once installed.
 module-group-id=liferay
 module-incremental-version=1

layouttpl/1-3-1-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=Layout Templates allow you to choose how portlets will be arranged on a page. They are simple table or CSS-based containers into which portlets can be dropped and sit within the body of the page. Liferay Portal comes with several built-in layout templates, but if you require a more complex page layout you may wish to use this custom layout template. A thumbnail is displayed when the end user clicks Layout Template from the Dock menu. Consult the "Page Creation and Management" section of the Liferay User Guide for details on administering this service. The Liferay User Guide can be found at http://liferay.com/documentation.<br /><br />This layout will appear in your Page Layouts once installed.
 module-group-id=liferay
 module-incremental-version=1

layouttpl/1-3-2-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=Layout Templates allow you to choose how portlets will be arranged on a page. They are simple table or CSS-based containers into which portlets can be dropped and sit within the body of the page. Liferay Portal comes with several built-in layout templates, but if you require a more complex page layout you may wish to use this custom layout template. A thumbnail is displayed when the end user clicks Layout Template from the Dock menu.<br /><br />This layout will appear in your Page Layouts once installed.
 module-group-id=liferay
 module-incremental-version=1

layouttpl/2-1-2-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=Layout Templates allow you to choose how portlets will be arranged on a page. They are simple table or CSS-based containers into which portlets can be dropped and sit within the body of the page. Liferay Portal comes with several built-in layout templates, but if you require a more complex page layout you may wish to use this custom layout template. A thumbnail is displayed when the end user clicks Layout Template from the Dock menu.<br /><br />This layout will appear in your Page Layouts once installed.
 module-group-id=liferay
 module-incremental-version=1

layouttpl/3-2-3-columns-layouttpl/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=Layout Templates allow you to choose how portlets will be arranged on a page. They are simple table or CSS-based containers into which portlets can be dropped and sit within the body of the page. Liferay Portal comes with several built-in layout templates, but if you require a more complex page layout you may wish to use this custom layout template. A thumbnail is displayed when the end user clicks Layout Template from the Dock menu.<br /><br />This layout will appear in your Page Layouts once installed.
 module-group-id=liferay
 module-incremental-version=1

portlets/akismet-portlet/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=This app integrates Liferay with Akismet. Akismet is a web-based service which automatically detects and eliminates spam from your Liferay message boards, blogs, and wikis. To use this app, obtain an API key from akismet.com and configure it via Control Panel. Once this app is installed and enabled, each forum post, or comment on content such as blogs and wikis will be passed through Akismet. If the post is detected as spam, it will be rejected with a helpful error message.<br /><br />Internet access is required for this app to work.<br /><br />This app will appear in your Control Panel once installed.
 module-group-id=liferay
 module-incremental-version=1

portlets/analog-clock-portlet/docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,7 +1,7 @@
 author=Liferay, Inc.
 change-log=
 licenses=LGPL
-liferay-versions=7.0.0+,7.1.0+
+liferay-versions=7.0.0+,7.1.0+,7.2.0+,7.3.0+
 long-description=
 module-group-id=liferay
 module-incremental-version=1