From 054911db52e65c686ddf72a701633969b59f4060 Mon Sep 17 00:00:00 2001
From: David Mollitor <dmollitor@apache.org>
Date: Thu, 13 May 2021 15:38:00 -0400
Subject: [PATCH 1/5] PARQUET-2046: Upgrade Apache POM to 23

---
 pom.xml | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5d37dc0679..91cc389d1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>16</version>
+    <version>23</version>
   </parent>
 
   <groupId>org.apache.parquet</groupId>
@@ -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>
@@ -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 -->
@@ -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 -->
@@ -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>
@@ -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>
@@ -318,7 +305,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>
@@ -345,16 +331,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>
@@ -364,7 +343,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>
@@ -375,7 +353,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.10</version>
         <executions>
           <execution>
             <goals>
@@ -389,7 +366,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.10</version>
         <configuration>
           <argLine>${surefire.argLine}</argLine>
           <systemPropertyVariables>
@@ -428,7 +404,6 @@
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <version>0.12</version>
         <executions>
           <execution>
             <phase>test</phase>
@@ -524,7 +499,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-project-info-reports-plugin</artifactId>
-            <version>2.7</version>
             <reportSets>
               <reportSet>
                 <reports>
@@ -553,7 +527,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-site-plugin</artifactId>
-            <version>3.3</version>
             <configuration>
               <skipDeploy>true</skipDeploy>
             </configuration>

From 8ade868d2043356d44080be207a6f48dac53dbd4 Mon Sep 17 00:00:00 2001
From: David Mollitor <dmollitor@apache.org>
Date: Thu, 13 May 2021 15:43:56 -0400
Subject: [PATCH 2/5] Updated for Apache POM 23

---
 parquet-benchmarks/pom.xml        | 9 ---------
 parquet-cli/pom.xml               | 9 ++++-----
 parquet-format-structures/pom.xml | 2 --
 parquet-protobuf/pom.xml          | 1 -
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/parquet-benchmarks/pom.xml b/parquet-benchmarks/pom.xml
index 162534278f..b652d5c242 100644
--- a/parquet-benchmarks/pom.xml
+++ b/parquet-benchmarks/pom.xml
@@ -83,15 +83,6 @@
 
   <build>
     <plugins>
-      <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>
         <artifactId>maven-shade-plugin</artifactId>
diff --git a/parquet-cli/pom.xml b/parquet-cli/pom.xml
index db240b010b..9c7dc13c1c 100644
--- a/parquet-cli/pom.xml
+++ b/parquet-cli/pom.xml
@@ -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>
@@ -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>
diff --git a/parquet-format-structures/pom.xml b/parquet-format-structures/pom.xml
index b0b384f15c..a48ef96981 100644
--- a/parquet-format-structures/pom.xml
+++ b/parquet-format-structures/pom.xml
@@ -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>
@@ -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>
diff --git a/parquet-protobuf/pom.xml b/parquet-protobuf/pom.xml
index 01af743d51..d897c02421 100644
--- a/parquet-protobuf/pom.xml
+++ b/parquet-protobuf/pom.xml
@@ -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>

From 0bf2f6404426fada5ff6add88eaf138ae78233bc Mon Sep 17 00:00:00 2001
From: David Mollitor <dmollitor@apache.org>
Date: Thu, 13 May 2021 15:45:47 -0400
Subject: [PATCH 3/5] Put plugin back into project

---
 parquet-benchmarks/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/parquet-benchmarks/pom.xml b/parquet-benchmarks/pom.xml
index b652d5c242..91f7106a20 100644
--- a/parquet-benchmarks/pom.xml
+++ b/parquet-benchmarks/pom.xml
@@ -83,6 +83,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>

From 222fe76c397eda96615c17dfdec9afa62694af52 Mon Sep 17 00:00:00 2001
From: David Mollitor <dmollitor@apache.org>
Date: Thu, 13 May 2021 16:20:45 -0400
Subject: [PATCH 4/5] Removed old version number

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 91cc389d1c..86c8544a73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,7 +283,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>${maven-jar-plugin.version}</version>
           <configuration>
             <archive>
               <manifestEntries>

From 4b1dfe397bdc761feb94c89d39af934f7677148c Mon Sep 17 00:00:00 2001
From: David Mollitor <dmollitor@apache.org>
Date: Thu, 13 May 2021 16:57:41 -0400
Subject: [PATCH 5/5] Updated enforcer rules

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 86c8544a73..24f122935f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,7 +226,7 @@
               <rules>
                 <bannedDependencies>
                   <excludes>
-                    <exclude>org.slf4j:slf4j-log4j12</exclude>
+                    <exclude>org.slf4j:slf4j-log4j12:*:*:compile</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>