DRILL-206: Packaging & Pom fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/f5e2e61a Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/f5e2e61a Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/f5e2e61a Branch: refs/heads/master Commit: f5e2e61a6224b20d671160783c4092984ad5a38a Parents: 4b19249 Author: Jacques Nadeau <[email protected]> Authored: Thu Sep 5 19:43:20 2013 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Thu Sep 5 19:43:20 2013 -0700 ---------------------------------------------------------------------- contrib/sqlline/pom.xml | 8 ++-- pom.xml | 45 ++++++++------------- src/assemble/bin.xml | 93 -------------------------------------------- 3 files changed, 22 insertions(+), 124 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/f5e2e61a/contrib/sqlline/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/sqlline/pom.xml b/contrib/sqlline/pom.xml index b87bca2..1e80e5d 100644 --- a/contrib/sqlline/pom.xml +++ b/contrib/sqlline/pom.xml @@ -3,11 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>prototype-parent</artifactId> - <groupId>org.apache.drill</groupId> - <version>1.0-SNAPSHOT</version> + <artifactId>contrib-parent</artifactId> + <groupId>org.apache.drill.contrib</groupId> + <version>1.0.0-m1-SNAPSHOT</version> </parent> + <artifactId>sqlline</artifactId> <name>contrib/sqlline</name> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/f5e2e61a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 277442f..8a5ed01 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ <proto.cas.path>${project.basedir}/src/main/protobuf/</proto.cas.path> <dep.junit.version>4.11</dep.junit.version> <dep.slf4j.version>1.7.5</dep.slf4j.version> + <sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor> </properties> - <scm> <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-drill.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-drill.git</developerConnection> @@ -85,6 +85,12 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> + <excludes> + <exclude>**/logging.properties</exclude> + <exclude>**/logback-test.xml</exclude> + <exclude>**/logback.out.xml</exclude> + <exclude>**/logback.xml</exclude> + </excludes> <archive> <index>true</index> <manifest> @@ -94,31 +100,11 @@ <manifestEntries> <Extension-Name>org.apache.drill</Extension-Name> <Built-By>${username}</Built-By> - <url>http://lucene.apache.org/mahout</url> + <url>http://incubator.apache.org/drill/</url> </manifestEntries> </archive> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/logging.properties</exclude> - <exclude>**/logback-test.xml</exclude> - <exclude>**/logback.out.xml</exclude> - <exclude>**/logback.xml</exclude> - </excludes> - </configuration> - - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -263,12 +249,15 @@ </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> - <configuration> - <descriptors> - <descriptor>src/assemble/bin.xml</descriptor> - </descriptors> - </configuration> + <executions> + <execution> + <id>source-release-assembly</id> + <configuration> + <finalName>apache-drill-${project.version}</finalName> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </execution> + </executions> </plugin> </plugins> </pluginManagement> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/f5e2e61a/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/src/assemble/bin.xml b/src/assemble/bin.xml deleted file mode 100644 index 043e7d3..0000000 --- a/src/assemble/bin.xml +++ /dev/null @@ -1,93 +0,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>src</id> - - <formats> - <format>tar.gz</format> - </formats> - - <baseDirectory>apache-drill-${project.version}</baseDirectory> - - <moduleSets> - - <moduleSet> - <useAllReactorProjects>true</useAllReactorProjects> - - <includes> - <include>org.apache.drill:common</include> - <include>org.apache.drill.exec:ref</include> - <include>org.apache.drill.exec:java-exec</include> - <include>org.apache.drill:sqlparser</include> - <include>org.apache.drill:distribution</include> - </includes> - - <sources> - <includeModuleDirectory>true</includeModuleDirectory> - <excludeSubModuleDirectories>false</excludeSubModuleDirectories> - - <fileSets> - <fileSet> - <excludes> - <exclude>target/**</exclude> - <exclude>*/target/**</exclude> - <exclude>.classpath</exclude> - <exclude>*/.classpath</exclude> - <exclude>.project</exclude> - <exclude>*/.project</exclude> - <exclude>.settings/**</exclude> - <exclude>*/.settings/**</exclude> - </excludes> - </fileSet> - </fileSets> - </sources> - - </moduleSet> - - </moduleSets> - - <fileSets> - <fileSet> - <directory>../</directory> - - <excludes> - <exclude>common/**</exclude> - <exclude>contrib/**</exclude> - <exclude>distribution/**</exclude> - <exclude>exec/**</exclude> - <exclude>sqlparser/**</exclude> - <exclude>**/target/**</exclude> - </excludes> - - <includes> - <include>README.md</include> - <include>LICENSE</include> - <include>KEYS</include> - <include>sqlline</include> - <include>sample-data/**</include> - </includes> - </fileSet> - </fileSets> - -</assembly> \ No newline at end of file
