Skip to content

PARQUET-1496: Update Scala to 2.12 #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nandorKollar merged 3 commits into from
Oct 25, 2019
+21 −22
Merged

PARQUET-1496: Update Scala to 2.12 #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d4fde7
PARQUET-1496: Update Scala to 2.12
Fokko Oct 15, 2019
e4e5537
Fix the tests
Fokko Oct 18, 2019
2d81079
Revert unrelated changes
Fokko Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions parquet-scrooge/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<url>https://conjars.org/repo</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.apache.parquet</groupId>
Expand Down Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>scrooge-core_${scala.binary.version}</artifactId>
<version>4.7.0</version>
<version>${scrooge.verion}</version>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
Expand Down Expand Up @@ -193,7 +193,7 @@
<plugin>
<groupId>com.twitter</groupId>
<artifactId>scrooge-maven-plugin</artifactId>
<version>3.17.0</version>
<version>${scrooge.verion}</version>
<configuration>
<outputDirectory>${project.build.directory}/generated-test-sources/scrooge</outputDirectory>
<thriftNamespaceMappings>
Expand All @@ -202,19 +202,17 @@
<to>org.apache.parquet.scrooge.test</to>
</thriftNamespaceMapping>
<thriftNamespaceMapping>
<from>org.apache.parquet.thrift.test.compat</from>
<to>org.apache.parquet.scrooge.test.compat</to>
<from>org.apache.parquet.thrift.test.compat</from>
<to>org.apache.parquet.scrooge.test.compat</to>
</thriftNamespaceMapping>
<thriftNamespaceMapping>
<from>org.apache.parquet.thrift.test.binary</from>
<to>org.apache.parquet.scrooge.test.binary</to>
</thriftNamespaceMapping>
</thriftNamespaceMappings>
<buildExtractedThrift>false</buildExtractedThrift>
</configuration>
<executions>
<execution>
<id>thrift-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>thrift-test-sources</id>
<phase>generate-test-sources</phase>
Expand Down
14 changes: 7 additions & 7 deletions parquet-scrooge/src/test/thrift/test.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/*
/*
* 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
* regarding copyright ownership. The ASF licenses this file
* 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
Expand All @@ -28,7 +28,7 @@ struct Name {
}

struct Address {
1: required string street,
1: string street,
2: required string zip
}

Expand All @@ -38,7 +38,7 @@ struct AddressWithStreetWithDefaultRequirement {
}

struct Phone {
1: required string mobile
1: string mobile
2: required string work
}

Expand Down Expand Up @@ -284,7 +284,7 @@ union UnionV2 {
3: ABool aNewBool
}

struct StructWithUnionV2 {
struct StructWithUnionV2 {
1: required string name,
2: required UnionV2 aUnion
}
Expand All @@ -295,7 +295,7 @@ struct AStructThatLooksLikeUnionV2 {
3: optional ABool aNewBool
}

struct StructWithAStructThatLooksLikeUnionV2 {
struct StructWithAStructThatLooksLikeUnionV2 {
1: required string name,
2: required AStructThatLooksLikeUnionV2 aNotQuiteUnion
}
2 changes: 1 addition & 1 deletion parquet-thrift/src/test/thrift/test.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ struct Address {

struct Phone {
1: string mobile
2: string work
2: required string work
}

struct TestPerson {
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,11 @@
<previous.version>1.7.0</previous.version>
<thrift.executable>thrift</thrift.executable>
<format.thrift.executable>thrift</format.thrift.executable>
<scala.version>2.10.6</scala.version>
<scala.version>2.12.8</scala.version>
<!-- scala.binary.version is used for projects that fetch dependencies that are in scala -->
<scala.binary.version>2.10</scala.binary.version>
<scala.binary.version>2.12</scala.binary.version>
<scala.maven.test.skip>false</scala.maven.test.skip>
<scrooge.verion>19.10.0</scrooge.verion>
<pig.version>0.16.0</pig.version>
<pig.classifier>h2</pig.classifier>
<thrift-maven-plugin.version>0.10.0</thrift-maven-plugin.version>
Expand Down