LPS-96984 Remove build support

alessiorendina · Oct 23, 2019 · 4295b0e · 4295b0e
1 parent d76725e
commit 4295b0e
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 113 deletions.
diff --git a/build-common-web.xml b/build-common-web.xml
@@ -86,19 +86,6 @@
 							/>
 						</copy>
 					</then>
-					<elseif>
-						<and>
-							<available file="docroot" type="dir" />
-							<equals arg1="${build.profile}" arg2="slim" />
-						</and>
-						<then>
-							<copy
-								file="docroot/WEB-INF/slim-runtime-web.xml"
-								preservelastmodified="true"
-								tofile="${war.file.dest}/WEB-INF/web.xml"
-							/>
-						</then>
-					</elseif>
 					<elseif>
 						<available file="docroot" type="dir" />
 						<then>

diff --git a/build-common.xml b/build-common.xml
@@ -152,10 +152,6 @@
 		</not>
 	</condition>
 
-	<condition property="app.server.type" value="tomcat">
-		<equals arg1="${build.profile}" arg2="slim" />
-	</condition>
-
 	<property name="aspectj.agent" value="-javaagent:${project.dir}/lib/portal/aspectj-weaver.jar" />
 	<property name="aspectj.configuration" value="com/liferay/aspectj/aop.xml" />
 	<property name="definitions.dir" value="${project.dir}/definitions" />

diff --git a/build.xml b/build.xml
@@ -589,29 +589,14 @@ message.
 			</then>
 		</if>
 
-		<if>
-			<equals arg1="${build.profile}" arg2="slim" />
-			<then>
-				<copy
-					todir="${app.server.lib.portal.dir}"
-				>
-					<fileset
-						dir="lib/portal"
-						includes="asm-analysis.jar,asm-commons.jar,asm-tree.jar,asm-util.jar,asm.jar,aspectj-rt.jar,aspectj-weaver.jar,c3p0.jar,cglib-nodep.jar,com.liferay.portal.slim.runtime.jar,commons-beanutils.jar,commons-chain.jar,commons-codec.jar,commons-collections.jar,commons-compress.jar,commons-configuration.jar,commons-dbcp.jar,commons-digester.jar,commons-discovery.jar,commons-fileupload.jar,commons-httpclient.jar,commons-io.jar,commons-lang.jar,commons-logging.jar,commons-math.jar,commons-pool.jar,commons-validator.jar,concurrent.jar,dom4j.jar,hibernate-commons-annotations.jar,hibernate-core.jar,hikaricp.jar,httpclient.jar,httpcore.jar,httpmime.jar,jabsorb.jar,jakarta-regexp.jar,javassist.jar,jaxb-impl.jar,jaxen.jar,jcl-over-slf4j.jar,jdom.jar,jna.jar,jodconverter.jar,jodd-bean.jar,jodd-core.jar,json-java.jar,jsr107cache.jar,kxml2.jar,liferay-icu4j.jar,log4j.jar,log4j-extras.jar,mchange-commons-java.jar,netty-all.jar,portal-impl.jar,rome.jar,saaj-api.jar,saaj-impl.jar,serializer.jar,slf4j-api.jar,spring-aop.jar,spring-aspects.jar,spring-beans.jar,spring-context.jar,spring-context-support.jar,spring-core.jar,spring-expression.jar,spring-jdbc.jar,spring-jms.jar,spring-orm.jar,spring-oxm.jar,spring-tx.jar,spring-web.jar,spring-webmvc.jar,stax.jar,stax-ex.jar,streambuffer.jar,stringtemplate.jar,tika-core.jar,tika-parsers.jar,tomcat-jdbc.jar,tomcat-juli.jar,util-java.jar,util-slf4j.jar,util-taglib.jar,wstx.jar,xalan.jar,xbean.jar,xbean-spring.jar,xercesImpl.jar,xml-apis.jar,xmlsec.jar,xmpcore.jar,xpp3.jar,xstream.jar,xz.jar"
-					/>
-				</copy>
-			</then>
-			<else>
-				<copy
-					todir="${app.server.lib.portal.dir}"
-				>
-					<fileset
-						dir="lib/portal"
-						excludes="dependencies.properties"
-					/>
-				</copy>
-			</else>
-		</if>
+		<copy
+			todir="${app.server.lib.portal.dir}"
+		>
+			<fileset
+				dir="lib/portal"
+				excludes="dependencies.properties"
+			/>
+		</copy>
 
 		<if>
 			<or>

diff --git a/modules/releng.gradle b/modules/releng.gradle
@@ -210,7 +210,7 @@ lockDependencyVersion {
 		List<String> buildGradleExcludes = ["**/build/", "**/classes/", "**/node_modules/"]
 
 		if (dependencyName in ["com.liferay.portal.impl", "com.liferay.portal.kernel"]) {
-			buildGradleExcludes = buildGradleExcludes + ["core/portal-bootstrap/", "core/slim-runtime/"]
+			buildGradleExcludes = buildGradleExcludes + ["core/portal-bootstrap/"]
 		}
 
 		FileTree buildGradleFileTree = fileTree(dir: projectDir, excludes: buildGradleExcludes, includes: ["apps/**/build.gradle", "core/**/build.gradle"])
@@ -577,7 +577,7 @@ prepareMajorIncrement {
 
 			String content = buildGradleFile.getText("UTF-8")
 
-			List<String> markerFileNames = [".lfrbuild-ci", ".lfrbuild-portal", ".lfrbuild-slim"]
+			List<String> markerFileNames = [".lfrbuild-ci", ".lfrbuild-portal"]
 
 			markerFileNames = markerFileNames.findAll {
 				_exists(dir, it)

diff --git a/portal-web/docroot/WEB-INF/slim-runtime-web.xml b/portal-web/docroot/WEB-INF/slim-runtime-web.xml
diff --git a/util-taglib/build.xml b/util-taglib/build.xml
@@ -56,29 +56,24 @@
 
 	<target depends="build-common-java.deploy" name="deploy">
 		<if>
-			<equals arg1="${build.profile}" arg2="slim" />
+			<equals arg1="${app.server.type}" arg2="tomcat" />
 			<then>
-			</then>
-			<elseif>
-				<equals arg1="${app.server.type}" arg2="tomcat" />
-				<then>
-					<copy
-						file="${jar.file}.jar"
-						preservelastmodified="true"
-						todir="${deploy.dir}"
-					/>
+				<copy
+					file="${jar.file}.jar"
+					preservelastmodified="true"
+					todir="${deploy.dir}"
+				/>
 
-					<copy
-						preservelastmodified="true"
-						todir="${app.server.portal.dir}/WEB-INF/tld"
-					>
-						<fileset
-							dir="classes/META-INF"
-							includes="*.tld"
-						/>
-					</copy>
-				</then>
-			</elseif>
+				<copy
+					preservelastmodified="true"
+					todir="${app.server.portal.dir}/WEB-INF/tld"
+				>
+					<fileset
+						dir="classes/META-INF"
+						includes="*.tld"
+					/>
+				</copy>
+			</then>
 		</if>
 	</target>