Skip to content

PHOENIX-6497 Remove embedded profile and always build phoenix-client-…#1254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
stoty wants to merge 1 commit into from
Closed

PHOENIX-6497 Remove embedded profile and always build phoenix-client-… #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/phoenix-personality.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
4 changes: 2 additions & 2 deletions dev/phoenix-vote.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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() {
Expand All@@ -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
Expand Down
13 changes: 1 addition & 12 deletions pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -1754,17 +1754,6 @@
</plugins>
</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>
Expand Down