Skip to content

Remove custom version injection because it does not work well due to multi-module build #2

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

Merged
bbeaudreault merged 1 commit into from
Dec 17, 2021
Merged

Remove custom version injection because it does not work well due to multi-module build #2

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
4 changes: 0 additions & 4 deletions build-scripts/prepare_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@ fi
RELEASE="${RELEASE}.${BUILD_NUMBER}"
FULL_BUILD_VERSION="${HBASE_VERSION}-${RELEASE}"

# Add into MAVEN_ARGS because we added this property in hbase-common/pom.xml so we
# could accurately reflect the full build version in the UI and elsewhere.
MAVEN_ARGS="$MAVEN_ARGS -Dhubspot.build.version=$FULL_BUILD_VERSION"

#
# Dump generated env vars into rc file
#
Expand Down
8 changes: 2 additions & 6 deletions hbase-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@
<name>Apache HBase - Common</name>
<description>Common functionality for HBase</description>

<properties>
<hubspot.build.version>${project.version}</hubspot.build.version>
</properties>

<build>
<resources>
<resource>
Expand Down Expand Up @@ -80,7 +76,7 @@
<configuration>
<target>
<replace file="${project.build.outputDirectory}/hbase-default.xml"
token="@@@VERSION@@@" value="${hubspot.build.version}" />
token="@@@VERSION@@@" value="${project.version}" />
</target>
</configuration>
<goals>
Expand All @@ -96,7 +92,7 @@
<property name="generated.sources" location="${project.build.directory}/generated-sources"/>

<exec executable="bash" failonerror="true">
<arg line="${basedir}/src/saveVersion.sh ${hubspot.build.version} ${generated.sources}/java"/>
<arg line="${basedir}/src/saveVersion.sh ${project.version} ${generated.sources}/java"/>
</exec>
</target>
</configuration>
Expand Down