This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push: new f9070c3 PHOENIX-6497 Remove embedded profile and always build phoenix-client-embedded f9070c3 is described below commit f9070c34649cd060acb829207ed104ef6915ab5b 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 +- dev/phoenix-vote.sh | 4 ++-- pom.xml | 13 +------------ 3 files changed, 4 insertions(+), 15 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/dev/phoenix-vote.sh b/dev/phoenix-vote.sh index c17fa81..8a45eaa 100755 --- a/dev/phoenix-vote.sh +++ b/dev/phoenix-vote.sh @@ -148,7 +148,7 @@ function build_from_source() { function run_tests() { rm -f "${OUTPUT_PATH_PREFIX}"_run_tests - (mvn clean package "${MVN_PROPERTIES[@]}" && mvn verify "${MVN_PROPERTIES[@]}" -Dskip.embedded) 2>&1 | tee "${OUTPUT_PATH_PREFIX}"_run_tests && UNIT_TEST_PASSED=1 + (mvn clean package "${MVN_PROPERTIES[@]}" && mvn verify "${MVN_PROPERTIES[@]}") 2>&1 | tee "${OUTPUT_PATH_PREFIX}"_run_tests && UNIT_TEST_PASSED=1 } function execute() { @@ -164,7 +164,7 @@ function print_when_exit() { * Built from source (${JAVA_VERSION}): $( ((BUILD_FROM_SOURCE_PASSED)) && echo "ok" || echo "failed" ) - mvn clean install ${MVN_PROPERTIES[@]} -DskipTests * Unit tests pass (${JAVA_VERSION}): $( ((UNIT_TEST_PASSED)) && echo "ok" || echo "failed" ) - - mvn clean package ${MVN_PROPERTIES[@]} && mvn verify ${MVN_PROPERTIES[@]} -Dskip.embedded + - mvn clean package ${MVN_PROPERTIES[@]} && mvn verify ${MVN_PROPERTIES[@]} __EOF if ((CHECKSUM_PASSED)) && ((SIGNATURE_PASSED)) && ((RAT_CHECK_PASSED)) && ((BUILD_FROM_SOURCE_PASSED)) && ((UNIT_TEST_PASSED)) ; then exit 0 diff --git a/pom.xml b/pom.xml index 396c9b3..7f36b5d 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>