Skip to content

Commit f0652d9

Browse files
vdiravkavdiravka
committed
Replace all 'target/' and 'target/classes' pathes with ${project.build.directory} and ${project.build.outputDirectory} properties accordingly
1 parent 38fd472 commit f0652d9

File tree

10 files changed

+30
-31
lines changed

10 files changed

+30
-31
lines changed

‎contrib/data/tpch-sample-data/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<url>http://apache-drill.s3.amazonaws.com/files/sf-0.01_tpc-h_parquet_typed.tgz</url>
5050
<outputFileName>tpch.tgz</outputFileName>
5151
<unpack>true</unpack>
52-
<outputDirectory>${project.build.directory}/classes/tpch</outputDirectory>
52+
<outputDirectory>${project.build.outputDirectory}/tpch</outputDirectory>
5353
</configuration>
5454
</execution>
5555
</executions>

‎contrib/format-ltsv/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<goal>copy-resources</goal>
6565
</goals>
6666
<configuration>
67-
<outputDirectory>${basedir}/target/classes/org/apache/drill/exec/store/ltsv
67+
<outputDirectory>${project.build.outputDirectory}/org/apache/drill/exec/store/ltsv
6868
</outputDirectory>
6969
<resources>
7070
<resource>

‎contrib/format-syslog/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<goal>copy-resources</goal>
7373
</goals>
7474
<configuration>
75-
<outputDirectory>${basedir}/target/classes/org/apache/drill/exec/store/syslog
75+
<outputDirectory>${project.build.outputDirectory}/org/apache/drill/exec/store/syslog
7676
</outputDirectory>
7777
<resources>
7878
<resource>

‎contrib/storage-hbase/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<goal>copy-resources</goal>
115115
</goals>
116116
<configuration>
117-
<outputDirectory>${basedir}/target/classes/org/apache/drill/exec/expr/fn/impl</outputDirectory>
117+
<outputDirectory>${project.build.outputDirectory}/org/apache/drill/exec/expr/fn/impl</outputDirectory>
118118
<resources>
119119
<resource>
120120
<directory>src/main/java/org/apache/drill/exec/expr/fn/impl</directory>
@@ -125,7 +125,7 @@
125125
<filtering>true</filtering>
126126
</resource>
127127
<resource>
128-
<directory>target/generated-sources</directory>
128+
<directory>${project.build.directory}/generated-sources</directory>
129129
<!-- <include>*/org</include> -->
130130
<filtering>true</filtering>
131131
</resource>

‎contrib/storage-hive/hive-exec-shade/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
<version>${project.version}</version>
179179
<type>jar</type>
180180
<overWrite>true</overWrite>
181-
<outputDirectory>${project.build.directory}/classes</outputDirectory>
181+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
182182
<includes>**/**</includes>
183183
</artifactItem>
184184
</artifactItems>

‎contrib/udfs/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<goal>copy-resources</goal>
9595
</goals>
9696
<configuration>
97-
<outputDirectory>${basedir}/target/classes/org/apache/drill/exec/udfs</outputDirectory>
97+
<outputDirectory>${project.build.outputDirectory}/org/apache/drill/exec/udfs</outputDirectory>
9898
<resources>
9999
<resource>
100100
<directory>src/main/java/org/apache/drill/exec/udfs</directory>
@@ -110,7 +110,7 @@
110110
<goal>copy-resources</goal>
111111
</goals>
112112
<configuration>
113-
<outputDirectory>${project.build.directory}/classes/sample-data</outputDirectory>
113+
<outputDirectory>${project.build.outputDirectory}/sample-data</outputDirectory>
114114
<resources>
115115
<resource>
116116
<directory>sample-data</directory>

‎distribution/pom.xml

+19-19
Original file line numberDiff line numberDiff line change
@@ -390,71 +390,71 @@
390390
<directory>/opt/drill</directory>
391391
<sources>
392392
<source>
393-
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/git.properties</location>
393+
<location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/git.properties</location>
394394
</source>
395395
</sources>
396396
</mapping>
397397
<mapping>
398398
<directory>/opt/drill</directory>
399399
<sources>
400400
<source>
401-
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/KEYS</location>
401+
<location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/KEYS</location>
402402
</source>
403403
</sources>
404404
</mapping>
405405
<mapping>
406406
<directory>/opt/drill</directory>
407407
<sources>
408408
<source>
409-
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/LICENSE</location>
409+
<location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/LICENSE</location>
410410
</source>
411411
</sources>
412412
</mapping>
413413
<mapping>
414414
<directory>/opt/drill</directory>
415415
<sources>
416416
<source>
417-
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/NOTICE</location>
417+
<location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/NOTICE</location>
418418
</source>
419419
</sources>
420420
</mapping>
421421
<mapping>
422422
<directory>/opt/drill</directory>
423423
<sources>
424424
<source>
425-
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/README.md</location>
425+
<location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/README.md</location>
426426
</source>
427427
</sources>
428428
</mapping>
429429
<mapping>
430430
<directory>/opt/drill/jars</directory>
431431
<sources>
432432
<source>
433-
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/jars</location>
433+
<location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/jars</location>
434434
</source>
435435
</sources>
436436
</mapping>
437437
<mapping>
438438
<directory>/opt/drill/bin</directory>
439439
<sources>
440440
<source>
441-
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/bin</location>
441+
<location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/bin</location>
442442
</source>
443443
</sources>
444444
</mapping>
445445
<mapping>
446446
<directory>/opt/drill/sample-data</directory>
447447
<sources>
448448
<source>
449-
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/sample-data</location>
449+
<location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/sample-data</location>
450450
</source>
451451
</sources>
452452
</mapping>
453453
<mapping>
454454
<directory>/etc/drill/conf</directory>
455455
<sources>
456456
<source>
457-
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/conf</location>
457+
<location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/conf</location>
458458
</source>
459459
</sources>
460460
<configuration>true</configuration>
@@ -490,58 +490,58 @@
490490
</goals>
491491
<configuration>
492492
<skipPOMs>false</skipPOMs>
493-
<deb>distribution/target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}.deb</deb>
493+
<deb>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}.deb</deb>
494494
<dataSet>
495495
<data>
496-
<src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/git.properties</src>
496+
<src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/git.properties</src>
497497
<type>file</type>
498498
<mapper>
499499
<type>perm</type>
500500
<prefix>/opt/drill/</prefix>
501501
</mapper>
502502
</data>
503503
<data>
504-
<src>target/${project.parent.artifactId}-${project.version}${project.parent.artifactId}-${project.version}/KEYS</src>
504+
<src>${project.build.directory}/${project.parent.artifactId}-${project.version}${project.parent.artifactId}-${project.version}/KEYS</src>
505505
<type>file</type>
506506
<mapper>
507507
<type>perm</type>
508508
<prefix>/opt/drill/</prefix>
509509
</mapper>
510510
</data>
511511
<data>
512-
<src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/LICENSE</src>
512+
<src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/LICENSE</src>
513513
<type>file</type>
514514
<mapper>
515515
<type>perm</type>
516516
<prefix>/opt/drill/</prefix>
517517
</mapper>
518518
</data>
519519
<data>
520-
<src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/NOTICE</src>
520+
<src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/NOTICE</src>
521521
<type>file</type>
522522
<mapper>
523523
<type>perm</type>
524524
<prefix>/opt/drill/</prefix>
525525
</mapper>
526526
</data>
527527
<data>
528-
<src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/README.md</src>
528+
<src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/README.md</src>
529529
<type>file</type>
530530
<mapper>
531531
<type>perm</type>
532532
<prefix>/opt/drill/</prefix>
533533
</mapper>
534534
</data>
535535
<data>
536-
<src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/jars</src>
536+
<src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/jars</src>
537537
<type>directory</type>
538538
<mapper>
539539
<type>perm</type>
540540
<prefix>/opt/drill/jars/</prefix>
541541
</mapper>
542542
</data>
543543
<data>
544-
<src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/bin</src>
544+
<src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/bin</src>
545545
<type>directory</type>
546546
<mapper>
547547
<type>perm</type>
@@ -550,7 +550,7 @@
550550
</mapper>
551551
</data>
552552
<data>
553-
<src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/sample-data</src>
553+
<src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/sample-data</src>
554554
<type>directory</type>
555555
<mapper>
556556
<type>perm</type>
@@ -559,7 +559,7 @@
559559
</mapper>
560560
</data>
561561
<data>
562-
<src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/conf</src>
562+
<src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/conf</src>
563563
<type>directory</type>
564564
<mapper>
565565
<type>perm</type>

‎drill-yarn/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</goals>
5858
<configuration>
5959
<dotGitDirectory>${project.basedir}/../.git</dotGitDirectory>
60-
<generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename>
60+
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
6161
</configuration>
6262
</execution>
6363
</executions>

‎exec/jdbc-all/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@
267267
<additionalClasspathElements>
268268
<additionalClasspathElements>${settings.localRepository}/junit/junit/${junit.version}/junit-${junit.version}.jar</additionalClasspathElements>
269269
<additionalClasspathElements>${settings.localRepository}/org/hamcrest/hamcrest-core/${hamcrest.core.version}/hamcrest-core-${hamcrest.core.version}.jar</additionalClasspathElements>
270-
<additionalClasspathElements>${project.build.directory}/test-classes/</additionalClasspathElements>
270+
<additionalClasspathElements>${project.build.testOutputDirectory}/</additionalClasspathElements>
271271
</additionalClasspathElements>
272272

273273
<systemPropertyVariables>

‎pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor>
4444

4545
<target.gen.source.path>${project.build.directory}/generated-sources</target.gen.source.path>
46-
<proto.cas.path>${project.basedir}/src/main/protobuf/</proto.cas.path>
4746
<dep.junit.version>4.12</dep.junit.version>
4847
<dep.slf4j.version>1.7.25</dep.slf4j.version>
4948
<shaded.guava.version>23.0</shaded.guava.version>
@@ -546,7 +545,7 @@
546545
<goal>revision</goal>
547546
</goals>
548547
<configuration>
549-
<generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename>
548+
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
550549
</configuration>
551550
</execution>
552551
<execution>

0 commit comments

Comments
 (0)