LRQA-73302 Update FACES repos to latest and remove workaround for run…

…-jsf-tests
lesliewong92 · Sep 14, 2022 · 1087b12 · 1087b12
1 parent b68cae0
commit 1087b12
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 85 deletions.
diff --git a/build-test-jsf.xml b/build-test-jsf.xml
@@ -70,87 +70,6 @@
 
 		<property location="${selenium.executable.dir.name}${selenium.gecko.driver.executable}" name="gecko.driver.path" />
 
-		<!--
-		LRQA-60084 Temporary workaround until new release branch is available
-		from the Faces repos
-		-->
-
-		<exec dir="${liferay.faces.alloy.dir}" executable="git">
-			<arg line="checkout" />
-			<arg line="c387002579a8883c737639310fb1000baee6e0b2" />
-		</exec>
-
-		<exec dir="${liferay.faces.alloy.dir}" executable="git">
-			<arg line="cherry-pick" />
-			<arg line="b51c1251c04bb8b130e364805f09e457220a1737" />
-			<arg line="--strategy-option " />
-			<arg line="theirs " />
-		</exec>
-
-		<exec dir="${liferay.faces.alloy.dir}" executable="git">
-			<arg line="cherry-pick" />
-			<arg line="2fe709c461ecc70bd416b855c15f5c6bebae1426" />
-			<arg line="--strategy-option " />
-			<arg line="theirs " />
-		</exec>
-
-		<exec dir="${liferay.faces.bridge.impl.dir}" executable="git">
-			<arg line="checkout" />
-			<arg line="31e19c170bbdce3e98e08a560a8c935392ebd69d" />
-		</exec>
-
-		<exec dir="${liferay.faces.bridge.impl.dir}" executable="git">
-			<arg line="cherry-pick" />
-			<arg line="c868b05d7abea77421c36b5ffb580ee9e2de8563" />
-			<arg line="--strategy-option " />
-			<arg line="theirs " />
-		</exec>
-
-		<exec dir="${liferay.faces.bridge.impl.dir}" executable="git">
-			<arg line="cherry-pick" />
-			<arg line="434358cb40c1ff30243062bfc1d8db5850efcbdf" />
-			<arg line="--strategy-option " />
-			<arg line="theirs " />
-		</exec>
-
-		<exec dir="${liferay.faces.portal.dir}" executable="git">
-			<arg line="checkout" />
-			<arg line="f7819860f0d4619f1e5214b50de9fdf54dbb4bae" />
-		</exec>
-
-		<exec dir="${liferay.faces.portal.dir}" executable="git">
-			<arg line="cherry-pick" />
-			<arg line="296dff949be89d4ca674f3e32be583d97c51bde6" />
-			<arg line="--strategy-option " />
-			<arg line="theirs " />
-		</exec>
-
-		<exec dir="${liferay.faces.portal.dir}" executable="git">
-			<arg line="cherry-pick" />
-			<arg line="b9e923481b6e842bb873cb100ab5576e4d4250b0" />
-			<arg line="--strategy-option " />
-			<arg line="theirs " />
-		</exec>
-
-		<exec dir="${liferay.faces.showcase.dir}" executable="git">
-			<arg line="checkout" />
-			<arg line="95dcd30f260ee3e219db7c1109c02832200dd517" />
-		</exec>
-
-		<exec dir="${liferay.faces.showcase.dir}" executable="git">
-			<arg line="cherry-pick" />
-			<arg line="cbaf33df7b508a990d30414a7e2f06bc815283e1" />
-			<arg line="--strategy-option " />
-			<arg line="theirs " />
-		</exec>
-
-		<exec dir="${liferay.faces.showcase.dir}" executable="git">
-			<arg line="cherry-pick" />
-			<arg line="6dfe2e3880caa28e13a5ae64cc48990d9e6d7612" />
-			<arg line="--strategy-option " />
-			<arg line="theirs " />
-		</exec>
-
 		<execute dir="${liferay.faces.bridge.impl.dir}/demo">
 			mvn clean package -P liferay,liferay73,mojarra,tomcat
 		</execute>

diff --git a/git-commit/liferay-faces-alloy b/git-commit/liferay-faces-alloy
@@ -1 +1 @@
-2fe709c461ecc70bd416b855c15f5c6bebae1426
+5b9325191a45b10077528db35b7eab91118d7bc5
diff --git a/git-commit/liferay-faces-bridge-impl b/git-commit/liferay-faces-bridge-impl
@@ -1 +1 @@
-434358cb40c1ff30243062bfc1d8db5850efcbdf
+c17cc37bbe7ab169cc51aeb94417d0067d166f60
diff --git a/git-commit/liferay-faces-portal b/git-commit/liferay-faces-portal
@@ -1 +1 @@
-b9e923481b6e842bb873cb100ab5576e4d4250b0
+92441b99b6ff02b2dcd424a484f2652538378e76
diff --git a/git-commit/liferay-faces-showcase b/git-commit/liferay-faces-showcase
@@ -1 +1 @@
-6dfe2e3880caa28e13a5ae64cc48990d9e6d7612
+fbd33db13a8e5872fd3b0ad5a942ca0ba8cb22f1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2fe709c461ecc70bd416b855c15f5c6bebae1426
		5b9325191a45b10077528db35b7eab91118d7bc5
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		434358cb40c1ff30243062bfc1d8db5850efcbdf
		c17cc37bbe7ab169cc51aeb94417d0067d166f60
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b9e923481b6e842bb873cb100ab5576e4d4250b0
		92441b99b6ff02b2dcd424a484f2652538378e76
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		6dfe2e3880caa28e13a5ae64cc48990d9e6d7612
		fbd33db13a8e5872fd3b0ad5a942ca0ba8cb22f1