You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by de...@apache.org on 2017/09/15 12:33:45 UTC
[2/2] flume git commit: Fix source assembly
Fix source assembly
flume-checkstyle breaks the assembly because its parent is not the flume-parent
Removing the moduleSets definition from the src assembly solved the issue.
Files are added based on fileSets, the resulting tarball's content equals
to the result of the dev-support/generate-source-release.sh in a clean
working directory.
This closes #175
Reviewers: Miklos Csanady, Ferenc Szabo
(Denes Arvay via Denes Arvay)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/99f59199
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/99f59199
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/99f59199
Branch: refs/heads/trunk
Commit: 99f591994468633fc6f8701c5fc53e0214b6da4f
Parents: 5405fc6
Author: Denes Arvay <de...@apache.org>
Authored: Fri Sep 15 13:33:20 2017 +0200
Committer: Denes Arvay <de...@apache.org>
Committed: Fri Sep 15 14:25:30 2017 +0200
----------------------------------------------------------------------
flume-ng-dist/src/main/assembly/src.xml | 77 ++--------------------------
1 file changed, 3 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/99f59199/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 bf874ca..a79bed5 100644
--- a/flume-ng-dist/src/main/assembly/src.xml
+++ b/flume-ng-dist/src/main/assembly/src.xml
@@ -31,91 +31,20 @@
<baseDirectory>apache-flume-${project.version}-src</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-sources</include>
- <include>org.apache.flume:flume-ng-legacy-sources</include>
- <include>org.apache.flume:flume-ng-clients</include>
- <include>org.apache.flume:flume-ng-embedded-agent</include>
- <include>org.apache.flume:flume-tools</include>
- <include>org.apache.flume:flume-ng-auth</include>
- <include>org.apache.flume:flume-shared</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>flume-ng-configuration/**</exclude>
- <exclude>flume-ng-sdk/**</exclude>
- <exclude>flume-ng-core/**</exclude>
- <exclude>flume-ng-node/**</exclude>
- <exclude>flume-ng-dist/**</exclude>
- <exclude>flume-ng-channels/**</exclude>
- <exclude>flume-ng-sinks/**</exclude>
- <exclude>flume-ng-sources/**</exclude>
- <exclude>flume-ng-legacy-sources/**</exclude>
- <exclude>flume-ng-clients/**</exclude>
- <exclude>flume-ng-embedded-agent/**</exclude>
- <exclude>flume-tools/**</exclude>
<exclude>**/target/**</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
<exclude>**/.settings/**</exclude>
<exclude>lib/**</exclude>
+ <exclude>**/.DS_Store</exclude>
</excludes>
-
- <includes>
- <include>.gitignore</include>
- <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>
- <include>dev-support/**</include>
- </includes>
</fileSet>
</fileSets>