LPS-77441 Run "baseline" on portal artifacts via Gradle

GergoMathe · Jan 29, 2018 · 9a61895 · 9a61895
1 parent e2c7e22
commit 9a61895
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 115 deletions.
diff --git a/build-common-java.xml b/build-common-java.xml
@@ -114,106 +114,13 @@
 					<property name="-sourcepath" value="." />
 				</bnd>
 
-				<var name="-baseline" unset="true" />
-
 				<if>
 					<not>
 						<equals arg1="${baseline.jar.report.level}" arg2="off" />
 					</not>
 					<then>
-						<loadproperties srcFile="bnd.bnd">
-							<filterchain>
-								<linecontains>
-									<contains value="-baseline" />
-								</linecontains>
-							</filterchain>
-						</loadproperties>
-					</then>
-				</if>
-
-				<if>
-					<isset property="-baseline" />
-					<then>
-						<antelope:stringutil property="baseline.file.beginindex" string="${-baseline}">
-							<indexof string="=" />
-						</antelope:stringutil>
-
-						<math
-							datatype="int"
-							operand1="${baseline.file.beginindex}"
-							operand2="1"
-							operation="+"
-							result="baseline.file.beginindex"
-						/>
-
-						<antelope:stringutil property="baseline.file" string="${-baseline}">
-							<substring beginindex="${baseline.file.beginindex}" />
-						</antelope:stringutil>
-
-						<var name="-baseline" unset="true" />
-
-						<antelope:stringutil property="baseline.file.name.beginindex" string="${baseline.file}">
-							<lastindexof string="/" />
-						</antelope:stringutil>
-
-						<math
-							datatype="int"
-							operand1="${baseline.file.name.beginindex}"
-							operand2="1"
-							operation="+"
-							result="baseline.file.name.beginindex"
-						/>
-
-						<antelope:stringutil property="baseline.file.name.endindex" string="${baseline.file}">
-							<lastindexof string="-" />
-						</antelope:stringutil>
-
-						<antelope:stringutil property="baseline.file.name" string="${baseline.file}">
-							<substring beginindex="${baseline.file.name.beginindex}" endindex="${baseline.file.name.endindex}" />
-						</antelope:stringutil>
-
-						<math
-							datatype="int"
-							operand1="${baseline.file.name.endindex}"
-							operand2="1"
-							operation="+"
-							result="baseline.file.version.beginindex"
-						/>
-
-						<antelope:stringutil property="baseline.file.version.endindex" string="${baseline.file}">
-							<lastindexof string="." />
-						</antelope:stringutil>
-
-						<antelope:stringutil property="baseline.file.version" string="${baseline.file}">
-							<substring beginindex="${baseline.file.version.beginindex}" endindex="${baseline.file.version.endindex}" />
-						</antelope:stringutil>
-
-						<mirrors-get
-							dest="${baseline.file}"
-							src="${baseline.jar.url}/com/liferay/portal/${baseline.file.name}/${baseline.file.version}/${baseline.file.name}-${baseline.file.version}.jar"
-						/>
-					</then>
-				</if>
-
-				<taskdef classname="com.liferay.ant.bnd.BaselineJarTask" classpathref="lib.classpath" name="baseline-jar" />
-
-				<if>
-					<isset property="jar.compat.file" />
-					<then>
-						<baseline-jar
-							bndFile="bnd.bnd"
-							bndRootFile="${project.dir}/common.bnd"
-							newCompatJarFile="${jar.compat.file}"
-							newJarFile="${jar.file}.jar"
-						/>
+						<gradle-execute forcedcacheenabled="false" task="baseline" />
 					</then>
-					<else>
-						<baseline-jar
-							bndFile="bnd.bnd"
-							bndRootFile="${project.dir}/common.bnd"
-							newJarFile="${jar.file}.jar"
-						/>
-					</else>
 				</if>
 			</then>
 			<else>

diff --git a/build-common.xml b/build-common.xml
@@ -1113,12 +1113,6 @@ information.
 										value="Bundle-Version: ${artifact.version.major.minor}.${artifact.version.micro}"
 									/>
 
-									<replaceregexp
-										file="bnd.bnd"
-										match="\Q/.bnd/ant-baseline-cache/com.liferay.${processed.artifact.name}-\E\d+\.\d+\.\d+\.jar"
-										replace="/.bnd/ant-baseline-cache/com.liferay.${processed.artifact.name}-${artifact.version.major.minor}.0.jar"
-									/>
-
 									<exec executable="git" failonerror="true">
 										<arg value="add" />
 										<arg value="bnd.bnd" />

diff --git a/portal-impl/bnd.bnd b/portal-impl/bnd.bnd
@@ -83,5 +83,4 @@ Include-Resource:\
 	@../tmp/lib-pre/com.liferay.portal.impl.message.boards.compat.jar,\
 	@../tmp/lib-pre/com.liferay.portal.impl.trash.compat.jar
 Private-Package: com.liferay.*.dependencies
--baseline: *;file=${project.dir}/.bnd/ant-baseline-cache/com.liferay.portal.impl-2.27.0.jar
 -donotcopy: (log4j\.properties|logging\.properties|portal-.*\.properties|system-.*\.properties|\.touch)
diff --git a/portal-kernel/bnd.bnd b/portal-kernel/bnd.bnd
@@ -15,5 +15,4 @@ Include-Resource:\
 	@../tmp/lib-pre/com.liferay.portal.kernel.memory.compat.jar,\
 	@../tmp/lib-pre/com.liferay.portal.kernel.message.boards.compat.jar,\
 	@../tmp/lib-pre/com.liferay.portal.kernel.nio.compat.jar,\
-	@../tmp/lib-pre/com.liferay.portal.kernel.util.compat.jar
--baseline: *;file=${project.dir}/.bnd/ant-baseline-cache/com.liferay.portal.kernel-2.61.0.jar
+	@../tmp/lib-pre/com.liferay.portal.kernel.util.compat.jar
diff --git a/portal-test-integration/bnd.bnd b/portal-test-integration/bnd.bnd
@@ -34,5 +34,4 @@ Include-Resource:\
 	@${project.dir}/../lib/portal/httpcore.jar,\
 	@${project.dir}/../lib/portal/httpmime.jar,\
 	@${project.dir}/../lib/portal/juniversalchardet.jar,\
-	@${project.dir}/../lib/portal/poi.jar
--baseline: *;file=${project.dir}/.bnd/ant-baseline-cache/com.liferay.portal.test.integration-4.0.0.jar
+	@${project.dir}/../lib/portal/poi.jar
diff --git a/portal-test/bnd.bnd b/portal-test/bnd.bnd
@@ -33,5 +33,4 @@ Include-Resource:\
 	@${project.dir}/../lib/development/hamcrest-core.jar,\
 	@${project.dir}/../lib/development/junit.jar,\
 	@${project.dir}/../lib/development/spring-test.jar,\
-	@${project.dir}/../lib/portal/aspectj-rt.jar
--baseline: *;file=${project.dir}/.bnd/ant-baseline-cache/com.liferay.portal.test-4.0.0.jar
+	@${project.dir}/../lib/portal/aspectj-rt.jar
diff --git a/util-bridges/bnd.bnd b/util-bridges/bnd.bnd
@@ -6,5 +6,4 @@ Import-Package:\
 	com.liferay.*,\
 	\
 	*;resolution:=optional
-Include-Resource: classes
--baseline: *;file=${project.dir}/.bnd/ant-baseline-cache/com.liferay.util.bridges-2.0.0.jar
+Include-Resource: classes
diff --git a/util-java/bnd.bnd b/util-java/bnd.bnd
@@ -8,5 +8,4 @@ Import-Package:\
 	*;resolution:=optional
 Include-Resource:\
 	classes,\
-	@../tmp/lib-pre/com.liferay.util.java.compat.jar
--baseline: *;file=${project.dir}/.bnd/ant-baseline-cache/com.liferay.util.java-2.5.0.jar
+	@../tmp/lib-pre/com.liferay.util.java.compat.jar
diff --git a/util-slf4j/bnd.bnd b/util-slf4j/bnd.bnd
@@ -6,5 +6,4 @@ Import-Package:\
 	com.liferay.*,\
 	\
 	*;resolution:=optional
-Include-Resource: classes
--baseline: *;file=${project.dir}/.bnd/ant-baseline-cache/com.liferay.util.slf4j-2.0.0.jar
+Include-Resource: classes
diff --git a/util-taglib/bnd.bnd b/util-taglib/bnd.bnd
@@ -71,5 +71,4 @@ Provide-Capability:\
 	osgi.extender;\
 		osgi.extender="jsp.taglib";\
 		uri="http://liferay.com/tld/util";\
-		version:Version="${Bundle-Version}"
--baseline: *;file=${project.dir}/.bnd/ant-baseline-cache/com.liferay.util.taglib-2.10.0.jar
+		version:Version="${Bundle-Version}"