DRILL-7169: Rename drill-root ArtifactID to apache-drill #1746
Conversation
There was a problem hiding this comment.
@vdiravka, with this change, a folder with the unpacked build in distribution was renamed from apache-drill-1.16.0-SNAPSHOT to distribution-1.16.0-SNAPSHOT, so for now built version is in the distribution/target/distribution-1.16.0-SNAPSHOT/distribution-1.16.0-SNAPSHOT/ instead of distribution/target/apache-drill-1.16.0-SNAPSHOT/apache-drill-1.16.0-SNAPSHOT/.
I don't think that we should rename these folders.
Thanks for finding this, it is random mistake. |
distribution/pom.xml
Outdated
| @@ -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> | |||
There was a problem hiding this comment.
all the <location>target/... can be replaced by <location>${project.build.directory}/....
pom.xml
Outdated
| @@ -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> | |||
There was a problem hiding this comment.
is this path correct ? I don't see any src/main/protobuf path ?
Also there are other places like line 549 which can be modified to replace target/classes with ${project.build.outputDirectory}
There was a problem hiding this comment.
-
Looks like it was introduced for a long time ago for
maven-antrun-plugin.
b53933f#diff-0c2b5a9caaab6aa53c1c6c7dead7be77R118
But a little bit later this usage was removed. I think it is safe to remove it. -
Modified
- change 'project.artifactId' from 'drill-root' to 'apache-drill'
…hes with ${project.build.directory},
${project.build.outputDirectory} and ${project.build.testOutputDirectory} properties accordingly
|
@vvysotskyi @sohami I have rebased the changes onto latest Drill master branch and added one commit with minor improvement. |
|
@vdiravka / @vvysotskyi what is the status of this PR? |
|
Currently, there is no consensus for this change, here is mail thread with the discussion: https://lists.apache.org/thread.html/99a2098ae04d56dd5994288b5fc05780d7de09a2f4a5ffbc5ce39cde@%3Cdev.drill.apache.org%3E |
Change 'project.artifactId' from 'drill-root' to 'apache-drill'
Note: it includes changes for #1743 also (it is expected that PR will be merged first)