Skip to content

Commit 1ba5ab3

Browse files
vdiravkavdiravka
committed
DRILL-7169: Rename drill-root ArtifactID to apache-drill
- change 'project.artifactId' from 'drill-root' to 'apache-drill'
1 parent 455cee7 commit 1ba5ab3

File tree

10 files changed

+45
-34
lines changed

10 files changed

+45
-34
lines changed

‎common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<modelVersion>4.0.0</modelVersion>
2323

2424
<parent>
25-
<artifactId>drill-root</artifactId>
25+
<artifactId>apache-drill</artifactId>
2626
<groupId>org.apache.drill</groupId>
2727
<version>1.16.0-SNAPSHOT</version>
2828
</parent>

‎contrib/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2222
<modelVersion>4.0.0</modelVersion>
2323
<parent>
24-
<artifactId>drill-root</artifactId>
2524
<groupId>org.apache.drill</groupId>
25+
<artifactId>apache-drill</artifactId>
2626
<version>1.16.0-SNAPSHOT</version>
2727
</parent>
2828

‎distribution/pom.xml

+22-22
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2222
<modelVersion>4.0.0</modelVersion>
2323
<parent>
24-
<artifactId>drill-root</artifactId>
24+
<artifactId>apache-drill</artifactId>
2525
<groupId>org.apache.drill</groupId>
2626
<version>1.16.0-SNAPSHOT</version>
2727
</parent>
@@ -170,7 +170,7 @@
170170
<descriptor>src/assemble/bin-assembly.xml</descriptor>
171171
</descriptors>
172172
<appendAssemblyId>false</appendAssemblyId>
173-
<finalName>apache-drill-${project.version}</finalName>
173+
<finalName>${project.parent.artifactId}-${project.version}</finalName>
174174
</configuration>
175175
</execution>
176176
<execution>
@@ -185,7 +185,7 @@
185185
<descriptor>src/assemble/bin-assembly-dir.xml</descriptor>
186186
</descriptors>
187187
<appendAssemblyId>false</appendAssemblyId>
188-
<finalName>apache-drill-${project.version}</finalName>
188+
<finalName>${project.artifactId}-${project.version}</finalName>
189189
</configuration>
190190
</execution>
191191
</executions>
@@ -390,71 +390,71 @@
390390
<directory>/opt/drill</directory>
391391
<sources>
392392
<source>
393-
<location>target/apache-drill-${project.version}/apache-drill-${project.version}/git.properties</location>
393+
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/KEYS</location>
401+
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/LICENSE</location>
409+
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/NOTICE</location>
417+
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/README.md</location>
425+
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/jars</location>
433+
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/bin</location>
441+
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/sample-data</location>
449+
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/conf</location>
457+
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}.deb</deb>
493+
<deb>distribution/target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}.deb</deb>
494494
<dataSet>
495495
<data>
496-
<src>target/apache-drill-${project.version}/apache-drill-${project.version}/git.properties</src>
496+
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/KEYS</src>
504+
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/LICENSE</src>
512+
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/NOTICE</src>
520+
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/README.md</src>
528+
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/jars</src>
536+
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/bin</src>
544+
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/sample-data</src>
553+
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/conf</src>
562+
<src>target/${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
@@ -21,7 +21,7 @@
2121
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2222
<modelVersion>4.0.0</modelVersion>
2323
<parent>
24-
<artifactId>drill-root</artifactId>
24+
<artifactId>apache-drill</artifactId>
2525
<groupId>org.apache.drill</groupId>
2626
<version>1.16.0-SNAPSHOT</version>
2727
</parent>

‎exec/java-exec/src/test/resources/drill-udf/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<maven.compiler.source>1.8</maven.compiler.source>
3232
<maven.compiler.target>1.8</maven.compiler.target>
3333
<jar.finalName>${project.name}</jar.finalName>
34-
<custom.buildDirectory>${project.basedir}/target</custom.buildDirectory>
34+
<custom.buildDirectory>${project.build.directory}</custom.buildDirectory>
3535
<drill.version>1.13.0</drill.version>
3636
<include.files>**/*.java</include.files>
3737
<include.resources>**/*.conf</include.resources>

‎exec/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2222
<modelVersion>4.0.0</modelVersion>
2323
<parent>
24-
<artifactId>drill-root</artifactId>
24+
<artifactId>apache-drill</artifactId>
2525
<groupId>org.apache.drill</groupId>
2626
<version>1.16.0-SNAPSHOT</version>
2727
</parent>

‎logical/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<modelVersion>4.0.0</modelVersion>
2323

2424
<parent>
25-
<artifactId>drill-root</artifactId>
25+
<artifactId>apache-drill</artifactId>
2626
<groupId>org.apache.drill</groupId>
2727
<version>1.16.0-SNAPSHOT</version>
2828
</parent>

‎pom.xml

+15-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</parent>
3030

3131
<groupId>org.apache.drill</groupId>
32-
<artifactId>drill-root</artifactId>
32+
<artifactId>apache-drill</artifactId>
3333
<version>1.16.0-SNAPSHOT</version>
3434
<packaging>pom</packaging>
3535

@@ -42,7 +42,7 @@
4242
<maven.compiler.target>1.8</maven.compiler.target>
4343
<sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor>
4444

45-
<target.gen.source.path>${project.basedir}/target/generated-sources</target.gen.source.path>
45+
<target.gen.source.path>${project.build.directory}/generated-sources</target.gen.source.path>
4646
<proto.cas.path>${project.basedir}/src/main/protobuf/</proto.cas.path>
4747
<dep.junit.version>4.12</dep.junit.version>
4848
<dep.slf4j.version>1.7.25</dep.slf4j.version>
@@ -1792,14 +1792,25 @@
17921792
<execution>
17931793
<id>source-release-checksum</id>
17941794
<goals>
1795-
<goal>artifacts</goal>
1795+
<goal>files</goal>
17961796
</goals>
17971797
</execution>
17981798
</executions>
17991799
<configuration>
18001800
<algorithms>
18011801
<algorithm>SHA-512</algorithm>
18021802
</algorithms>
1803+
<fileSets>
1804+
<!--Override fileSet from the Apache Parent POM-->
1805+
<fileSet>
1806+
<directory>${project.build.directory}</directory>
1807+
<includes>
1808+
<include>${project.artifactId}-${project.version}.tar.gz</include>
1809+
<include>${project.artifactId}-${project.version}-src.tar.gz</include>
1810+
<include>${project.artifactId}-${project.version}-src.zip</include>
1811+
</includes>
1812+
</fileSet>
1813+
</fileSets>
18031814
</configuration>
18041815
</plugin>
18051816

@@ -1811,7 +1822,7 @@
18111822
<id>source-release-assembly</id>
18121823
<configuration>
18131824
<appendAssemblyId>false</appendAssemblyId>
1814-
<finalName>apache-drill-${project.version}-src</finalName>
1825+
<finalName>${project.artifactId}-${project.version}-src</finalName>
18151826
</configuration>
18161827
</execution>
18171828
</executions>

‎protocol/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<modelVersion>4.0.0</modelVersion>
2323

2424
<parent>
25-
<artifactId>drill-root</artifactId>
25+
<artifactId>apache-drill</artifactId>
2626
<groupId>org.apache.drill</groupId>
2727
<version>1.16.0-SNAPSHOT</version>
2828
</parent>

‎tools/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2222
<modelVersion>4.0.0</modelVersion>
2323
<parent>
24-
<artifactId>drill-root</artifactId>
24+
<artifactId>apache-drill</artifactId>
2525
<groupId>org.apache.drill</groupId>
2626
<version>1.16.0-SNAPSHOT</version>
2727
</parent>

0 commit comments

Comments
 (0)