[phoenix] branch 4.x updated: PHOENIX-6497 Remove embedded profile and always build phoenix-client-embedded

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x by this push:
     new 494afff  PHOENIX-6497 Remove embedded profile and always build phoenix-client-embedded
494afff is described below

commit 494afffc2ea4ea2c3cfdf7ca6175bf4dd66e2447
Author: Istvan Toth <st...@apache.org>
AuthorDate: Fri Jun 18 15:33:24 2021 +0200

    PHOENIX-6497 Remove embedded profile and always build phoenix-client-embedded
---
 dev/phoenix-personality.sh |  2 +-
 pom.xml                    | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/dev/phoenix-personality.sh b/dev/phoenix-personality.sh
index 692981e..ae5806f 100755
--- a/dev/phoenix-personality.sh
+++ b/dev/phoenix-personality.sh
@@ -140,7 +140,7 @@ function personality_modules
 
   # Running with threads>1 seems to trigger some problem in the build, but since we
   # spend 80+% of the time in phoenix-core, it wouldn't help much anyway
-  extra="--threads=1 -DPhoenixPatchProcess -Dskip.embedded"
+  extra="--threads=1 -DPhoenixPatchProcess"
   if [[ "${PATCH_BRANCH}" = 4* ]]; then
     extra="${extra} -Dhttps.protocols=TLSv1.2"
   fi
diff --git a/pom.xml b/pom.xml
index 3d06e58..06975e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
     <module>phoenix-pherf</module>
     <module>phoenix-client-parent</module>
     <module>phoenix-client-parent/phoenix-client</module>
-    <!-- phoenix-client-embedded is added in profile "embedded" -->
+    <module>phoenix-client-parent/phoenix-client-embedded</module>
     <module>phoenix-server</module>
     <module>phoenix-assembly</module>
     <module>phoenix-tracing-webapp</module>
@@ -1330,17 +1330,6 @@
       </build>
     </profile>
     <profile>
-      <id>embedded</id>
-      <activation>
-        <property>
-            <name>!skip.embedded</name>
-        </property>
-      </activation>
-      <modules>
-        <module>phoenix-client-parent/phoenix-client-embedded</module>
-      </modules>
-    </profile>
-    <profile>
       <id>spotbugs-site</id>
       <activation>
         <property>