Skip to content
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.

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

[ADAM-1361] Fix misnamed ADAM überjar. #1546

Merged

Conversation

fnothaft
Copy link
Member

Resolves #1361.

@fnothaft fnothaft added this to the 0.23.0 milestone May 24, 2017
@fnothaft fnothaft requested a review from heuermh May 24, 2017 07:06
@coveralls
Copy link

coveralls commented May 24, 2017

Coverage Status

Coverage remained the same at 82.041% when pulling 884ba69 on fnothaft:issues/1361-spark2-artifact into 2820e94 on bigdatagenomics:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.1%) to 81.93% when pulling 884ba69 on fnothaft:issues/1361-spark2-artifact into 2820e94 on bigdatagenomics:master.

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/ADAM-prb/2050/
Test PASSed.

@heuermh
Copy link
Member

heuermh commented May 24, 2017

With this

diff --git a/scripts/move_to_spark_2.sh b/scripts/move_to_spark_2.sh
index ebd9fd89..3e83ebdd 100755
--- a/scripts/move_to_spark_2.sh
+++ b/scripts/move_to_spark_2.sh
@@ -19,5 +19,6 @@ find . -name "pom.xml" -exec sed \
     -e "/adam-/ s/_2\.1/-spark2_2.1/g" \
     -e "/utils-/ $substitution_cmd" \
     -e "/adam-/ $substitution_cmd" \
+    -e "/adam_/ $substitution_cmd" \
     -e "/spark.version/ s/1.6.3/2.1.0/g" \
     -i.spark2.bak '{}' \;

the <finalName> element can stay as is. This PR adds -assembly to the assembly artifact names.

@fnothaft
Copy link
Member Author

@heuermh Since the assembly jars are largely handled programmatically from the ./bin/adam-* scripts, I don't really see a benefit to changing the JAR name with <finalName>. I'd rather eliminate <finalName> and have one fewer place where things can go wrong in the move_to scripts.

@heuermh
Copy link
Member

heuermh commented May 25, 2017

I don't feel strongly either way.

@heuermh heuermh merged commit 3ea4f18 into bigdatagenomics:master May 25, 2017
@heuermh
Copy link
Member

heuermh commented May 25, 2017

Thank you, @fnothaft

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants