You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@drill.apache.org by GitBox <gi...@apache.org> on 2018/12/07 12:41:29 UTC
[GitHub] vdiravka closed pull request #449: DRILL-4546: Only generate one
zip archive when using apache-release profile
vdiravka closed pull request #449: DRILL-4546: Only generate one zip archive when using apache-release profile
URL: https://github.com/apache/drill/pull/449
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/common/pom.xml b/common/pom.xml
index e55398ee979..9ed7f99ac45 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-common</artifactId>
diff --git a/contrib/data/pom.xml b/contrib/data/pom.xml
index f2b43f9ada3..e9cbe0ee8d5 100644
--- a/contrib/data/pom.xml
+++ b/contrib/data/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>drill-contrib-parent</artifactId>
<groupId>org.apache.drill.contrib</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.drill.contrib.data</groupId>
diff --git a/contrib/data/tpch-sample-data/pom.xml b/contrib/data/tpch-sample-data/pom.xml
index 57296c90357..a481b7b5adb 100644
--- a/contrib/data/tpch-sample-data/pom.xml
+++ b/contrib/data/tpch-sample-data/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>drill-contrib-data-parent</artifactId>
<groupId>org.apache.drill.contrib.data</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>tpch-sample-data</artifactId>
diff --git a/contrib/gis/pom.xml b/contrib/gis/pom.xml
index 068998d7d4d..e66045d6261 100644
--- a/contrib/gis/pom.xml
+++ b/contrib/gis/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>drill-contrib-parent</artifactId>
<groupId>org.apache.drill.contrib</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-gis</artifactId>
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 88a2e6f0d7d..609b79e0a45 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.drill.contrib</groupId>
diff --git a/contrib/sqlline/pom.xml b/contrib/sqlline/pom.xml
index ede757c1a00..75af286a67e 100644
--- a/contrib/sqlline/pom.xml
+++ b/contrib/sqlline/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>drill-contrib-parent</artifactId>
<groupId>org.apache.drill.contrib</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-sqlline</artifactId>
diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
index fecb5ba35c7..ea6e91e8f9c 100644
--- a/contrib/storage-hbase/pom.xml
+++ b/contrib/storage-hbase/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>drill-contrib-parent</artifactId>
<groupId>org.apache.drill.contrib</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-storage-hbase</artifactId>
diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml
index 7c7cc3cb0d5..76913974684 100644
--- a/contrib/storage-hive/core/pom.xml
+++ b/contrib/storage-hive/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.drill.contrib.storage-hive</groupId>
<artifactId>drill-contrib-storage-hive-parent</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-storage-hive-core</artifactId>
diff --git a/contrib/storage-hive/hive-exec-shade/pom.xml b/contrib/storage-hive/hive-exec-shade/pom.xml
index c75dd9de28b..9d2e516e0d0 100644
--- a/contrib/storage-hive/hive-exec-shade/pom.xml
+++ b/contrib/storage-hive/hive-exec-shade/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.drill.contrib.storage-hive</groupId>
<artifactId>drill-contrib-storage-hive-parent</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-hive-exec-shaded</artifactId>
diff --git a/contrib/storage-hive/pom.xml b/contrib/storage-hive/pom.xml
index 5b5d28e4c04..6df2b518d7b 100644
--- a/contrib/storage-hive/pom.xml
+++ b/contrib/storage-hive/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.drill.contrib</groupId>
<artifactId>drill-contrib-parent</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.drill.contrib.storage-hive</groupId>
diff --git a/contrib/storage-jdbc/pom.xml b/contrib/storage-jdbc/pom.xml
index 56988c83da2..651da8571b5 100755
--- a/contrib/storage-jdbc/pom.xml
+++ b/contrib/storage-jdbc/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>drill-contrib-parent</artifactId>
<groupId>org.apache.drill.contrib</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-jdbc-storage</artifactId>
diff --git a/contrib/storage-kudu/pom.xml b/contrib/storage-kudu/pom.xml
index aa123f8aec8..555b021ff75 100644
--- a/contrib/storage-kudu/pom.xml
+++ b/contrib/storage-kudu/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>drill-contrib-parent</artifactId>
<groupId>org.apache.drill.contrib</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-kudu-storage</artifactId>
diff --git a/contrib/storage-mongo/pom.xml b/contrib/storage-mongo/pom.xml
index 1a9752437c7..70f822bd528 100644
--- a/contrib/storage-mongo/pom.xml
+++ b/contrib/storage-mongo/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>drill-contrib-parent</artifactId>
<groupId>org.apache.drill.contrib</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-mongo-storage</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 4abe99240aa..f9be6d9da1b 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index d521d4f6e85..9de472078ef 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>exec-parent</artifactId>
<groupId>org.apache.drill.exec</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-java-exec</artifactId>
<name>exec/Java Execution Engine</name>
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index 769d7bdea9a..3d5725e84b9 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.drill.exec</groupId>
<artifactId>exec-parent</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-jdbc-all</artifactId>
diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml
index 43017c8add4..5ecb5d8dd63 100644
--- a/exec/jdbc/pom.xml
+++ b/exec/jdbc/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.drill.exec</groupId>
<artifactId>exec-parent</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-jdbc</artifactId>
<name>exec/JDBC Driver using dependencies</name>
diff --git a/exec/memory/base/pom.xml b/exec/memory/base/pom.xml
index 804cdd61e59..3dc43ff03c2 100644
--- a/exec/memory/base/pom.xml
+++ b/exec/memory/base/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>memory-parent</artifactId>
<groupId>org.apache.drill.memory</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-memory-base</artifactId>
<name>exec/memory/base</name>
diff --git a/exec/memory/pom.xml b/exec/memory/pom.xml
index c649b3f00ed..821ef1b42f7 100644
--- a/exec/memory/pom.xml
+++ b/exec/memory/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>exec-parent</artifactId>
<groupId>org.apache.drill.exec</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.drill.memory</groupId>
diff --git a/exec/pom.xml b/exec/pom.xml
index 7fa235ac956..75d9f8004c8 100644
--- a/exec/pom.xml
+++ b/exec/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.drill.exec</groupId>
diff --git a/exec/rpc/pom.xml b/exec/rpc/pom.xml
index 8a47dfacea3..ef93645dea1 100644
--- a/exec/rpc/pom.xml
+++ b/exec/rpc/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>exec-parent</artifactId>
<groupId>org.apache.drill.exec</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-rpc</artifactId>
<name>exec/rpc</name>
diff --git a/exec/vector/pom.xml b/exec/vector/pom.xml
index 5cbce120518..eaacb38eaac 100644
--- a/exec/vector/pom.xml
+++ b/exec/vector/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>exec-parent</artifactId>
<groupId>org.apache.drill.exec</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>vector</artifactId>
<name>exec/Vectors</name>
diff --git a/logical/pom.xml b/logical/pom.xml
index eda50ceb3ee..d8f765b91da 100644
--- a/logical/pom.xml
+++ b/logical/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-logical</artifactId>
diff --git a/pom.xml b/pom.xml
index 058036b6e11..08f4d984213 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,12 +15,12 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>14</version>
+ <version>17</version>
</parent>
<groupId>org.apache.drill</groupId>
<artifactId>drill-root</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Drill Root POM</name>
@@ -28,6 +28,10 @@
<url>http://drill.apache.org/</url>
<properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</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.11</dep.junit.version>
@@ -288,8 +292,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
<maxmem>2048m</maxmem>
<useIncrementalCompilation>false</useIncrementalCompilation>
<fork>true</fork>
@@ -816,23 +818,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>
- <descriptor>src/main/resources/assemblies/source-assembly.xml</descriptor>
<finalName>apache-drill-${project.version}-src</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 6b112adad95..77e317322c6 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-protocol</artifactId>
diff --git a/src/main/resources/assemblies/source-assembly.xml b/src/main/resources/assemblies/source-assembly.xml
deleted file mode 100644
index abcfc5ae78b..00000000000
--- a/src/main/resources/assemblies/source-assembly.xml
+++ /dev/null
@@ -1,90 +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>
diff --git a/tools/fmpp/pom.xml b/tools/fmpp/pom.xml
index 20fe3fd66cb..913eb0b52ed 100644
--- a/tools/fmpp/pom.xml
+++ b/tools/fmpp/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>tools-parent</artifactId>
<groupId>org.apache.drill.tools</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>drill-fmpp-maven-plugin</artifactId>
diff --git a/tools/pom.xml b/tools/pom.xml
index 14cf54427f8..ade0dfcd133 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.drill.tools</groupId>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services