Replace all 'target/', 'target/classes' and 'target/test-classes' pat…

…hes with ${project.build.directory}, ${project.build.outputDirectory} and ${project.build.testOutputDirectory} properties accordingly
apache · Apr 14, 2019 · 21d95d8 · 21d95d8
1 parent 38fd472
commit 21d95d8
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 31 deletions.
diff --git a/contrib/data/tpch-sample-data/pom.xml b/contrib/data/tpch-sample-data/pom.xml
@@ -49,7 +49,7 @@
               <url>http://apache-drill.s3.amazonaws.com/files/sf-0.01_tpc-h_parquet_typed.tgz</url>
               <outputFileName>tpch.tgz</outputFileName>
               <unpack>true</unpack>
-              <outputDirectory>${project.build.directory}/classes/tpch</outputDirectory>
+              <outputDirectory>${project.build.outputDirectory}/tpch</outputDirectory>
             </configuration>
           </execution>
         </executions>

diff --git a/contrib/format-ltsv/pom.xml b/contrib/format-ltsv/pom.xml
@@ -64,7 +64,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/target/classes/org/apache/drill/exec/store/ltsv
+              <outputDirectory>${project.build.outputDirectory}/org/apache/drill/exec/store/ltsv
               </outputDirectory>
               <resources>
                 <resource>

diff --git a/contrib/format-syslog/pom.xml b/contrib/format-syslog/pom.xml
@@ -72,7 +72,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/target/classes/org/apache/drill/exec/store/syslog
+              <outputDirectory>${project.build.outputDirectory}/org/apache/drill/exec/store/syslog
               </outputDirectory>
               <resources>
                 <resource>

diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
@@ -114,7 +114,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/target/classes/org/apache/drill/exec/expr/fn/impl</outputDirectory>
+              <outputDirectory>${project.build.outputDirectory}/org/apache/drill/exec/expr/fn/impl</outputDirectory>
               <resources>
                 <resource>
                   <directory>src/main/java/org/apache/drill/exec/expr/fn/impl</directory>
@@ -125,7 +125,7 @@
                   <filtering>true</filtering>
                 </resource>
                 <resource>
-                  <directory>target/generated-sources</directory>
+                  <directory>${project.build.directory}/generated-sources</directory>
                   <!-- <include>*/org</include> -->
                   <filtering>true</filtering>
                 </resource>

diff --git a/contrib/storage-hive/hive-exec-shade/pom.xml b/contrib/storage-hive/hive-exec-shade/pom.xml
@@ -178,7 +178,7 @@
                   <version>${project.version}</version>
                   <type>jar</type>
                   <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                  <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                   <includes>**/**</includes>
                 </artifactItem>
               </artifactItems>

diff --git a/contrib/udfs/pom.xml b/contrib/udfs/pom.xml
@@ -94,7 +94,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/target/classes/org/apache/drill/exec/udfs</outputDirectory>
+              <outputDirectory>${project.build.outputDirectory}/org/apache/drill/exec/udfs</outputDirectory>
               <resources>
                 <resource>
                   <directory>src/main/java/org/apache/drill/exec/udfs</directory>
@@ -110,7 +110,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/classes/sample-data</outputDirectory>
+              <outputDirectory>${project.build.outputDirectory}/sample-data</outputDirectory>
               <resources>
                 <resource>
                   <directory>sample-data</directory>

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -390,71 +390,71 @@
                   <directory>/opt/drill</directory>
                   <sources>
                     <source>
-                      <location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/git.properties</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/git.properties</location>
                     </source>
                   </sources>
                 </mapping>
                 <mapping>
                   <directory>/opt/drill</directory>
                   <sources>
                     <source>
-                      <location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/KEYS</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/KEYS</location>
                     </source>
                   </sources>
                 </mapping>
                 <mapping>
                   <directory>/opt/drill</directory>
                   <sources>
                     <source>
-                      <location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/LICENSE</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/LICENSE</location>
                     </source>
                   </sources>
                 </mapping>
                 <mapping>
                   <directory>/opt/drill</directory>
                   <sources>
                     <source>
-                      <location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/NOTICE</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/NOTICE</location>
                     </source>
                   </sources>
                 </mapping>
                 <mapping>
                   <directory>/opt/drill</directory>
                   <sources>
                     <source>
-                      <location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/README.md</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/README.md</location>
                     </source>
                   </sources>
                 </mapping>
                 <mapping>
                   <directory>/opt/drill/jars</directory>
                   <sources>
                     <source>
-                      <location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/jars</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/jars</location>
                     </source>
                   </sources>
                 </mapping>
                 <mapping>
                   <directory>/opt/drill/bin</directory>
                   <sources>
                     <source>
-                      <location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/bin</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/bin</location>
                     </source>
                   </sources>
                 </mapping>
                 <mapping>
 		<directory>/opt/drill/sample-data</directory>
                   <sources>
                     <source>
-                      <location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/sample-data</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/sample-data</location>
                     </source>
                   </sources>
                 </mapping>
                 <mapping>
                   <directory>/etc/drill/conf</directory>
                   <sources>
                     <source>
-                      <location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/conf</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/conf</location>
                     </source>
                   </sources>
                   <configuration>true</configuration>
@@ -490,58 +490,58 @@
                 </goals>
                 <configuration>
                   <skipPOMs>false</skipPOMs>
-                  <deb>distribution/target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}.deb</deb>
+                  <deb>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}.deb</deb>
                   <dataSet>
                     <data>
-                      <src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/git.properties</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/git.properties</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
                         <prefix>/opt/drill/</prefix>
                       </mapper>
                     </data>
                     <data>
-                      <src>target/${project.parent.artifactId}-${project.version}${project.parent.artifactId}-${project.version}/KEYS</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}${project.parent.artifactId}-${project.version}/KEYS</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
                         <prefix>/opt/drill/</prefix>
                       </mapper>
                     </data>
                     <data>
-                      <src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/LICENSE</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/LICENSE</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
                         <prefix>/opt/drill/</prefix>
                       </mapper>
                     </data>
                     <data>
-                      <src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/NOTICE</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/NOTICE</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
                         <prefix>/opt/drill/</prefix>
                       </mapper>
                     </data>
                     <data>
-                      <src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/README.md</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/README.md</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
                         <prefix>/opt/drill/</prefix>
                       </mapper>
                     </data>
                     <data>
-                      <src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/jars</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/jars</src>
                       <type>directory</type>
                       <mapper>
                         <type>perm</type>
                         <prefix>/opt/drill/jars/</prefix>
                       </mapper>
                     </data>
                     <data>
-                      <src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/bin</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/bin</src>
                       <type>directory</type>
                       <mapper>
                         <type>perm</type>
@@ -550,7 +550,7 @@
                       </mapper>
                     </data>
                     <data>
-                      <src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/sample-data</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/sample-data</src>
                       <type>directory</type>
                       <mapper>
                         <type>perm</type>
@@ -559,7 +559,7 @@
                       </mapper>
                     </data>
                     <data>
-                      <src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/conf</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/conf</src>
                       <type>directory</type>
                       <mapper>
                         <type>perm</type>

diff --git a/drill-yarn/pom.xml b/drill-yarn/pom.xml
@@ -57,7 +57,7 @@
             </goals>
             <configuration>
               <dotGitDirectory>${project.basedir}/../.git</dotGitDirectory>
-              <generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename>
+              <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
             </configuration>
           </execution>
         </executions>

diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
@@ -267,7 +267,7 @@
           <additionalClasspathElements>
             <additionalClasspathElements>${settings.localRepository}/junit/junit/${junit.version}/junit-${junit.version}.jar</additionalClasspathElements>
             <additionalClasspathElements>${settings.localRepository}/org/hamcrest/hamcrest-core/${hamcrest.core.version}/hamcrest-core-${hamcrest.core.version}.jar</additionalClasspathElements>
-            <additionalClasspathElements>${project.build.directory}/test-classes/</additionalClasspathElements>
+            <additionalClasspathElements>${project.build.testOutputDirectory}/</additionalClasspathElements>
           </additionalClasspathElements>
 
           <systemPropertyVariables>

diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,6 @@
     <sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor>
 
     <target.gen.source.path>${project.build.directory}/generated-sources</target.gen.source.path>
-    <proto.cas.path>${project.basedir}/src/main/protobuf/</proto.cas.path>
     <dep.junit.version>4.12</dep.junit.version>
     <dep.slf4j.version>1.7.25</dep.slf4j.version>
     <shaded.guava.version>23.0</shaded.guava.version>
@@ -546,7 +545,7 @@
               <goal>revision</goal>
             </goals>
             <configuration>
-              <generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename>
+              <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
             </configuration>
           </execution>
           <execution>