This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new df260bc PHOENIX-6497 Remove embedded profile and always build
phoenix-client-embedded
df260bc is described below
commit df260bca7e5e2ababba4ad7e17dd5320d774a4dd
Author: Istvan Toth <[email protected]>
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 618f69b..09eb696 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 55c3ff1..553ea85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,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-tools</module>
@@ -1755,17 +1755,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>
