Skip to content

PARQUET-2046: Upgrade Apache POM to 23 #904

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
gszadovszky merged 5 commits into from
May 17, 2021
Merged

PARQUET-2046: Upgrade Apache POM to 23 #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
054911d
PARQUET-2046: Upgrade Apache POM to 23
belugabehr May 13, 2021
8ade868
Updated for Apache POM 23
belugabehr May 13, 2021
0bf2f64
Put plugin back into project
belugabehr May 13, 2021
222fe76
Removed old version number
belugabehr May 13, 2021
4b1dfe3
Updated enforcer rules
belugabehr May 13, 2021
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
5 changes: 0 additions & 5 deletions parquet-benchmarks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerVersion>${targetJavaVersion}</compilerVersion>
<source>${targetJavaVersion}</source>
<target>${targetJavaVersion}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
9 changes: 4 additions & 5 deletions parquet-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@
<goal>shade</goal>
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>runtime</shadedClassifierName>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>runtime</shadedClassifierName>
<minimizeJar>false</minimizeJar>
<filters>
<filter>
Expand All @@ -139,9 +139,8 @@
</artifactSet>
<relocations>
<relocation>
<!-- relocate Avro in the runtime jar to avoid conflicts with
on-cluster Avro versions.
-->
<!-- relocate Avro in the runtime jar to avoid conflicts with
on-cluster Avro versions. -->
<pattern>org.apache.avro</pattern>
<shadedPattern>${shade.prefix}.org.apache.avro</shadedPattern>
</relocation>
Expand Down
2 changes: 0 additions & 2 deletions parquet-format-structures/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<!-- We have to turn off the javadoc check because thrift generates improper comments -->
<doclint>none</doclint>
Expand All @@ -142,7 +141,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<!-- We have to turn off the javadoc check because thrift generates improper comments -->
<doclint>none</doclint>
Expand Down
1 change: 0 additions & 1 deletion parquet-protobuf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
34 changes: 3 additions & 31 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>16</version>
<version>23</version>
Copy link
Member

@dongjoon-hyun dongjoon-hyun May 13, 2021

Choose a reason for hiding this comment

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

Just a question. Is there a reason why we need to upgrade to 23?

Copy link
Contributor

@Fokko Fokko May 14, 2021

Choose a reason for hiding this comment

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

It is nice to keep everything in sync. The parent pom will also bump the plugins used by Maven.

</parent>

<groupId>org.apache.parquet</groupId>
Expand Down Expand Up @@ -67,12 +67,9 @@
</developers>

<properties>
<targetJavaVersion>1.8</targetJavaVersion>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>${targetJavaVersion}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<github.global.server>github</github.global.server>
<maven-jar-plugin.version>2.4</maven-jar-plugin.version>
<jackson.groupId>com.fasterxml.jackson.core</jackson.groupId>
<jackson.package>com.fasterxml.jackson</jackson.package>
<jackson.version>2.12.2</jackson.version>
Expand Down Expand Up @@ -103,7 +100,6 @@
<brotli-codec.version>0.1.1</brotli-codec.version>
<mockito.version>1.10.19</mockito.version>
<net.openhft.version>0.9</net.openhft.version>
<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>

<!-- parquet-cli dependencies -->
Expand Down Expand Up @@ -157,7 +153,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<reportSets>
<reportSet><!-- by default, id = "default" -->
<reports><!-- select non-aggregate reports -->
Expand Down Expand Up @@ -219,15 +214,8 @@
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
</plugin>

<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<executions>
<execution>
<id>enforce-banned-dependencies</id>
Expand All @@ -238,7 +226,7 @@
<rules>
<bannedDependencies>
<excludes>
<exclude>org.slf4j:slf4j-log4j12</exclude>
<exclude>org.slf4j:slf4j-log4j12:*:*:compile</exclude>
</excludes>
</bannedDependencies>
</rules>
Expand All @@ -250,7 +238,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -296,7 +283,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
<archive>
<manifestEntries>
Expand All @@ -318,7 +304,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<sourceFileExcludes>
<sourceFileExclude>**/generated-sources/**/*.java</sourceFileExclude>
Expand All @@ -345,16 +330,9 @@
</executions-->
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.5</version>
<configuration>
<skip>true</skip>
</configuration>
Expand All @@ -364,7 +342,6 @@
<!-- Override source and target from the ASF parent -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<argLine>-XX:MaxPermSize=256m</argLine>
<source>${maven.compiler.source}</source>
Expand All @@ -375,7 +352,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<goals>
Expand All @@ -389,7 +365,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.10</version>
<configuration>
<argLine>${surefire.argLine}</argLine>
<systemPropertyVariables>
Expand Down Expand Up @@ -428,7 +403,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.12</version>
<executions>
<execution>
<phase>test</phase>
Expand Down Expand Up @@ -524,7 +498,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.7</version>
<reportSets>
<reportSet>
<reports>
Expand Down Expand Up @@ -553,7 +526,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>
Expand Down