LPS-131327 Push down ccpp.jar to portal-web scope, and remove endorse…

…d.libraries
JorgeFerrer · Apr 28, 2021 · 2eb866d · 2eb866d
1 parent 3fb7832
commit 2eb866d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 57 deletions.
diff --git a/app.server.properties b/app.server.properties
@@ -66,7 +66,6 @@
     app.server.tcserver.developer.dir=${app.server.tcserver.dir}/developer-${app.server.tcserver.version}.RELEASE
     app.server.tcserver.jvm.mem=${app.server.jvm.mem}
     app.server.tcserver.jvm.args=${app.server.jvm.args}
-    app.server.tcserver.lib.endorsed.dir=${app.server.tcserver.dir}/instances/liferay/lib
     app.server.tcserver.lib.global.dir=${app.server.tcserver.dir}/instances/liferay/lib
     app.server.tcserver.lib.portal.dir=${app.server.tcserver.deploy.dir}/ROOT/WEB-INF/lib
     app.server.tcserver.lib.support.dir=${app.server.tcserver.dir}/instances/liferay/lib
@@ -91,7 +90,6 @@
     app.server.tomcat.deploy.dir=${app.server.tomcat.dir}/webapps
     app.server.tomcat.jvm.mem=${app.server.jvm.mem}
     app.server.tomcat.jvm.args=${app.server.jvm.args}
-    app.server.tomcat.lib.endorsed.dir=${app.server.tomcat.dir}/lib/ext
     app.server.tomcat.lib.global.dir=${app.server.tomcat.dir}/lib/ext
     app.server.tomcat.lib.portal.dir=${app.server.tomcat.portal.dir}/WEB-INF/lib
     app.server.tomcat.lib.support.dir=${app.server.tomcat.dir}/lib/ext

diff --git a/build-dist.xml b/build-dist.xml
@@ -3066,31 +3066,6 @@ plugins.includes=</echo>
 			basedir="${app.server.portal.dir}"
 			destfile="dist/liferay-portal-${lp.version}.war"
 		/>
-
-		<tstamp>
-			<format pattern="yyyyMMddkkmmssSSS" property="tstamp.value" />
-		</tstamp>
-
-		<!--
-		LPS-3408
-		-->
-
-		<copy
-			todir="${tstamp.value}/WEB-INF/lib"
-		>
-			<fileset
-				dir="lib/portal"
-				includes="ccpp.jar"
-			/>
-		</copy>
-
-		<zip
-			basedir="${tstamp.value}"
-			destfile="dist/liferay-portal-${lp.version}.war"
-			update="yes"
-		/>
-
-		<delete dir="${tstamp.value}" />
 	</target>
 
 	<target name="zip-portal-war-2.4-with-dependencies">

diff --git a/build.properties b/build.properties
@@ -349,12 +349,6 @@
     db.build.java.mx=1024m
     db.build.java.maxpermsize=256m
 
-##
-## Endorsed Libraries
-##
-
-    endorsed.libraries=portal/ccpp.jar
-
 ##
 ## Git
 ##

diff --git a/build.xml b/build.xml
@@ -486,30 +486,6 @@ message.
 					</then>
 				</if>
 
-				<copy
-					flatten="true"
-					todir="${app.server.lib.endorsed.dir}"
-				>
-					<fileset
-						dir="lib"
-						includes="${endorsed.libraries}"
-					/>
-				</copy>
-
-				<if>
-					<not>
-						<equals arg1="${app.server.lib.portal.dir}" arg2="${app.server.lib.global.dir}" />
-					</not>
-					<then>
-						<delete failonerror="false">
-							<fileset
-								dir="${app.server.lib.portal.dir}"
-								includes="ccpp.jar"
-							/>
-						</delete>
-					</then>
-				</if>
-
 				<copy
 					todir="${app.server.lib.global.dir}"
 				>