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 637354e91b4b597a0f1930a385b7f0bff0093a2a Author: Vitalii Diravka <[email protected]> AuthorDate: Thu Nov 15 17:40:21 2018 -0800 DRILL-6751: Upgrade Apache parent POM to version 21 - Update apache.pom file version to 21 (with updating some maven plugins versions) - Include Drill's sources jars on assembly stage in <moduleSets> (not <dependencySets>) for properincluding jars with last apache-21.pom - Separate "distro-assembly" to the two execution stages to avoid: [WARNING] Assembly file: <DRILL_HOME>/distribution/target/apache-drill-1.15.0-SNAPSHOT is not a regular file (it may be a directory). It cannot be attached to the project build for installation or deployment. - Remove unsused <include>/<exclude> in assebly descriptor to avoid: [WARNING] The following patterns were never triggered in this artifact inclusion filter - Update "maven-assembly-plugin" version - Update "slf4j" version - Update "mockito-core" version - Update "bcpkix-jdk15on" (Bouncy Castle Cryptography APIs) version close apache/drill#1561 --- distribution/pom.xml | 49 +++-- distribution/src/assemble/bin-assembly-dir.xml | 33 +++ distribution/src/assemble/bin-assembly.xml | 33 +++ .../src/assemble/{bin.xml => component.xml} | 227 ++++++++++----------- drill-shaded/pom.xml | 3 +- .../java-exec/src/test/resources/drill-udf/pom.xml | 3 - pom.xml | 23 +-- 7 files changed, 218 insertions(+), 153 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 4952ca5..4fde4cd 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -156,26 +156,40 @@ <build> <plugins> - <plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> - <execution> - <id>distro-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/assemble/bin.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - <finalName>apache-drill-${project.version}</finalName> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </execution> + <execution> + <id>distro-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assemble/bin-assembly.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + <finalName>apache-drill-${project.version}</finalName> + </configuration> + </execution> + <execution> + <id>distro-assembly-not-attached</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <attach>false</attach> + <descriptors> + <descriptor>src/assemble/bin-assembly-dir.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + <finalName>apache-drill-${project.version}</finalName> + </configuration> + </execution> </executions> - </plugin> + </plugin> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> @@ -192,7 +206,6 @@ </excludes> </configuration> </plugin> - </plugins> </build> <profiles> diff --git a/distribution/src/assemble/bin-assembly-dir.xml b/distribution/src/assemble/bin-assembly-dir.xml new file mode 100644 index 0000000..f134962 --- /dev/null +++ b/distribution/src/assemble/bin-assembly-dir.xml @@ -0,0 +1,33 @@ +<?xml version="1.0"?> +<!-- + + 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 + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>binary-release-directory</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + <componentDescriptors> + <componentDescriptor>component.xml</componentDescriptor> + </componentDescriptors> +</assembly> diff --git a/distribution/src/assemble/bin-assembly.xml b/distribution/src/assemble/bin-assembly.xml new file mode 100644 index 0000000..5cd3636 --- /dev/null +++ b/distribution/src/assemble/bin-assembly.xml @@ -0,0 +1,33 @@ +<?xml version="1.0"?> +<!-- + + 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 + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>binary-release</id> + <formats> + <format>tar.gz</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + <componentDescriptors> + <componentDescriptor>component.xml</componentDescriptor> + </componentDescriptors> +</assembly> diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/component.xml similarity index 72% rename from distribution/src/assemble/bin.xml rename to distribution/src/assemble/component.xml index 85a4d5b..2b60299 100644 --- a/distribution/src/assemble/bin.xml +++ b/distribution/src/assemble/component.xml @@ -18,27 +18,115 @@ limitations under the License. --> -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>binary-release</id> - <formats> - <format>tar.gz</format> - <format>dir</format> - </formats> - <includeBaseDirectory>true</includeBaseDirectory> +<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> <moduleSets> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + <!--Now, select which projects to include in this module-set. --> + <includes> + <include>org.apache.drill.exec:drill-jdbc:jar</include> + <include>org.apache.drill:drill-protocol:jar</include> + <include>org.apache.drill:drill-common:jar</include> + <include>org.apache.drill:drill-logical:jar</include> + <include>org.apache.drill.exec:vector:jar</include> + <include>org.apache.drill.memory:drill-memory-base:jar</include> + <include>org.apache.drill.exec:drill-rpc:jar</include> + <include>org.apache.drill.exec:drill-java-exec:jar</include> + <include>org.apache.drill.contrib.storage-hive:drill-storage-hive-core:jar</include> + <include>org.apache.drill.contrib.storage-hive:drill-hive-exec-shaded:jar</include> + <include>org.apache.drill.contrib.data:tpch-sample-data:jar</include> + <include>org.apache.drill.contrib:drill-mongo-storage:jar</include> + <include>org.apache.drill.contrib:drill-storage-hbase:jar</include> + <include>org.apache.drill.contrib:drill-format-mapr:jar</include> + <include>org.apache.drill.contrib:drill-jdbc-storage:jar</include> + <include>org.apache.drill.contrib:drill-kudu-storage:jar</include> + <include>org.apache.drill.contrib:drill-storage-kafka:jar</include> + <include>org.apache.drill.contrib:drill-opentsdb-storage:jar</include> + <include>org.apache.drill.contrib:drill-udfs:jar</include> + </includes> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + <fileSets> + <fileSet> + <directory>target</directory> + <outputDirectory>jars</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*sources.jar</exclude> + <exclude>*javadoc.jar</exclude> + <exclude>*tests.jar</exclude> + <exclude>original-*</exclude> + </excludes> + </fileSet> + </fileSets> + </sources> + </moduleSet> - </moduleSets> - <dependencySets> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + <!-- Drill-on-YARN goes into its own directory so it does not end up + on the Drillbit class path. Define the jars/tools folder as any jar + we ship that is not used by drillbits. --> + <includes> + <include>org.apache.drill:drill-yarn:jar</include> + </includes> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + <fileSets> + <fileSet> + <directory>target</directory> + <outputDirectory>jars/tools</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*sources.jar</exclude> + <exclude>*javadoc.jar</exclude> + <exclude>*tests.jar</exclude> + </excludes> + </fileSet> + </fileSets> + </sources> + </moduleSet> - <dependencySet> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> <includes> <include>org.apache.drill.exec:drill-jdbc-all:jar</include> </includes> - <outputDirectory>jars/jdbc-driver</outputDirectory> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + <fileSets> + <fileSet> + <directory>target</directory> + <outputDirectory>jars/jdbc-driver</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*sources.jar</exclude> + <exclude>*javadoc.jar</exclude> + <exclude>*tests.jar</exclude> + <exclude>original-*</exclude> + </excludes> + </fileSet> + </fileSets> + </sources> + </moduleSet> + </moduleSets> + + <dependencySets> + <dependencySet> + <outputDirectory>jars</outputDirectory> + <unpack>false</unpack> <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.apache.drill:drill-shaded-guava:jar</include> + </includes> </dependencySet> <dependencySet> @@ -46,14 +134,11 @@ <unpack>false</unpack> <useProjectArtifact>false</useProjectArtifact> <includes> - <include>org.glassfish.jersey.containers</include> <include>org.glassfish.jersey.core</include> <include>org.reflections</include> - <include>org.glassfish.hk2.external</include> <include>org.mortbay.jetty</include> - <include>org.jboss.spec.javax.transaction</include> <include>javax.activation</include> <include>javax.annotation</include> <include>org.glassfish.jersey.containers</include> @@ -63,69 +148,15 @@ <include>org.glassfish.jersey.bundles.repackaged</include> <include>org.glassfish.hk2</include> <include>javax.servlet</include> - - <include>javax.ws.rs </include> - <include>com.sun.xml.bind </include> - <include>com.sun.jersey </include> - <include>org.jvnet.mimepull </include> - <include>com.sun.codemodel </include> + <include>javax.ws.rs</include> + <include>org.jvnet.mimepull</include> + <include>com.sun.codemodel</include> <include>javax.xml.bind</include> - - <include>org.jruby</include> - <include>ch.qos.logback </include> <include>ch.qos.logback</include> - <include>org.eclipse.jdt</include> - <include>com.github.stephenc.high-scale-lib</include> - - <include>org.jamon</include> - + <include>ch.qos.logback</include> </includes> <scope>test</scope> </dependencySet> - - <dependencySet> - <!-- Now, select which projects to include in this module-set. --> - <includes> - <include>org.apache.drill.exec:drill-jdbc:jar</include> - <include>org.apache.drill:drill-protocol:jar</include> - <include>org.apache.drill:drill-common:jar</include> - <include>org.apache.drill:drill-logical:jar</include> - <include>org.apache.drill.exec:vector:jar</include> - <include>org.apache.drill.memory:drill-memory-base:jar</include> - <include>org.apache.drill.exec:drill-rpc:jar</include> - <include>org.apache.drill.exec:drill-java-exec:jar</include> - <include>org.apache.drill.contrib.storage-hive:drill-storage-hive-core</include> - <include>org.apache.drill.contrib.storage-hive:drill-hive-exec-shaded</include> - <include>org.apache.drill.contrib.data:tpch-sample-data:jar</include> - <include>org.apache.drill.contrib:drill-mongo-storage</include> - <include>org.apache.drill.contrib:drill-storage-hbase</include> - <include>org.apache.drill.contrib:drill-format-mapr</include> - <include>org.apache.drill.contrib:drill-jdbc-storage</include> - <include>org.apache.drill.contrib:drill-kudu-storage</include> - <include>org.apache.drill.contrib:drill-storage-kafka</include> - <include>org.apache.drill.contrib:drill-opentsdb-storage</include> - <include>org.apache.drill.contrib:drill-udfs</include> - <include>org.apache.drill:drill-shaded-guava</include> - </includes> - <excludes> - <exclude>org.apache.drill.contrib.storage-hive:drill-storage-hive-core:jar:tests</exclude> - </excludes> - <outputDirectory>jars</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> - <!-- Drill-on-YARN goes into its own directory so it does not end up - on the Drillbit class path. Define the jars/tools folder as any jar - we ship that is not used by drillbits. --> - <includes> - <include>org.apache.drill:drill-yarn:jar</include> - </includes> - <outputDirectory>jars/tools</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> <outputDirectory>jars/3rdparty/</outputDirectory> <unpack>false</unpack> @@ -139,28 +170,13 @@ <exclude>org.apache.drill.contrib.storage-hive</exclude> <exclude>org.apache.drill.memory</exclude> <!-- Below Hive jars are already included in drill-hive-exec-shaded.jar --> - <exclude>org.apache.hive:hive-common</exclude> - <exclude>org.apache.hive:hive-serde</exclude> - <exclude>org.apache.hive:hive-shims</exclude> - <exclude>org.apache.hive.shims:hive-shims-0.20</exclude> - <exclude>org.apache.hive.shims:hive-shims-0.20S</exclude> - <exclude>org.apache.hive.shims:hive-shims-0.23</exclude> - <exclude>org.apache.hive.shims:hive-shims-common</exclude> - <exclude>org.apache.hive.shims:hive-shims-common-secure</exclude> - <exclude>org.hsqldb:hsqldb</exclude> <exclude>junit:junit:jar</exclude> - <exclude>com.googlecode.jmockit:jmockit:jar</exclude> <!-- exclude or sqlline has problems --> - <exclude>hsqldb:hsqldb</exclude> - <!-- exclude or sqlline has problems --> - <exclude>org.glassfish.jersey.containers</exclude> <exclude>org.glassfish.jersey.core</exclude> <exclude>org.reflections</exclude> - <exclude>org.glassfish.hk2.external</exclude> <exclude>org.mortbay.jetty</exclude> - <exclude>org.jboss.spec.javax.transaction</exclude> <exclude>javax.activation</exclude> <exclude>javax.annotation</exclude> <exclude>org.glassfish.jersey.containers</exclude> @@ -170,28 +186,16 @@ <exclude>org.glassfish.jersey.bundles.repackaged</exclude> <exclude>org.glassfish.hk2</exclude> <exclude>javax.servlet</exclude> - <exclude>javax.ws.rs </exclude> - <exclude>com.sun.xml.bind </exclude> - <exclude>com.sun.jersey </exclude> - <exclude>org.jvnet.mimepull </exclude> - <exclude>com.sun.codemodel </exclude> + <exclude>org.jvnet.mimepull</exclude> + <exclude>com.sun.codemodel</exclude> <exclude>javax.xml.bind</exclude> - - <exclude>org.jruby</exclude> <exclude>ch.qos.logback </exclude> <exclude>ch.qos.logback</exclude> - <exclude>org.eclipse.jdt</exclude> - <exclude>com.github.stephenc.high-scale-lib</exclude> - <exclude>io.netty:netty-tcnative</exclude> - - <exclude>org.jamon</exclude> - </excludes> <scope>test</scope> </dependencySet> - <dependencySet> <outputDirectory>jars/ext</outputDirectory> <unpack>false</unpack> @@ -201,16 +205,6 @@ </includes> <scope>runtime</scope> </dependencySet> - - <dependencySet> - <outputDirectory>jars/3rdparty</outputDirectory> - <unpack>false</unpack> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>com.google.protobuf:protobuf-java:jar:2.5</include> - </includes> - <scope>test</scope> - </dependencySet> <dependencySet> <outputDirectory>jars/3rdparty/linux</outputDirectory> <unpack>false</unpack> @@ -247,7 +241,6 @@ </includes> <scope>test</scope> </dependencySet> - <dependencySet> <outputDirectory>winutils/bin</outputDirectory> <unpack>true</unpack> @@ -263,7 +256,6 @@ <include>org.apache.hadoop:hadoop-winutils</include> </includes> </dependencySet> - </dependencySets> <fileSets> @@ -433,4 +425,5 @@ <fileMode>0640</fileMode> </file> </files> -</assembly> + +</component> diff --git a/drill-shaded/pom.xml b/drill-shaded/pom.xml index f9c6045..b3bb3f8 100644 --- a/drill-shaded/pom.xml +++ b/drill-shaded/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>18</version> + <version>21</version> <relativePath/> </parent> @@ -41,7 +41,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.1.0</version> <executions> <execution> <phase>package</phase> diff --git a/exec/java-exec/src/test/resources/drill-udf/pom.xml b/exec/java-exec/src/test/resources/drill-udf/pom.xml index 931abed..0e25cba 100644 --- a/exec/java-exec/src/test/resources/drill-udf/pom.xml +++ b/exec/java-exec/src/test/resources/drill-udf/pom.xml @@ -58,13 +58,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> <configuration> <includes> <include>${include.files}</include> </includes> - <source>1.8</source> - <target>1.8</target> </configuration> </plugin> <plugin> diff --git a/pom.xml b/pom.xml index 790dd11..94427b8 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>18</version> + <version>21</version> <relativePath /> </parent> @@ -45,7 +45,7 @@ <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> - <dep.slf4j.version>1.7.6</dep.slf4j.version> + <dep.slf4j.version>1.7.25</dep.slf4j.version> <shaded.guava.version>23.0</shaded.guava.version> <guava.version>19.0</guava.version> <forkCount>2</forkCount> @@ -89,7 +89,7 @@ <excludedGroups /> <memoryMb>4096</memoryMb> <directMemoryMb>4096</directMemoryMb> - <additionalparam>-Xdoclint:none</additionalparam> + <doclint>none</doclint> <rat.skip>true</rat.skip> <license.skip>true</license.skip> <docker.repository>drill/apache-drill</docker.repository> @@ -574,7 +574,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.1.0</version> <executions> <execution> <goals> @@ -689,7 +688,7 @@ </plugin> <plugin> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0-M1</version> + <version>3.0.0-M2</version> </plugin> <plugin> <!-- classpath scanning --> <groupId>org.codehaus.mojo</groupId> @@ -714,7 +713,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.21.0</version> <executions> <execution> <id>default-test</id> @@ -757,7 +755,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.5.2</version> <configuration> <useReleaseProfile>false</useReleaseProfile> <pushChanges>false</pushChanges> @@ -859,7 +856,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.1.0</version> <executions> <execution> <phase>package</phase> @@ -946,7 +942,7 @@ long as Mockito _contains_ older Hamcrest classes. See DRILL-2130. --> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.18.3</version> + <version>2.23.4</version> <scope>test</scope> </dependency> <dependency> @@ -1667,11 +1663,11 @@ <build> <plugins> <plugin> - <groupId>net.ju-n.maven.plugins</groupId> + <groupId>net.nicoulaj.maven.plugins</groupId> <artifactId>checksum-maven-plugin</artifactId> - <version>1.2</version> <executions> <execution> + <id>source-release-checksum</id> <goals> <goal>artifacts</goal> </goals> @@ -1681,12 +1677,13 @@ <algorithms> <algorithm>SHA-512</algorithm> </algorithms> - <failOnError>false</failOnError> </configuration> </plugin> + <!-- override the parent assembly execution to customize the assembly final name --> <plugin> <artifactId>maven-assembly-plugin</artifactId> + <version>3.1.0</version> <executions> <execution> <id>source-release-assembly</id> @@ -2369,7 +2366,7 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> - <version>1.52</version> + <version>1.60</version> </dependency> <!-- Test Dependencies -->
