diff --git a/parquet-scrooge/pom.xml b/parquet-scrooge/pom.xml index 6da3c0a3e9..304088854d 100644 --- a/parquet-scrooge/pom.xml +++ b/parquet-scrooge/pom.xml @@ -38,7 +38,7 @@ https://conjars.org/repo - + org.apache.parquet @@ -88,7 +88,7 @@ com.twitter scrooge-core_${scala.binary.version} - 4.7.0 + ${scrooge.verion} org.apache.parquet @@ -193,7 +193,7 @@ com.twitter scrooge-maven-plugin - 3.17.0 + ${scrooge.verion} ${project.build.directory}/generated-test-sources/scrooge @@ -202,19 +202,17 @@ org.apache.parquet.scrooge.test - org.apache.parquet.thrift.test.compat - org.apache.parquet.scrooge.test.compat + org.apache.parquet.thrift.test.compat + org.apache.parquet.scrooge.test.compat + + + org.apache.parquet.thrift.test.binary + org.apache.parquet.scrooge.test.binary + false - - thrift-sources - generate-sources - - compile - - thrift-test-sources generate-test-sources diff --git a/parquet-scrooge/src/test/thrift/test.thrift b/parquet-scrooge/src/test/thrift/test.thrift index 6db7dc19ef..a80dbd924a 100644 --- a/parquet-scrooge/src/test/thrift/test.thrift +++ b/parquet-scrooge/src/test/thrift/test.thrift @@ -1,4 +1,4 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -28,7 +28,7 @@ struct Name { } struct Address { - 1: required string street, + 1: string street, 2: required string zip } @@ -38,7 +38,7 @@ struct AddressWithStreetWithDefaultRequirement { } struct Phone { - 1: required string mobile + 1: string mobile 2: required string work } @@ -284,7 +284,7 @@ union UnionV2 { 3: ABool aNewBool } -struct StructWithUnionV2 { +struct StructWithUnionV2 { 1: required string name, 2: required UnionV2 aUnion } @@ -295,7 +295,7 @@ struct AStructThatLooksLikeUnionV2 { 3: optional ABool aNewBool } -struct StructWithAStructThatLooksLikeUnionV2 { +struct StructWithAStructThatLooksLikeUnionV2 { 1: required string name, 2: required AStructThatLooksLikeUnionV2 aNotQuiteUnion } diff --git a/parquet-thrift/src/test/thrift/test.thrift b/parquet-thrift/src/test/thrift/test.thrift index d25e540b67..e759144173 100644 --- a/parquet-thrift/src/test/thrift/test.thrift +++ b/parquet-thrift/src/test/thrift/test.thrift @@ -35,7 +35,7 @@ struct Address { struct Phone { 1: string mobile - 2: string work + 2: required string work } struct TestPerson { diff --git a/pom.xml b/pom.xml index daea6197e6..b12dad03b3 100644 --- a/pom.xml +++ b/pom.xml @@ -86,10 +86,11 @@ 1.7.0 thrift thrift - 2.10.6 + 2.12.8 - 2.10 + 2.12 false + 19.10.0 0.16.0 h2 0.10.0