This is an automated email from the ASF dual-hosted git repository. amansinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit 7d3763728fd82b3a033936b14ff35545e93d1c5c Author: Laurent Goujon <laur...@dremio.com> AuthorDate: Mon Mar 28 13:31:53 2016 -0700 DRILL-4546: Only generate one zip archive when using apache-release profile Drill root pom doesn't override completely Apache parent pom configuration regarding assemblies, which caused a zip archive of the project to be generated twice, and deployed to a remote server twice too. The fix uses the plugin properties to override the configuration. Also remove Drill source assembly descriptor as the Apache parent project provides the same one. --- pom.xml | 18 ++--- src/main/resources/assemblies/source-assembly.xml | 99 ----------------------- 2 files changed, 5 insertions(+), 112 deletions(-) diff --git a/pom.xml b/pom.xml index c9d2843..790dd11 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,10 @@ <url>http://drill.apache.org/</url> <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <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> <proto.cas.path>${project.basedir}/src/main/protobuf/</proto.cas.path> <dep.junit.version>4.12</dep.junit.version> @@ -471,8 +475,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.8</source> - <target>1.8</target> <maxmem>2048m</maxmem> <useIncrementalCompilation>false</useIncrementalCompilation> <fork>true</fork> @@ -1682,25 +1684,15 @@ <failOnError>false</failOnError> </configuration> </plugin> - <!-- override the parent assembly execution to customize the assembly - descriptor and final name --> + <!-- override the parent assembly execution to customize the assembly final name --> <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> <id>source-release-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> <configuration> - <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/resources/assemblies/source-assembly.xml</descriptor> - </descriptors> <finalName>apache-drill-${project.version}-src</finalName> - <tarLongFileMode>gnu</tarLongFileMode> </configuration> </execution> </executions> diff --git a/src/main/resources/assemblies/source-assembly.xml b/src/main/resources/assemblies/source-assembly.xml deleted file mode 100644 index 4ed43f1..0000000 --- a/src/main/resources/assemblies/source-assembly.xml +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<assembly> - <id>source-release</id> - <formats> - <format>zip</format> - <format>tar.gz</format> - </formats> - <fileSets> - <!-- main project directory structure --> - <fileSet> - <directory>.</directory> - <outputDirectory>/</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - <excludes> - <!-- build output --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*] - </exclude> - - <!-- NOTE: Most of the following excludes should not be required - if the standard release process is followed. This is because the release - plugin checks out project sources into a location like target/checkout, then - runs the build from there. The result is a source-release archive that comes - from a pretty clean directory structure. HOWEVER, if the release plugin is - configured to run extra goals or generate a project website, it's definitely - possible that some of these files will be present. So, it's safer to exclude - them. --> - - <!-- IDEs --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml] - </exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project] - </exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath] - </exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws] - </exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?] - </exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?] - </exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr] - </exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml] - </exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?] - </exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?] - </exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?] - </exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?] - </exclude> - - - <!-- scm --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.gitignore(/.*)?] - </exclude> - - <exclude>**/.buildpath</exclude> - <exclude>**/sandbox/**</exclude> - - <!-- misc --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser] - </exclude> - - <!-- release-plugin temp files --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup] - </exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties] - </exclude> - </excludes> - </fileSet> - <!-- license, readme, etc. calculated at build time --> - <fileSet> - <directory>${project.build.directory}/maven-shared-archive-resources/META-INF - </directory> - <outputDirectory>/</outputDirectory> - </fileSet> - </fileSets> -</assembly>