parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jul...@apache.org
Subject git commit: update scala 2.10
Date Mon, 08 Sep 2014 21:12:30 GMT
Repository: incubator-parquet-mr
Updated Branches:
  refs/heads/master 5dafd127f -> 5f39948b2


update scala 2.10

Try to upgrade to scala 2.10

Author: Tianshuo Deng <tdeng@twitter.com>

Closes #35 from tsdeng/update_scala_2_10 and squashes the following commits:

1b7e55f [Tianshuo Deng] fix comment
bed9de3 [Tianshuo Deng] remove twitter artifactory
2bce643 [Tianshuo Deng] publish fix
06b374e [Tianshuo Deng] define scala.binary.version
fcf6965 [Tianshuo Deng] Merge branch 'master' into update_scala_2_10
e91d9f7 [Tianshuo Deng] update version
5d18b88 [Tianshuo Deng] version
83df898 [Tianshuo Deng] update scala 2.10


Project: http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/commit/5f39948b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/tree/5f39948b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/diff/5f39948b

Branch: refs/heads/master
Commit: 5f39948b2414ea2582892f6447566d7fe4909b4f
Parents: 5dafd12
Author: Tianshuo Deng <tdeng@twitter.com>
Authored: Mon Sep 8 14:12:11 2014 -0700
Committer: julien <julien@twitter.com>
Committed: Mon Sep 8 14:12:11 2014 -0700

----------------------------------------------------------------------
 parquet-scala/pom.xml                                          | 4 ++--
 parquet-scrooge/pom.xml                                        | 6 +++---
 .../src/main/java/parquet/scrooge/ScroogeStructConverter.java  | 3 ++-
 pom.xml                                                        | 5 ++++-
 4 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/blob/5f39948b/parquet-scala/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-scala/pom.xml b/parquet-scala/pom.xml
index 6b577d9..e182bab 100644
--- a/parquet-scala/pom.xml
+++ b/parquet-scala/pom.xml
@@ -8,7 +8,7 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>parquet-scala</artifactId>
+  <artifactId>parquet-scala_${scala.binary.version}</artifactId>
   <packaging>jar</packaging>
 
   <name>Parquet Scala</name>
@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.9.3</artifactId>
+      <artifactId>scalatest_${scala.binary.version}</artifactId>
       <version>1.9.2</version>
       <scope>test</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/blob/5f39948b/parquet-scrooge/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-scrooge/pom.xml b/parquet-scrooge/pom.xml
index de5e24e..33104d3 100644
--- a/parquet-scrooge/pom.xml
+++ b/parquet-scrooge/pom.xml
@@ -8,7 +8,7 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>parquet-scrooge</artifactId>
+  <artifactId>parquet-scrooge_${scala.binary.version}</artifactId>
   <packaging>jar</packaging>
 
   <name>Parquet Scrooge</name>
@@ -73,8 +73,8 @@
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
-      <artifactId>scrooge-core_2.9.2</artifactId>
-      <version>3.12.1</version>
+      <artifactId>scrooge-core_${scala.binary.version}</artifactId>
+      <version>3.16.3</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/blob/5f39948b/parquet-scrooge/src/main/java/parquet/scrooge/ScroogeStructConverter.java
----------------------------------------------------------------------
diff --git a/parquet-scrooge/src/main/java/parquet/scrooge/ScroogeStructConverter.java b/parquet-scrooge/src/main/java/parquet/scrooge/ScroogeStructConverter.java
index a13c741..ebcc97e 100644
--- a/parquet-scrooge/src/main/java/parquet/scrooge/ScroogeStructConverter.java
+++ b/parquet-scrooge/src/main/java/parquet/scrooge/ScroogeStructConverter.java
@@ -25,6 +25,7 @@ import static parquet.thrift.struct.ThriftField.Requirement.*;
 
 import scala.collection.Iterator;
 import scala.collection.JavaConversions;
+import scala.collection.JavaConversions$;
 import scala.collection.Seq;
 import scala.reflect.Manifest;
 
@@ -75,7 +76,7 @@ public class ScroogeStructConverter {
     }
 
     List<ThriftField> children = new LinkedList<ThriftField>();//{@link ThriftType.StructType}
uses foreach loop to iterate the children, yields O(n) time for linked list
-    Iterable<ThriftStructField> scroogeFields = JavaConversions.asIterable(companionObject.metaData().fields());
+    Iterable<ThriftStructField> scroogeFields = JavaConversions$.MODULE$.asJavaIterable(companionObject.metaData().fields());
     for (ThriftStructField field : scroogeFields) {
       children.add(toThriftField(field));
     }

http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/blob/5f39948b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 65969e7..abe8a0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
       <name>Nexus Release Repository</name>
       <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
     </repository>
+
   </distributionManagement>
 
   <repositories>
@@ -89,7 +90,9 @@
     <log4j.version>1.2.17</log4j.version>
     <previous.version>1.6.0rc1</previous.version>
     <thrift.executable>thrift</thrift.executable>
-    <scala.version>2.9.2</scala.version>
+    <scala.version>2.10.4</scala.version>
+    <!-- scala.binary.version is used for projects that fetch dependencies that are in
scala -->
+    <scala.binary.version>2.10</scala.binary.version>
   </properties>
 
   <modules>


Mime
View raw message