Skip to content

Commit

Permalink
DRILL-7169: Rename drill-root ArtifactID to apache-drill
Browse files Browse the repository at this point in the history 
- change 'project.artifactId' from 'drill-root' to 'apache-drill'
  • Loading branch information
@vdiravka
vdiravka committed Apr 12, 2019
1 parent 494c206 commit 0bbb212
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>drill-root</artifactId>
<artifactId>apache-drill</artifactId>
<groupId>org.apache.drill</groupId>
<version>1.16.0-SNAPSHOT</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion contrib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
<artifactId>apache-drill</artifactId>
<version>1.16.0-SNAPSHOT</version>
</parent>

Expand Down
44 changes: 22 additions & 22 deletions distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>drill-root</artifactId>
<artifactId>apache-drill</artifactId>
<groupId>org.apache.drill</groupId>
<version>1.16.0-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -170,7 +170,7 @@
<descriptor>src/assemble/bin-assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
<finalName>apache-drill-${project.version}</finalName>
<finalName>${project.parent.artifactId}-${project.version}</finalName>
</configuration>
</execution>
<execution>
Expand All @@ -185,7 +185,7 @@
<descriptor>src/assemble/bin-assembly-dir.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
<finalName>apache-drill-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -390,71 +390,71 @@
<directory>/opt/drill</directory>
<sources>
<source>
<location>target/apache-drill-${project.version}/apache-drill-${project.version}/git.properties</location>
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/KEYS</location>
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/KEYS</location>
</source>
</sources>
</mapping>
<mapping>
<directory>/opt/drill</directory>
<sources>
<source>
<location>target/apache-drill-${project.version}/apache-drill-${project.version}/LICENSE</location>
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/LICENSE</location>
</source>
</sources>
</mapping>
<mapping>
<directory>/opt/drill</directory>
<sources>
<source>
<location>target/apache-drill-${project.version}/apache-drill-${project.version}/NOTICE</location>
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/NOTICE</location>
</source>
</sources>
</mapping>
<mapping>
<directory>/opt/drill</directory>
<sources>
<source>
<location>target/apache-drill-${project.version}/apache-drill-${project.version}/README.md</location>
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/jars</location>
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/bin</location>
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/sample-data</location>
<location>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/conf</location>
<location>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/conf</location>
</source>
</sources>
<configuration>true</configuration>
Expand Down Expand Up @@ -490,58 +490,58 @@
</goals>
<configuration>
<skipPOMs>false</skipPOMs>
<deb>distribution/target/apache-drill-${project.version}/apache-drill-${project.version}.deb</deb>
<deb>distribution/target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}.deb</deb>
<dataSet>
<data>
<src>target/apache-drill-${project.version}/apache-drill-${project.version}/git.properties</src>
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/KEYS</src>
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/LICENSE</src>
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/NOTICE</src>
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/README.md</src>
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/jars</src>
<src>target/${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/apache-drill-${project.version}/apache-drill-${project.version}/bin</src>
<src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/bin</src>
<type>directory</type>
<mapper>
<type>perm</type>
Expand All @@ -550,7 +550,7 @@
</mapper>
</data>
<data>
<src>target/apache-drill-${project.version}/apache-drill-${project.version}/sample-data</src>
<src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/sample-data</src>
<type>directory</type>
<mapper>
<type>perm</type>
Expand All @@ -559,7 +559,7 @@
</mapper>
</data>
<data>
<src>target/apache-drill-${project.version}/apache-drill-${project.version}/conf</src>
<src>target/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/conf</src>
<type>directory</type>
<mapper>
<type>perm</type>
Expand Down
2 changes: 1 addition & 1 deletion drill-yarn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>drill-root</artifactId>
<artifactId>apache-drill</artifactId>
<groupId>org.apache.drill</groupId>
<version>1.16.0-SNAPSHOT</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion exec/java-exec/src/test/resources/drill-udf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<jar.finalName>${project.name}</jar.finalName>
<custom.buildDirectory>${project.basedir}/target</custom.buildDirectory>
<custom.buildDirectory>${project.build.directory}</custom.buildDirectory>
<drill.version>1.13.0</drill.version>
<include.files>**/*.java</include.files>
<include.resources>**/*.conf</include.resources>
Expand Down
2 changes: 1 addition & 1 deletion exec/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>drill-root</artifactId>
<artifactId>apache-drill</artifactId>
<groupId>org.apache.drill</groupId>
<version>1.16.0-SNAPSHOT</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion logical/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>drill-root</artifactId>
<artifactId>apache-drill</artifactId>
<groupId>org.apache.drill</groupId>
<version>1.16.0-SNAPSHOT</version>
</parent>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</parent>

<groupId>org.apache.drill</groupId>
<artifactId>drill-root</artifactId>
<artifactId>apache-drill</artifactId>
<version>1.16.0-SNAPSHOT</version>
<packaging>pom</packaging>

Expand All @@ -42,7 +42,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor>

<target.gen.source.path>${project.basedir}/target/generated-sources</target.gen.source.path>
<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>
Expand Down Expand Up @@ -1805,9 +1805,9 @@
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
<include>apache-drill-${project.version}.tar.gz</include>
<include>apache-drill-${project.version}-src.tar.gz</include>
<include>apache-drill-${project.version}-src.zip</include>
<include>${project.artifactId}-${project.version}.tar.gz</include>
<include>${project.artifactId}-${project.version}-src.tar.gz</include>
<include>${project.artifactId}-${project.version}-src.zip</include>
</includes>
</fileSet>
</fileSets>
Expand All @@ -1822,7 +1822,7 @@
<id>source-release-assembly</id>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<finalName>apache-drill-${project.version}-src</finalName>
<finalName>${project.artifactId}-${project.version}-src</finalName>
</configuration>
</execution>
</executions>
Expand Down
2 changes: 1 addition & 1 deletion protocol/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>drill-root</artifactId>
<artifactId>apache-drill</artifactId>
<groupId>org.apache.drill</groupId>
<version>1.16.0-SNAPSHOT</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>drill-root</artifactId>
<artifactId>apache-drill</artifactId>
<groupId>org.apache.drill</groupId>
<version>1.16.0-SNAPSHOT</version>
</parent>
Expand Down

0 comments on commit 0bbb212

Please sign in to comment.