Skip to content

Conversation

@1ambda
Copy link
Member

@1ambda 1ambda commented Nov 22, 2016

What is this PR for?

First of all, this PR doesn't affect on runtime application behaivor and existing build processes. Just abstracting variables in pom.xml

The main goal of this PR is bringing consistency and maintainability in all pom.xml. I referred these 2 projects.

Currently, all libraries and plugins have duplicated version fields since we are not using dependencyManagement, pluginManagement efficiently in pom.xml

This results in

  • unmanaged plugin, library versions (someone might update only a child's library version. it happend in our pom.xml files)
  • so many duplicated code blocks (bad)
  • fragmented plugin, library versions (some project uses junit 4.11 while another uses 4.12)

These are some examples

// hard coded, non consistent version management

      <dependency>
        <groupId>org.apache.thrift</groupId>
        <artifactId>libthrift</artifactId>
        <version>${libthrift.version}</version>
      </dependency>

      <dependency>
        <groupId>org.apache.httpcomponents</groupId>
        <artifactId>httpcore</artifactId>
        <version>4.3.3</version>
      </dependency>
// a/pom.xml
              <plugin>
                <artifactId>maven-enforcer-plugin</artifactId>
                <version>1.3.1</version>

              <plugin>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>2.8</version>

// b/pom.xml
              <plugin>
                <artifactId>maven-enforcer-plugin</artifactId>
                <version>1.3.1</version>

              <plugin>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>2.8</version>

// c/pom.xml
              <plugin>
                <artifactId>maven-enforcer-plugin</artifactId>
                <version>1.3.1</version>

              <plugin>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>2.8</version>

What type of PR is it?

[Refactoring]

Todos

  • refactor all pom.xml

What is the Jira issue?

ZEPPELIN-1695

How should this be tested?

Since this PR doesn't affect runtime behavior at all, CI test would be enough.

Questions:

  • Does the licenses files need update - NO
  • Is there breaking changes for older versions - NO
  • Does this needs documentation - NO

@1ambda 1ambda force-pushed the chore/centralize-maven-pom-versions branch 3 times, most recently from a7aed47 to a5c42ea Compare November 22, 2016 16:15
@1ambda 1ambda changed the title [WIP] chore/centralize maven pom versions [ZEPPELIN-1695] Centralise versions of libs, plugins in all pom.xml Nov 22, 2016
@1ambda 1ambda changed the title [ZEPPELIN-1695] Centralise versions of libs, plugins in all pom.xml [ZEPPELIN-1695] Centralize libs, plugin versions in all pom.xml Nov 22, 2016
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.6</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it safe to remove versions here, without extracting it to the properties, as in other sub-projects?

Copy link
Member Author

@1ambda 1ambda Nov 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bzz It's safe since

  1. we have dependencyManagement in root/pom.xml and all dependencies described in dependencyManagement block will be inherited and shared by children pom.xml
    (ref - https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Management)
     <properties>
         <httpcomponents.client.version>4.3.6</httpcomponents.client.version>

    <dependencyManagement>
      <dependency>
        <groupId>org.apache.httpcomponents</groupId>
        <artifactId>httpclient</artifactId>
        <version>${httpcomponents.client.version}</version>
      </dependency>
  1. You can check using effective pom
$ mvn org.apache.maven.plugins:maven-help-plugin:2.2:effective-pom -pl kylin

// you will see
      <dependency>
        <groupId>org.apache.httpcomponents</groupId>
        <artifactId>httpclient</artifactId>
        <version>4.3.6</version>
      </dependency>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great reminder on how dependency mechanism works in Maven, it would be event enough just to point it's existence in parent pom :)

@bzz
Copy link
Member

bzz commented Nov 23, 2016

Thank you - it's a great effort, a bit long to review so it took a while and have diverged from master.

@1ambda could you rebase and also make sure it does not affect automation like https://github.com/apache/zeppelin/blob/master/dev/change_scala_version.sh ?

@1ambda 1ambda force-pushed the chore/centralize-maven-pom-versions branch 2 times, most recently from 40a1709 to b724218 Compare November 24, 2016 04:54
@1ambda
Copy link
Member Author

1ambda commented Nov 24, 2016

Comment Summary

@bzz Thanks for review! I didn't know about change_scala_version.sh but it is very important if it's affected

There are many ways to compare, but i chose a simple and reproduceable way so that others can do again

  • run ./dev/change_scala_version.sh in both branch master and pr1668
  • create diff files
  • compare the above diffed files

As you can see, change_scala_version.sh is no relevant with this PR.

Long Details (sorry, but it's necessary)

$  zeppelin-review git:(master) git rev-parse HEAD
abe03a866fc9ac2563c057d6edc00d3ec0a7d733
$  zeppelin-review git:(master) ./dev/change_scala_version.sh 2.11
./dev/../alluxio/pom.xml
./dev/../angular/pom.xml
./dev/../beam/pom.xml
./dev/../bigquery/pom.xml
./dev/../cassandra/pom.xml
./dev/../elasticsearch/pom.xml
./dev/../file/pom.xml
./dev/../flink/pom.xml
./dev/../geode/pom.xml
./dev/../hbase/pom.xml
./dev/../ignite/pom.xml
./dev/../jdbc/pom.xml
./dev/../kylin/pom.xml
./dev/../lens/pom.xml
./dev/../livy/pom.xml
./dev/../markdown/pom.xml
./dev/../pig/pom.xml
./dev/../pom.xml
./dev/../postgresql/pom.xml
./dev/../python/pom.xml
./dev/../r/pom.xml
./dev/../scalding/pom.xml
./dev/../scio/pom.xml
./dev/../shell/pom.xml
./dev/../spark/pom.xml
./dev/../spark-dependencies/pom.xml
./dev/../zeppelin-display/pom.xml
./dev/../zeppelin-distribution/pom.xml
./dev/../zeppelin-examples/pom.xml
./dev/../zeppelin-examples/zeppelin-example-clock/pom.xml
./dev/../zeppelin-examples/zeppelin-example-horizontalbar/pom.xml
./dev/../zeppelin-interpreter/pom.xml
./dev/../zeppelin-server/pom.xml
./dev/../zeppelin-web/pom.xml
./dev/../zeppelin-zengine/pom.xml
$  zeppelin-review git:(master) ✗ git diff --no-color > ~/master

$ zeppelin-master git:(chore/centralize-maven-pom-versions) git rev-parse HEAD
b724218c446f3f740238e528c86ee32864f46e92
$ zeppelin-master git:(chore/centralize-maven-pom-versions) ./dev/change_scala_version.sh 2.11
./dev/../alluxio/pom.xml
./dev/../angular/pom.xml
./dev/../beam/pom.xml
./dev/../bigquery/pom.xml
./dev/../cassandra/pom.xml
./dev/../elasticsearch/pom.xml
./dev/../file/pom.xml
./dev/../flink/pom.xml
./dev/../geode/pom.xml
./dev/../hbase/pom.xml
./dev/../ignite/pom.xml
./dev/../jdbc/pom.xml
./dev/../kylin/pom.xml
./dev/../lens/pom.xml
./dev/../livy/pom.xml
./dev/../markdown/pom.xml
./dev/../pig/pom.xml
./dev/../pom.xml
./dev/../postgresql/pom.xml
./dev/../python/pom.xml
./dev/../r/pom.xml
./dev/../scalding/pom.xml
./dev/../scio/pom.xml
./dev/../shell/pom.xml
./dev/../spark/pom.xml
./dev/../spark-dependencies/pom.xml
./dev/../zeppelin-display/pom.xml
./dev/../zeppelin-distribution/pom.xml
./dev/../zeppelin-examples/pom.xml
./dev/../zeppelin-examples/zeppelin-example-clock/pom.xml
./dev/../zeppelin-examples/zeppelin-example-horizontalbar/pom.xml
./dev/../zeppelin-interpreter/pom.xml
./dev/../zeppelin-server/pom.xml
./dev/../zeppelin-web/pom.xml
./dev/../zeppelin-zengine/pom.xml
$  zeppelin-master git:(chore/centralize-maven-pom-versions) ✗ git diff --no-color > ~/pr1668

$  ~ diff master pr1668
2c2
< index dc31594..c4ad855 100644
---
> index 02a7ab3..c821dbb 100644
5c5
< @@ -47,7 +47,7 @@
---
> @@ -52,7 +52,7 @@
14c14
< @@ -59,15 +59,15 @@
---
> @@ -64,15 +64,15 @@
33c33
< @@ -75,7 +75,7 @@
---
> @@ -80,7 +80,7 @@
43c43
< index e425f48..7e6cc2b 100644
---
> index 267eb0d..a3d0ab9 100644
56c56
< index 1885a1f..6ffd328 100644
---
> index 7ed559f..d835f91 100644
69c69
< index d70c488..95b5bf9 100644
---
> index 4e7ed2c..6be9e69 100644
82c82
< index 1e717f8..17af6bc 100644
---
> index 0fc8847..af7a926 100644
85c85
< @@ -121,27 +121,27 @@
---
> @@ -133,27 +133,27 @@
119c119
< @@ -181,27 +181,27 @@
---
> @@ -193,27 +193,27 @@
153c153
< @@ -217,27 +217,27 @@
---
> @@ -229,27 +229,27 @@
188c188
< index 2f7ac3c..491a0c9 100644
---
> index ccee507..fe4a502 100644
191,192c191
< @@ -83,7 +83,7 @@
<
---
> @@ -84,7 +84,7 @@
193a193
>      <!-- language versions -->
201c201
< index 2dc2eef..88f09e3 100644
---
> index c4ac898..e275f6e 100644
214c214
< index 937d11a..aff1d77 100644
---
> index 83485b0..5af4ffa 100644
227c227
< index 27f5433..4cd3c7e 100644
---
> index 5d385ac..cfafbf8 100644
240c240
< index 04b6983..2eb5cab 100644
---
> index 0185bb7..9b98473 100644
253c253
< index 9e1549d..b0f52a7 100644
---
> index a8d2616..126cb85 100644
266c266
< index d33038e..1b95436 100644
---
> index 1127228..e30df11 100644

below are content of master and pr1668 files

// master

diff --git a/beam/pom.xml b/beam/pom.xml
index dc31594..c4ad855 100644
--- a/beam/pom.xml
+++ b/beam/pom.xml
@@ -47,7 +47,7 @@
     
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-core_2.10</artifactId>
+      <artifactId>spark-core_2.11</artifactId>
       <version>${beam.spark.version}</version>
       <exclusions>
         <exclusion>
@@ -59,15 +59,15 @@
           <groupId>io.netty</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>akka-actor_2.10</artifactId>
+          <artifactId>akka-actor_2.11</artifactId>
           <groupId>org.spark-project.akka</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>akka-remote_2.10</artifactId>
+          <artifactId>akka-remote_2.11</artifactId>
           <groupId>org.spark-project.akka</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>akka-slf4j_2.10</artifactId>
+          <artifactId>akka-slf4j_2.11</artifactId>
           <groupId>org.spark-project.akka</groupId>
         </exclusion>
       </exclusions>
@@ -75,7 +75,7 @@
   
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-streaming_2.10</artifactId>
+      <artifactId>spark-streaming_2.11</artifactId>
       <version>${beam.spark.version}</version>
     </dependency>
 
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index e425f48..7e6cc2b 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <groupId>org.apache.zeppelin</groupId>
-    <artifactId>zeppelin-cassandra_2.10</artifactId>
+    <artifactId>zeppelin-cassandra_2.11</artifactId>
     <packaging>jar</packaging>
     <version>0.7.0-SNAPSHOT</version>
     <name>Zeppelin: Apache Cassandra interpreter</name>
diff --git a/flink/pom.xml b/flink/pom.xml
index 1885a1f..6ffd328 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-flink_2.10</artifactId>
+  <artifactId>zeppelin-flink_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Flink</name>
diff --git a/ignite/pom.xml b/ignite/pom.xml
index d70c488..95b5bf9 100644
--- a/ignite/pom.xml
+++ b/ignite/pom.xml
@@ -26,7 +26,7 @@
     <relativePath>..</relativePath>
   </parent>
 
-  <artifactId>zeppelin-ignite_2.10</artifactId>
+  <artifactId>zeppelin-ignite_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Apache Ignite interpreter</name>
diff --git a/livy/pom.xml b/livy/pom.xml
index 1e717f8..17af6bc 100644
--- a/livy/pom.xml
+++ b/livy/pom.xml
@@ -121,27 +121,27 @@
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-core_2.10</artifactId>
+                    <artifactId>spark-core_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-sql_2.10</artifactId>
+                    <artifactId>spark-sql_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-streaming_2.10</artifactId>
+                    <artifactId>spark-streaming_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-hive_2.10</artifactId>
+                    <artifactId>spark-hive_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-repl_2.10</artifactId>
+                    <artifactId>spark-repl_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-yarn_2.10</artifactId>
+                    <artifactId>spark-yarn_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.hadoop</groupId>
@@ -181,27 +181,27 @@
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-core_2.10</artifactId>
+                    <artifactId>spark-core_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-sql_2.10</artifactId>
+                    <artifactId>spark-sql_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-streaming_2.10</artifactId>
+                    <artifactId>spark-streaming_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-hive_2.10</artifactId>
+                    <artifactId>spark-hive_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-repl_2.10</artifactId>
+                    <artifactId>spark-repl_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-yarn_2.10</artifactId>
+                    <artifactId>spark-yarn_2.11</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -217,27 +217,27 @@
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-core_2.10</artifactId>
+                    <artifactId>spark-core_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-sql_2.10</artifactId>
+                    <artifactId>spark-sql_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-streaming_2.10</artifactId>
+                    <artifactId>spark-streaming_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-hive_2.10</artifactId>
+                    <artifactId>spark-hive_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-repl_2.10</artifactId>
+                    <artifactId>spark-repl_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-yarn_2.10</artifactId>
+                    <artifactId>spark-yarn_2.11</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 2f7ac3c..491a0c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
 
   <properties>
     <scala.version>2.10.5</scala.version>
-    <scala.binary.version>2.10</scala.binary.version>
+    <scala.binary.version>2.11</scala.binary.version>
     <scalatest.version>2.2.4</scalatest.version>
     <scalacheck.version>1.12.5</scalacheck.version>
 
diff --git a/r/pom.xml b/r/pom.xml
index 2dc2eef..88f09e3 100644
--- a/r/pom.xml
+++ b/r/pom.xml
@@ -27,7 +27,7 @@
     <relativePath>..</relativePath>
   </parent>
 
-  <artifactId>zeppelin-zrinterpreter_2.10</artifactId>
+  <artifactId>zeppelin-zrinterpreter_2.11</artifactId>
   <packaging>jar</packaging>
   <name>Zeppelin: R Interpreter</name>
   <description>R Interpreter for Zeppelin</description>
diff --git a/scalding/pom.xml b/scalding/pom.xml
index 937d11a..aff1d77 100644
--- a/scalding/pom.xml
+++ b/scalding/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-scalding_2.10</artifactId>
+  <artifactId>zeppelin-scalding_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Scalding interpreter</name>
diff --git a/scio/pom.xml b/scio/pom.xml
index 27f5433..4cd3c7e 100644
--- a/scio/pom.xml
+++ b/scio/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-scio_2.10</artifactId>
+  <artifactId>zeppelin-scio_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Scio</name>
diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
index 04b6983..2eb5cab 100644
--- a/spark-dependencies/pom.xml
+++ b/spark-dependencies/pom.xml
@@ -28,7 +28,7 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-spark-dependencies_2.10</artifactId>
+  <artifactId>zeppelin-spark-dependencies_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Spark dependencies</name>
diff --git a/spark/pom.xml b/spark/pom.xml
index 9e1549d..b0f52a7 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-spark_2.10</artifactId>
+  <artifactId>zeppelin-spark_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Spark</name>
diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml
index d33038e..1b95436 100644
--- a/zeppelin-display/pom.xml
+++ b/zeppelin-display/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-display_2.10</artifactId>
+  <artifactId>zeppelin-display_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Display system apis</name>
// pr1668

diff --git a/beam/pom.xml b/beam/pom.xml
index 02a7ab3..c821dbb 100644
--- a/beam/pom.xml
+++ b/beam/pom.xml
@@ -52,7 +52,7 @@
     
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-core_2.10</artifactId>
+      <artifactId>spark-core_2.11</artifactId>
       <version>${beam.spark.version}</version>
       <exclusions>
         <exclusion>
@@ -64,15 +64,15 @@
           <groupId>io.netty</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>akka-actor_2.10</artifactId>
+          <artifactId>akka-actor_2.11</artifactId>
           <groupId>org.spark-project.akka</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>akka-remote_2.10</artifactId>
+          <artifactId>akka-remote_2.11</artifactId>
           <groupId>org.spark-project.akka</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>akka-slf4j_2.10</artifactId>
+          <artifactId>akka-slf4j_2.11</artifactId>
           <groupId>org.spark-project.akka</groupId>
         </exclusion>
       </exclusions>
@@ -80,7 +80,7 @@
   
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-streaming_2.10</artifactId>
+      <artifactId>spark-streaming_2.11</artifactId>
       <version>${beam.spark.version}</version>
     </dependency>
 
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 267eb0d..a3d0ab9 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <groupId>org.apache.zeppelin</groupId>
-    <artifactId>zeppelin-cassandra_2.10</artifactId>
+    <artifactId>zeppelin-cassandra_2.11</artifactId>
     <packaging>jar</packaging>
     <version>0.7.0-SNAPSHOT</version>
     <name>Zeppelin: Apache Cassandra interpreter</name>
diff --git a/flink/pom.xml b/flink/pom.xml
index 7ed559f..d835f91 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-flink_2.10</artifactId>
+  <artifactId>zeppelin-flink_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Flink</name>
diff --git a/ignite/pom.xml b/ignite/pom.xml
index 4e7ed2c..6be9e69 100644
--- a/ignite/pom.xml
+++ b/ignite/pom.xml
@@ -26,7 +26,7 @@
     <relativePath>..</relativePath>
   </parent>
 
-  <artifactId>zeppelin-ignite_2.10</artifactId>
+  <artifactId>zeppelin-ignite_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Apache Ignite interpreter</name>
diff --git a/livy/pom.xml b/livy/pom.xml
index 0fc8847..af7a926 100644
--- a/livy/pom.xml
+++ b/livy/pom.xml
@@ -133,27 +133,27 @@
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-core_2.10</artifactId>
+                    <artifactId>spark-core_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-sql_2.10</artifactId>
+                    <artifactId>spark-sql_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-streaming_2.10</artifactId>
+                    <artifactId>spark-streaming_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-hive_2.10</artifactId>
+                    <artifactId>spark-hive_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-repl_2.10</artifactId>
+                    <artifactId>spark-repl_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-yarn_2.10</artifactId>
+                    <artifactId>spark-yarn_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.hadoop</groupId>
@@ -193,27 +193,27 @@
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-core_2.10</artifactId>
+                    <artifactId>spark-core_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-sql_2.10</artifactId>
+                    <artifactId>spark-sql_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-streaming_2.10</artifactId>
+                    <artifactId>spark-streaming_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-hive_2.10</artifactId>
+                    <artifactId>spark-hive_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-repl_2.10</artifactId>
+                    <artifactId>spark-repl_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-yarn_2.10</artifactId>
+                    <artifactId>spark-yarn_2.11</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -229,27 +229,27 @@
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-core_2.10</artifactId>
+                    <artifactId>spark-core_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-sql_2.10</artifactId>
+                    <artifactId>spark-sql_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-streaming_2.10</artifactId>
+                    <artifactId>spark-streaming_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-hive_2.10</artifactId>
+                    <artifactId>spark-hive_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-repl_2.10</artifactId>
+                    <artifactId>spark-repl_2.11</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.spark</groupId>
-                    <artifactId>spark-yarn_2.10</artifactId>
+                    <artifactId>spark-yarn_2.11</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
diff --git a/pom.xml b/pom.xml
index ccee507..fe4a502 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
   <properties>
     <!-- language versions -->
     <scala.version>2.10.5</scala.version>
-    <scala.binary.version>2.10</scala.binary.version>
+    <scala.binary.version>2.11</scala.binary.version>
     <scalatest.version>2.2.4</scalatest.version>
     <scalacheck.version>1.12.5</scalacheck.version>
 
diff --git a/r/pom.xml b/r/pom.xml
index c4ac898..e275f6e 100644
--- a/r/pom.xml
+++ b/r/pom.xml
@@ -27,7 +27,7 @@
     <relativePath>..</relativePath>
   </parent>
 
-  <artifactId>zeppelin-zrinterpreter_2.10</artifactId>
+  <artifactId>zeppelin-zrinterpreter_2.11</artifactId>
   <packaging>jar</packaging>
   <name>Zeppelin: R Interpreter</name>
   <description>R Interpreter for Zeppelin</description>
diff --git a/scalding/pom.xml b/scalding/pom.xml
index 83485b0..5af4ffa 100644
--- a/scalding/pom.xml
+++ b/scalding/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-scalding_2.10</artifactId>
+  <artifactId>zeppelin-scalding_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Scalding interpreter</name>
diff --git a/scio/pom.xml b/scio/pom.xml
index 5d385ac..cfafbf8 100644
--- a/scio/pom.xml
+++ b/scio/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-scio_2.10</artifactId>
+  <artifactId>zeppelin-scio_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Scio</name>
diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
index 0185bb7..9b98473 100644
--- a/spark-dependencies/pom.xml
+++ b/spark-dependencies/pom.xml
@@ -28,7 +28,7 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-spark-dependencies_2.10</artifactId>
+  <artifactId>zeppelin-spark-dependencies_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Spark dependencies</name>
diff --git a/spark/pom.xml b/spark/pom.xml
index a8d2616..126cb85 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-spark_2.10</artifactId>
+  <artifactId>zeppelin-spark_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Spark</name>
diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml
index 1127228..e30df11 100644
--- a/zeppelin-display/pom.xml
+++ b/zeppelin-display/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-display_2.10</artifactId>
+  <artifactId>zeppelin-display_2.11</artifactId>
   <packaging>jar</packaging>
   <version>0.7.0-SNAPSHOT</version>
   <name>Zeppelin: Display system apis</name>

@bzz
Copy link
Member

bzz commented Nov 24, 2016

Thank you for double-checking and explanations. Looks like CI is failing right now though

@1ambda
Copy link
Member Author

1ambda commented Nov 24, 2016

@bzz

Failed due to not the related test. I will amend the last commit and trigger CI again

// https://travis-ci.org/apache/zeppelin/builds/178501049
// https://api.travis-ci.org/jobs/178501057/log.txt?deansi=true

Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 110.105 sec - in org.apache.zeppelin.integration.ZeppelinIT

Results :

Tests in error: 
  InterpreterIT.testShowDescriptionOnInterpreterCreate:69 » ElementNotVisible El...

Tests run: 18, Failures: 0, Errors: 1, Skipped: 0

@1ambda 1ambda force-pushed the chore/centralize-maven-pom-versions branch from b724218 to bc40176 Compare November 24, 2016 06:02
@bzz
Copy link
Member

bzz commented Nov 24, 2016

Looks great to me and CI is green now.

Merging to master, if there is no further discussion.

@bzz
Copy link
Member

bzz commented Nov 24, 2016

@1ambda it looks like rebase is needed after few other pom.xml modifications got merged

@1ambda 1ambda force-pushed the chore/centralize-maven-pom-versions branch 3 times, most recently from 1f0ba6d to 1527b84 Compare November 25, 2016 04:23
@1ambda
Copy link
Member Author

1ambda commented Nov 25, 2016

CI failed

[ERROR] COMPILATION ERROR : 
[INFO] -------------------------------------------------------------
[ERROR] /home/travis/build/apache/zeppelin/python/src/test/java/org/apache/zeppelin/python/PythonDockerInterpreterTest.java:[73,12] no suitable constructor found for InterpreterContext(java.lang.String,java.lang.String,java.lang.String,java.lang.String,org.apache.zeppelin.user.AuthenticationInfo,java.util.HashMap<java.lang.String,java.lang.Object>,org.apache.zeppelin.display.GUI,<nulltype>,<nulltype>,<nulltype>,org.apache.zeppelin.interpreter.InterpreterOutput)
    constructor org.apache.zeppelin.interpreter.InterpreterContext.InterpreterContext(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,org.apache.zeppelin.user.AuthenticationInfo,java.util.Map<java.lang.String,java.lang.Object>,org.apache.zeppelin.display.GUI,org.apache.zeppelin.display.AngularObjectRegistry,org.apache.zeppelin.resource.ResourcePool,java.util.List<org.apache.zeppelin.interpreter.InterpreterContextRunner>,org.apache.zeppelin.interpreter.InterpreterOutput,org.apache.zeppelin.interpreter.remote.RemoteInterpreterEventClient) is not applicable
      (actual and formal argument lists differ in length)
    constructor org.apache.zeppelin.interpreter.InterpreterContext.InterpreterContext(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,org.apache.zeppelin.user.AuthenticationInfo,java.util.Map<java.lang.String,java.lang.Object>,org.apache.zeppelin.display.GUI,org.apache.zeppelin.display.AngularObjectRegistry,org.apache.zeppelin.resource.ResourcePool,java.util.List<org.apache.zeppelin.interpreter.InterpreterContextRunner>,org.apache.zeppelin.interpreter.InterpreterOutput) is not applicable
      (actual and formal argument lists differ in length)
[INFO] 1 error
[INFO] -------------------------------------------------------------
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO] 
[INFO] Zeppelin ........................................... SUCCESS [  3.075 s]
[INFO] Zeppelin: Interpreter .............................. SUCCESS [  9.658 s]
[INFO] Zeppelin: Zengine .................................. SUCCESS [  5.095 s]
[INFO] Zeppelin: Display system apis ...................... SUCCESS [ 14.476 s]
[INFO] Zeppelin: Spark dependencies ....................... SUCCESS [ 31.495 s]
[INFO] Zeppelin: Spark .................................... SUCCESS [ 20.810 s]
[INFO] Zeppelin: Markdown interpreter ..................... SUCCESS [  0.623 s]
[INFO] Zeppelin: Angular interpreter ...................... SUCCESS [  0.291 s]
[INFO] Zeppelin: Shell interpreter ........................ SUCCESS [  0.326 s]
[INFO] Zeppelin: Livy interpreter ......................... SUCCESS [  4.728 s]
[INFO] Zeppelin: HBase interpreter ........................ SUCCESS [  3.176 s]
[INFO] Zeppelin: Apache Pig Interpreter ................... SUCCESS [  2.708 s]
[INFO] Zeppelin: PostgreSQL interpreter ................... SUCCESS [  0.502 s]
[INFO] Zeppelin: JDBC interpreter ......................... SUCCESS [  0.893 s]
[INFO] Zeppelin: File System Interpreters ................. SUCCESS [  0.912 s]
[INFO] Zeppelin: Flink .................................... SUCCESS [  5.955 s]
[INFO] Zeppelin: Apache Ignite interpreter ................ SUCCESS [  0.746 s]
[INFO] Zeppelin: Kylin interpreter ........................ SUCCESS [  0.398 s]
[INFO] Zeppelin: Python interpreter ....................... FAILURE [  0.432 s]
[INFO] Zeppelin: Lens interpreter ......................... SKIPPED
[INFO] Zeppelin: Apache Cassandra interpreter ............. SKIPPED
[INFO] Zeppelin: Elasticsearch interpreter ................ SKIPPED
[INFO] Zeppelin: BigQuery interpreter ..................... SKIPPED
[INFO] Zeppelin: Alluxio interpreter ...................... SKIPPED
[INFO] Zeppelin: Scio ..................................... SKIPPED
[INFO] Zeppelin: web Application .......................... SKIPPED
[INFO] Zeppelin: Server ................................... SKIPPED
[INFO] Zeppelin: Packaging distribution ................... SKIPPED
[INFO] Zeppelin: Examples ................................. SKIPPED
[INFO] Zeppelin: Example application - Clock .............. SKIPPED
[INFO] Zeppelin: Example application - Horizontal Bar chart SKIPPED
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 01:47 min
[INFO] Finished at: 2016-11-25T04:26:43+00:00
[INFO] Final Memory: 161M/1237M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project zeppelin-python: Compilation failure
[ERROR] /home/travis/build/apache/zeppelin/python/src/test/java/org/apache/zeppelin/python/PythonDockerInterpreterTest.java:[73,12] no suitable constructor found for InterpreterContext(java.lang.String,java.lang.String,java.lang.String,java.lang.String,org.apache.zeppelin.user.AuthenticationInfo,java.util.HashMap<java.lang.String,java.lang.Object>,org.apache.zeppelin.display.GUI,<nulltype>,<nulltype>,<nulltype>,org.apache.zeppelin.interpreter.InterpreterOutput)
[ERROR] constructor org.apache.zeppelin.interpreter.InterpreterContext.InterpreterContext(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,org.apache.zeppelin.user.AuthenticationInfo,java.util.Map<java.lang.String,java.lang.Object>,org.apache.zeppelin.display.GUI,org.apache.zeppelin.display.AngularObjectRegistry,org.apache.zeppelin.resource.ResourcePool,java.util.List<org.apache.zeppelin.interpreter.InterpreterContextRunner>,org.apache.zeppelin.interpreter.InterpreterOutput,org.apache.zeppelin.interpreter.remote.RemoteInterpreterEventClient) is not applicable
[ERROR] (actual and formal argument lists differ in length)
[ERROR] constructor org.apache.zeppelin.interpreter.InterpreterContext.InterpreterContext(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,org.apache.zeppelin.user.AuthenticationInfo,java.util.Map<java.lang.String,java.lang.Object>,org.apache.zeppelin.display.GUI,org.apache.zeppelin.display.AngularObjectRegistry,org.apache.zeppelin.resource.ResourcePool,java.util.List<org.apache.zeppelin.interpreter.InterpreterContextRunner>,org.apache.zeppelin.interpreter.InterpreterOutput) is not applicable

@1ambda 1ambda force-pushed the chore/centralize-maven-pom-versions branch 3 times, most recently from 033f0e2 to 2fb4e1c Compare November 29, 2016 04:13
@1ambda
Copy link
Member Author

1ambda commented Nov 29, 2016

rebased to keep sync with master (+ to see CI is green as well)

@1ambda
Copy link
Member Author

1ambda commented Nov 29, 2016

@bzz I think this can be merged before #1339. I guess It takes time more

@bzz
Copy link
Member

bzz commented Nov 29, 2016

Sounds reasonable. CI is green, merging to master then.

@1ambda
Copy link
Member Author

1ambda commented Nov 29, 2016

I will resolve conflict with 4ac577f

@bzz
Copy link
Member

bzz commented Nov 29, 2016

thanks a lot, @1ambda !

@1ambda 1ambda force-pushed the chore/centralize-maven-pom-versions branch from 2fb4e1c to 1a5419a Compare November 29, 2016 08:35
@bzz
Copy link
Member

bzz commented Nov 30, 2016

Thank you @1ambda !

Merging to master, if there is no further discussion.

@1ambda 1ambda force-pushed the chore/centralize-maven-pom-versions branch from ffc1982 to 5a9c966 Compare December 1, 2016 03:38
@bzz
Copy link
Member

bzz commented Dec 1, 2016

Waiting for CI to finish on https://travis-ci.org/1ambda/zeppelin/

Will merge to master right after that, if there is no further discussion.

@bzz
Copy link
Member

bzz commented Dec 1, 2016

2 Scala 2.11 profiles failed on IgniteSQL tests - a flaky test tracked under ZEPPELIN-1738

Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 1.116 sec <<< FAILURE! - in org.apache.zeppelin.ignite.IgniteSqlInterpreterTest
testSql(org.apache.zeppelin.ignite.IgniteSqlInterpreterTest)  Time elapsed: 0.909 sec  <<< FAILURE!
java.lang.AssertionError: expected:<SUCCESS> but was:<ERROR>
	at org.junit.Assert.fail(Assert.java:88)
	at org.junit.Assert.failNotEquals(Assert.java:743)
	at org.junit.Assert.assertEquals(Assert.java:118)
	at org.junit.Assert.assertEquals(Assert.java:144)
	at org.apache.zeppelin.ignite.IgniteSqlInterpreterTest.testSql(IgniteSqlInterpreterTest.java:95)

which is not relevant to the change.

@asfgit asfgit closed this in ad35864 Dec 1, 2016
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.

2 participants