parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexleven...@apache.org
Subject parquet-mr git commit: PARQUET-269: Restore scrooge-maven-plugin to version 3.17.0
Date Thu, 30 Apr 2015 23:59:27 GMT
Repository: parquet-mr
Updated Branches:
  refs/heads/master 98f54c158 -> 22c6d0870


PARQUET-269: Restore scrooge-maven-plugin to version 3.17.0

Scrooge has re-published scrooge-maven-plugin 3.17.0, so we should be able to use it again.
Lets see if travis is able to pick up the changes.

Author: Alex Levenson <alexlevenson@twitter.com>

Closes #188 from isnotinvain/alexlevenson/restore-scrooge-plugin and squashes the following
commits:

fbec238 [Alex Levenson] Revert "make a whitespace change to trigger tests"
5ea3d26 [Alex Levenson] make a whitespace change to trigger tests
bfe181f [Alex Levenson] Restore scrooge-maven-plugin to version 3.17.0


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

Branch: refs/heads/master
Commit: 22c6d087012fd55bc65e578a27f2edb66f4d3808
Parents: 98f54c1
Author: Alex Levenson <alexlevenson@twitter.com>
Authored: Thu Apr 30 16:59:20 2015 -0700
Committer: Alex Levenson <alexlevenson@twitter.com>
Committed: Thu Apr 30 16:59:20 2015 -0700

----------------------------------------------------------------------
 parquet-scrooge/pom.xml                                           | 2 +-
 .../org/apache/parquet/scrooge/ScroogeStructConverterTest.java    | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/22c6d087/parquet-scrooge/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-scrooge/pom.xml b/parquet-scrooge/pom.xml
index 2b290b7..42d2656 100644
--- a/parquet-scrooge/pom.xml
+++ b/parquet-scrooge/pom.xml
@@ -185,7 +185,7 @@
         <plugin>
             <groupId>com.twitter</groupId>
             <artifactId>scrooge-maven-plugin</artifactId>
-            <version>3.16.3</version>
+            <version>3.17.0</version>
             <configuration>
                 <outputDirectory>${project.build.directory}/generated-test-sources/scrooge</outputDirectory>
                 <thriftNamespaceMappings>

http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/22c6d087/parquet-scrooge/src/test/java/org/apache/parquet/scrooge/ScroogeStructConverterTest.java
----------------------------------------------------------------------
diff --git a/parquet-scrooge/src/test/java/org/apache/parquet/scrooge/ScroogeStructConverterTest.java
b/parquet-scrooge/src/test/java/org/apache/parquet/scrooge/ScroogeStructConverterTest.java
index 5253b4f..7b9f6b0 100644
--- a/parquet-scrooge/src/test/java/org/apache/parquet/scrooge/ScroogeStructConverterTest.java
+++ b/parquet-scrooge/src/test/java/org/apache/parquet/scrooge/ScroogeStructConverterTest.java
@@ -18,7 +18,6 @@
  */
 package org.apache.parquet.scrooge;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.parquet.scrooge.test.AddressWithStreetWithDefaultRequirement;
@@ -55,7 +54,6 @@ public class ScroogeStructConverterTest {
   }
 
   @Test
-  @Ignore
   public void testUnion() throws Exception {
     ThriftType.StructType expected = new ThriftSchemaConverter().toStructType(org.apache.parquet.thrift.test.TestUnion.class);
     ThriftType.StructType scroogeUnion = new ScroogeStructConverter().convert(TestUnion.class);
@@ -110,7 +108,6 @@ public class ScroogeStructConverterTest {
  * if the getter returns option, then it's optional, otherwise it's required
  */
   @Test
-  @Ignore
   public void testDefaultFields() throws Exception{
     ThriftType.StructType scroogePerson = new ScroogeStructConverter().convert(AddressWithStreetWithDefaultRequirement.class);
     ThriftType.StructType expected = new ThriftSchemaConverter().toStructType(org.apache.parquet.thrift.test.AddressWithStreetWithDefaultRequirement.class);


Mime
View raw message