8000 Fix source assembly · coder-xing/flume@43a3c40 · GitHub
[go: up one dir, main page]
Skip to content

Commit 43a3c40

Browse files
adenesadenes
committed
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 apache#175 Reviewers: Miklos Csanady, Ferenc Szabo (Denes Arvay via Denes Arvay)
1 parent 4ddde20 commit 43a3c40

File tree

1 file changed

+3
-74
lines changed
  • flume-ng-dist/src/main/assembly

1 file changed

+3
-74
lines changed

‎flume-ng-dist/src/main/assembly/src.xml

Lines changed: 3 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -31,91 +31,20 @@
3131

3232
<baseDirectory>apache-flume-${project.version}-src</baseDirectory>
3333

34-
<moduleSets>
35-
36-
<moduleSet>
37-
<useAllReactorProjects>true</useAllReactorProjects>
38-
39-
<includes>
40-
<include>org.apache.flume:flume-ng-configuration</include>
41-
<include>org.apache.flume:flume-ng-sdk</include>
42-
<include>org.apache.flume:flume-ng-core</include>
43-
<include>org.apache.flume:flume-ng-node</include>
44-
<include>org.apache.flume:flume-ng-dist</include>
45-
<include>org.apache.flume:flume-ng-channels</include>
46-
<include>org.apache.flume:flume-ng-sinks</include>
47-
<include>org.apache.flume:flume-ng-sources</include>
48-
<include>org.apache.flume:flume-ng-legacy-sources</include>
49-
<include>org.apache.flume:flume-ng-clients</include>
50-
<include>org.apache.flume:flume-ng-embedded-agent</include>
51-
<include>org.apache.flume:flume-tools</include>
52-
<include>org.apache.flume:flume-ng-auth</include>
53-
<include>org.apache.flume:flume-shared</include>
54-
</includes>
55-
56-
<sources>
57-
<includeModuleDirectory>true</includeModuleDirectory>
58-
<excludeSubModuleDirectories>false</excludeSubModuleDirectories>
59-
60-
<fileSets>
61-
<fileSet>
62-
<excludes>
63-
<exclude>target/**</exclude>
64-
<exclude>*/target/**</exclude>
65-
<exclude>.classpath</exclude>
66-
<exclude>*/.classpath</exclude>
67-
<exclude>.project</exclude>
68-
<exclude>*/.project</exclude>
69-
<exclude>.settings/**</exclude>
70-
<exclude>*/.settings/**</exclude>
71-
</excludes>
72-
</fileSet>
73-
</fileSets>
74-
</sources>
75-
76-
</moduleSet>
77-
78-
</moduleSets>
79-
8034
<fileSets>
8135
<fileSet>
8236
<directory>../</directory>
8337

8438
<excludes>
85-
<exclude>flume-ng-configuration/**</exclude>
86-
<exclude>flume-ng-sdk/**</exclude>
87-
<exclude>flume-ng-core/**</exclude>
88-
<exclude>flume-ng-node/**</exclude>
89-
<exclude>flume-ng-dist/**</exclude>
90-
<exclude>flume-ng-channels/**</exclude>
91-
<exclude>flume-ng-sinks/**</exclude>
92-
<exclude>flume-ng-sources/**</exclude>
93-
<exclude>flume-ng-legacy-sources/**</exclude>
94-
<exclude>flume-ng-clients/**</exclude>
95-
<exclude>flume-ng-embedded-agent/**</exclude>
96-
<exclude>flume-tools/**</exclude>
9739
<exclude>**/target/**</exclude>
9840
<exclude>**/.classpath</exclude>
9941
<exclude>**/.project</exclude>
42+
<exclude>**/.idea/**</exclude>
43+
<exclude>**/*.iml</exclude>
10044
<exclude>**/.settings/**</exclude>
10145
<exclude>lib/**</exclude>
46+
<exclude>**/.DS_Store</exclude>
10247
</excludes>
103-
104-
<includes>
105-
<include>.gitignore</include>
106-
<include>DEVNOTES</include>
107-
<include>README</include>
108-
<include>LICENSE</include>
109-
<include>NOTICE</include>
110-
<include>CHANGELOG</include>
111-
<include>RELEASE-NOTES</include>
112-
<include>bin/**</include>
113-
<include>conf/**</include>
114-
<include>pom.xml</include>
115-
<include>flume-ng-doc/**</include>
116-
<include>flume-ng-tests/**</include>
117-
<include>dev-support/**</include>
118-
</includes>
11948
</fileSet>
12049
</fileSets>
12150

0 commit comments

Comments
 (0)
0