[ADAM-1307] move_to_spark_2 fails after moving to scala 2.11. #1329

Merged
merged 1 commit into from Dec 27, 2016

Conversation

Projects
None yet
3 participants
@fnothaft
Member

fnothaft commented Dec 27, 2016

The sed command that moved to Spark 2 looked for _2.10 in the ADAM pom artifact names. This commit fixes that issue by looking for _2.1 instead, which matches both Scala 2.10 and 2.11, as well as the eventual Scala 2.12. Resolves #1307.

[ADAM-1307] move_to_spark_2 fails after moving to scala 2.11.
The sed command that moved to Spark 2 looked for _2.10 in the
ADAM pom artifact names. This commit fixes that issue by looking
for _2.1 instead, which matches both Scala 2.10 and 2.11, as well
as the eventual Scala 2.12. Resolves #1307.

@fnothaft fnothaft requested a review from heuermh Dec 27, 2016

@AmplabJenkins

This comment has been minimized.

Show comment
Hide comment
@AmplabJenkins

AmplabJenkins Dec 27, 2016

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

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

@heuermh

This comment has been minimized.

Show comment
Hide comment
@heuermh

heuermh Dec 27, 2016

Member

Thanks, this works for me.

We might want to restrict the 2.10/2.11 replace patterns (later is probably fine) as we're accidentally causing this

$ git diff .
diff --git a/pom.xml b/pom.xml
index 73976347..a69f47a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -475,7 +475,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.parquet</groupId>
-        <!-- This library has no Scala 2.11 version, but using the 2.10 version seems to work. -->
+        <!-- This library has no Scala 2.10 version, but using the 2.10 version seems to work. -->
         <artifactId>parquet-scala_2.10</artifactId>
         <version>${parquet.version}</version>
         <exclusions>

and with utils currently at version 0.2.10 and json4s at version 3.2.11 we might run into other trouble.

Member

heuermh commented Dec 27, 2016

Thanks, this works for me.

We might want to restrict the 2.10/2.11 replace patterns (later is probably fine) as we're accidentally causing this

$ git diff .
diff --git a/pom.xml b/pom.xml
index 73976347..a69f47a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -475,7 +475,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.parquet</groupId>
-        <!-- This library has no Scala 2.11 version, but using the 2.10 version seems to work. -->
+        <!-- This library has no Scala 2.10 version, but using the 2.10 version seems to work. -->
         <artifactId>parquet-scala_2.10</artifactId>
         <version>${parquet.version}</version>
         <exclusions>

and with utils currently at version 0.2.10 and json4s at version 3.2.11 we might run into other trouble.

@fnothaft

This comment has been minimized.

Show comment
Hide comment
@fnothaft

fnothaft Dec 27, 2016

Member

We might want to restrict the 2.10/2.11 replace patterns (later is probably fine) as we're accidentally causing this

IIRC, I fix that in #1319

Member

fnothaft commented Dec 27, 2016

We might want to restrict the 2.10/2.11 replace patterns (later is probably fine) as we're accidentally causing this

IIRC, I fix that in #1319

@heuermh heuermh merged commit d272738 into bigdatagenomics:master Dec 27, 2016

1 check passed

default Merged build finished.
Details
@heuermh

This comment has been minimized.

Show comment
Hide comment
@heuermh

heuermh Dec 27, 2016

Member

Thank you, @fnothaft!

Member

heuermh commented Dec 27, 2016

Thank you, @fnothaft!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment