Skip to content

Commit 73136fe

Browse files
ptgoetzptgoetz
committed
split source and binary dist into separate modules
1 parent 2e97e37 commit 73136fe

File tree

7 files changed

+105
-15
lines changed

7 files changed

+105
-15
lines changed

‎pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@
202202
<profile>
203203
<id>dist</id>
204204
<modules>
205-
<module>storm-dist</module>
205+
<module>storm-dist/binary</module>
206+
<module>storm-dist/source</module>
206207
</modules>
207208
<build>
208209
<plugins>

‎storm-dist/LICENSE renamed to ‎storm-dist/binary/LICENSE

File renamed without changes.

‎storm-dist/NOTICE renamed to ‎storm-dist/binary/NOTICE

File renamed without changes.

‎storm-dist/pom.xml renamed to ‎storm-dist/binary/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
<version>0.9.1-incubating-SNAPSHOT</version>
2525
</parent>
2626
<groupId>org.apache.storm</groupId>
27-
<artifactId>apache-storm</artifactId>
27+
<artifactId>apache-storm-bin</artifactId>
2828
<packaging>pom</packaging>
29-
<name>Storm Distribution</name>
30-
<description>Builds Storm source and binary distributions.</description>
29+
<name>Storm Binary Distribution</name>
30+
<description>Storm binary distribution</description>
3131

3232
<dependencies>
3333
<dependency>
@@ -38,6 +38,7 @@
3838
</dependencies>
3939

4040
<build>
41+
<finalName>apache-storm-${version}</finalName>
4142
<plugins>
4243
<plugin>
4344
<groupId>org.apache.maven.plugins</groupId>
@@ -54,16 +55,15 @@
5455
<attach>true</attach>
5556
<descriptors>
5657
<descriptor>${project.basedir}/src/main/assembly/binary.xml</descriptor>
57-
<descriptor>${project.basedir}/src/main/assembly/source.xml</descriptor>
5858
</descriptors>
59+
<appendAssemblyId>false</appendAssemblyId>
5960
</configuration>
6061
</plugin>
6162
<plugin>
6263
<groupId>org.apache.maven.plugins</groupId>
6364
<artifactId>maven-gpg-plugin</artifactId>
6465
<executions>
6566
<execution>
66-
<!-- TODO Bind to deploy phase -->
6767
<phase>deploy</phase>
6868
<goals>
6969
<goal>sign</goal>

‎storm-dist/src/main/assembly/binary.xml renamed to ‎storm-dist/binary/src/main/assembly/binary.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
$STORM_HOME/bin
3939
-->
4040
<fileSet>
41-
<directory>${project.basedir}/../bin</directory>
41+
<directory>${project.basedir}/../../bin</directory>
4242
<outputDirectory>bin</outputDirectory>
4343
<includes>
4444
<include>storm*</include>
4545
</includes>
4646
</fileSet>
4747
<fileSet>
48-
<directory>${project.basedir}/../storm-core/src/ui/public</directory>
48+
<directory>${project.basedir}/../../storm-core/src/ui/public</directory>
4949
<outputDirectory>public</outputDirectory>
5050
<includes>
5151
<include>*/**</include>
@@ -61,20 +61,20 @@
6161
$STORM_HOME/conf
6262
-->
6363
<file>
64-
<source>${project.basedir}/../conf/storm.yaml.example</source>
64+
<source>${project.basedir}/../../conf/storm.yaml.example</source>
6565
<outputDirectory>/conf</outputDirectory>
6666
<destName>storm.yaml</destName>
6767
</file>
6868
<!-- TODO this should be a generated file from "target" -->
6969
<file>
70-
<source>${project.basedir}/../VERSION</source>
70+
<source>${project.basedir}/../../VERSION</source>
7171
<outputDirectory>/</outputDirectory>
7272
<destName>RELEASE</destName>
7373
<filtered>true</filtered>
7474
</file>
7575

7676
<file>
77-
<source>${project.basedir}/../logback/cluster.xml</source>
77+
<source>${project.basedir}/../../logback/cluster.xml</source>
7878
<outputDirectory>/logback</outputDirectory>
7979
</file>
8080

@@ -89,16 +89,16 @@
8989
<outputDirectory>/</outputDirectory>
9090
</file>
9191
<file>
92-
<source>${project.basedir}/../README.markdown</source>
92+
<source>${project.basedir}/../../README.markdown</source>
9393
<outputDirectory>/</outputDirectory>
9494
</file>
9595
<file>
96-
<source>${project.basedir}/../DISCLAIMER</source>
96+
<source>${project.basedir}/../../DISCLAIMER</source>
9797
<outputDirectory>/</outputDirectory>
9898
</file>
9999

100100
<file>
101-
<source>${project.basedir}/../CHANGELOG.md</source>
101+
<source>${project.basedir}/../../CHANGELOG.md</source>
102102
<outputDirectory>/</outputDirectory>
103103
</file>
104104
</files>

‎storm-dist/source/pom.xml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to You under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
19+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
<parent>
22+
<artifactId>storm</artifactId>
23+
<groupId>org.apache.storm</groupId>
24+
<version>0.9.1-incubating-SNAPSHOT</version>
25+
</parent>
26+
<groupId>org.apache.storm</groupId>
27+
<artifactId>apache-storm-source</artifactId>
28+
<packaging>pom</packaging>
29+
<name>Storm Source Distribution</name>
30+
<description>Storm source distribution</description>
31+
32+
<dependencies>
33+
<dependency>
34+
<groupId>org.apache.storm</groupId>
35+
<artifactId>storm-core</artifactId>
36+
<version>${project.version}</version>
37+
</dependency>
38+
</dependencies>
39+
40+
<build>
41+
<finalName>apache-storm-${version}</finalName>
42+
<plugins>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-assembly-plugin</artifactId>
46+
<executions>
47+
<execution>
48+
<phase>package</phase>
49+
<goals>
50+
<goal>single</goal>
51+
</goals>
52+
</execution>
53+
</executions>
54+
<configuration>
55+
<attach>true</attach>
56+
<descriptors>
57+
<descriptor>${project.basedir}/src/main/assembly/source.xml</descriptor>
58+
</descriptors>
59+
</configuration>
60+
</plugin>
61+
<plugin>
62+
<groupId>org.apache.maven.plugins</groupId>
63+
<artifactId>maven-gpg-plugin</artifactId>
64+
<executions>
65+
<execution>
66+
<phase>deploy</phase>
67+
<goals>
68+
<goal>sign</goal>
69+
</goals>
70+
</execution>
71+
</executions>
72+
</plugin>
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-install-plugin</artifactId>
76+
<!--
77+
we don't need to install to the local repo
78+
so unbind from the install phase
79+
-->
80+
<executions>
81+
<execution>
82+
<id>default-install</id>
83+
<phase>none</phase>
84+
</execution>
85+
</executions>
86+
</plugin>
87+
</plugins>
88+
</build>
89+
</project>

‎storm-dist/src/main/assembly/source.xml renamed to ‎storm-dist/source/src/main/assembly/source.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</formats>
2626
<fileSets>
2727
<fileSet>
28-
<directory>${project.basedir}/../</directory>
28+
<directory>${project.basedir}/../../</directory>
2929
<outputDirectory>/</outputDirectory>
3030
<useDefaultExcludes>true</useDefaultExcludes>
3131
<excludes>

0 commit comments

Comments
 (0)