FLUME-1696: Fix tarball names and directories (Brock Noland via Brock Noland)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/753387cb Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/753387cb Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/753387cb Branch: refs/heads/FLUME-1502 Commit: 753387cbd137785e161a4adc06d26b91a61da4ca Parents: ea638b8 Author: Brock Noland <[email protected]> Authored: Mon Nov 12 11:33:13 2012 -0600 Committer: Brock Noland <[email protected]> Committed: Mon Nov 12 11:34:24 2012 -0600 ---------------------------------------------------------------------- flume-ng-dist/pom.xml | 2 +- flume-ng-dist/src/main/assembly/bin.xml | 138 +++++++++++++++++++++++++ flume-ng-dist/src/main/assembly/dist.xml | 138 ------------------------- flume-ng-dist/src/main/assembly/src.xml | 2 +- pom.xml | 2 +- 5 files changed, 141 insertions(+), 141 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/753387cb/flume-ng-dist/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml index 8751f15..d929c88 100644 --- a/flume-ng-dist/pom.xml +++ b/flume-ng-dist/pom.xml @@ -47,7 +47,7 @@ <configuration> <finalName>apache-flume-${project.version}</finalName> <descriptors> - <descriptor>src/main/assembly/dist.xml</descriptor> + <descriptor>src/main/assembly/bin.xml</descriptor> <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> </configuration> http://git-wip-us.apache.org/repos/asf/flume/blob/753387cb/flume-ng-dist/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/flume-ng-dist/src/main/assembly/bin.xml b/flume-ng-dist/src/main/assembly/bin.xml new file mode 100644 index 0000000..2abaf6e --- /dev/null +++ b/flume-ng-dist/src/main/assembly/bin.xml @@ -0,0 +1,138 @@ +<!-- + 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>bin</id> + + <formats> + <format>tar.gz</format> + </formats> + + <baseDirectory>apache-flume-${project.version}-bin</baseDirectory> + + <moduleSets> + + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + + <includes> + <include>org.apache.flume:flume-ng-configuration</include> + <include>org.apache.flume:flume-ng-sdk</include> + <include>org.apache.flume:flume-ng-core</include> + <include>org.apache.flume:flume-ng-node</include> + <include>org.apache.flume:flume-ng-dist</include> + <include>org.apache.flume:flume-ng-channels</include> + <include>org.apache.flume:flume-ng-sinks</include> + <include>org.apache.flume:flume-ng-legacy-sources</include> + <include>org.apache.flume:flume-ng-clients</include> + <include>org.apache.flume:flume-ng-sources</include> + </includes> + + <binaries> + <unpack>false</unpack> + <outputDirectory>lib</outputDirectory> + + <dependencySets> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>lib</outputDirectory> + </dependencySet> + </dependencySets> + </binaries> + + <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>flume-ng-configuration/**</exclude> + <exclude>flume-ng-sdk/**</exclude> + <exclude>flume-ng-core/**</exclude> + <exclude>flume-ng-node/**</exclude> + <exclude>flume-ng-channels/**</exclude> + <exclude>flume-ng-sinks/**</exclude> + <exclude>flume-ng-legacy-sources/**</exclude> + <exclude>flume-ng-clients/**</exclude> + <exclude>flume-ng-dist/**</exclude> + <exclude>**/target/**</exclude> + <exclude>lib/**</exclude> + </excludes> + + <includes> + <include>DEVNOTES</include> + <include>README</include> + <include>LICENSE</include> + <include>NOTICE</include> + <include>CHANGELOG</include> + <include>RELEASE-NOTES</include> + <include>bin/**</include> + <include>conf/**</include> + <include>pom.xml</include> + <include>flume-ng-doc/**</include> + <include>flume-ng-tests/**</include> + </includes> + </fileSet> + + <fileSet> + <directory>../target/docs</directory> + <includes> + <include>/**</include> + </includes> + <outputDirectory>docs</outputDirectory> + </fileSet> + + <fileSet> + <directory>../target/apidocs</directory> + <includes> + <include>/**</include> + </includes> + <outputDirectory>docs/apidocs</outputDirectory> + </fileSet> + + </fileSets> + +</assembly> http://git-wip-us.apache.org/repos/asf/flume/blob/753387cb/flume-ng-dist/src/main/assembly/dist.xml ---------------------------------------------------------------------- diff --git a/flume-ng-dist/src/main/assembly/dist.xml b/flume-ng-dist/src/main/assembly/dist.xml deleted file mode 100644 index 2e3123c..0000000 --- a/flume-ng-dist/src/main/assembly/dist.xml +++ /dev/null @@ -1,138 +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>dist</id> - - <formats> - <format>tar.gz</format> - </formats> - - <baseDirectory>apache-flume-${project.version}</baseDirectory> - - <moduleSets> - - <moduleSet> - <useAllReactorProjects>true</useAllReactorProjects> - - <includes> - <include>org.apache.flume:flume-ng-configuration</include> - <include>org.apache.flume:flume-ng-sdk</include> - <include>org.apache.flume:flume-ng-core</include> - <include>org.apache.flume:flume-ng-node</include> - <include>org.apache.flume:flume-ng-dist</include> - <include>org.apache.flume:flume-ng-channels</include> - <include>org.apache.flume:flume-ng-sinks</include> - <include>org.apache.flume:flume-ng-legacy-sources</include> - <include>org.apache.flume:flume-ng-clients</include> - <include>org.apache.flume:flume-ng-sources</include> - </includes> - - <binaries> - <unpack>false</unpack> - <outputDirectory>lib</outputDirectory> - - <dependencySets> - <dependencySet> - <useProjectArtifact>false</useProjectArtifact> - <outputDirectory>lib</outputDirectory> - </dependencySet> - </dependencySets> - </binaries> - - <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>flume-ng-configuration/**</exclude> - <exclude>flume-ng-sdk/**</exclude> - <exclude>flume-ng-core/**</exclude> - <exclude>flume-ng-node/**</exclude> - <exclude>flume-ng-channels/**</exclude> - <exclude>flume-ng-sinks/**</exclude> - <exclude>flume-ng-legacy-sources/**</exclude> - <exclude>flume-ng-clients/**</exclude> - <exclude>flume-ng-dist/**</exclude> - <exclude>**/target/**</exclude> - <exclude>lib/**</exclude> - </excludes> - - <includes> - <include>DEVNOTES</include> - <include>README</include> - <include>LICENSE</include> - <include>NOTICE</include> - <include>CHANGELOG</include> - <include>RELEASE-NOTES</include> - <include>bin/**</include> - <include>conf/**</include> - <include>pom.xml</include> - <include>flume-ng-doc/**</include> - <include>flume-ng-tests/**</include> - </includes> - </fileSet> - - <fileSet> - <directory>../target/docs</directory> - <includes> - <include>/**</include> - </includes> - <outputDirectory>docs</outputDirectory> - </fileSet> - - <fileSet> - <directory>../target/apidocs</directory> - <includes> - <include>/**</include> - </includes> - <outputDirectory>docs/apidocs</outputDirectory> - </fileSet> - - </fileSets> - -</assembly> http://git-wip-us.apache.org/repos/asf/flume/blob/753387cb/flume-ng-dist/src/main/assembly/src.xml ---------------------------------------------------------------------- diff --git a/flume-ng-dist/src/main/assembly/src.xml b/flume-ng-dist/src/main/assembly/src.xml index 3a6291e..d6af26f 100644 --- a/flume-ng-dist/src/main/assembly/src.xml +++ b/flume-ng-dist/src/main/assembly/src.xml @@ -28,7 +28,7 @@ <format>tar.gz</format> </formats> - <baseDirectory>apache-flume-${project.version}</baseDirectory> + <baseDirectory>apache-flume-${project.version}-src</baseDirectory> <moduleSets> http://git-wip-us.apache.org/repos/asf/flume/blob/753387cb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 363c0e4..76b8351 100644 --- a/pom.xml +++ b/pom.xml @@ -523,7 +523,7 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2.2</version> + <version>2.3</version> </plugin> <plugin>
