From 528c22f59d3a35934f4f4308746a78d833b759e8 Mon Sep 17 00:00:00 2001
From: David Mollitor <dmollitor@apache.org>
Date: Mon, 11 May 2020 10:57:00 -0400
Subject: THRIFT-5201: Use Apache Parent Pom for Thrift Maven Plugin Client:
 Java Patch: David Mollitor

This closes #2136
---
 contrib/thrift-maven-plugin/pom.xml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'contrib')

diff --git a/contrib/thrift-maven-plugin/pom.xml b/contrib/thrift-maven-plugin/pom.xml
index 4179b1d91..b18162257 100644
--- a/contrib/thrift-maven-plugin/pom.xml
+++ b/contrib/thrift-maven-plugin/pom.xml
@@ -23,26 +23,34 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>23</version>
+  </parent>
   <groupId>org.apache.thrift</groupId>
   <artifactId>thrift-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>thrift-maven-plugin</name>
   <version>1.0.0</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <thrift.root>${basedir}/../..</thrift.root>
+    <thrift.compiler>${thrift.root}/compiler/cpp/thrift</thrift.compiler>
+    <thrift.test.home>${thrift.root}/test</thrift.test.home>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.14.1</version>
         <configuration>
           <systemPropertyVariables>
             <thriftExecutable>${thrift.compiler}</thriftExecutable>
@@ -52,7 +60,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
         <executions>
           <execution>
             <id>generate-jar-for-test</id>
@@ -104,10 +111,4 @@
       <scope>test</scope>
    </dependency>
   </dependencies>
-  <properties>
-    <thrift.root>${basedir}/../..</thrift.root>
-    <thrift.compiler>${thrift.root}/compiler/cpp/thrift</thrift.compiler>
-    <thrift.test.home>${thrift.root}/test</thrift.test.home>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
 </project>
-- 
cgit v1.2.1