Mark, I don't understand why you had to delete dist-all.xml or dist-sources.xml.
Could we not have kept these descriptors around and called the relevant lifecycle/phase/goal like so mvn assembly:assembly -Ddescriptor=distribution/src/assembly/dist-sources.xml mvn assembly:assembly -Ddescriptor=distribution/src/assembly/dist-binary.xml ---Thanks, Rohit Kelapure On Mon, Jul 5, 2010 at 5:56 PM, <strub...@apache.org> wrote: > > Author: struberg > Date: Mon Jul 5 21:56:21 2010 > New Revision: 960716 > > URL: http://svn.apache.org/viewvc?rev=960716&view=rev > Log: > release preparation: only build binary release with our distribution project > > Removed: > openwebbeans/trunk/distribution/src/assembly/dist-all.xml > openwebbeans/trunk/distribution/src/assembly/dist-sources.xml > Modified: > openwebbeans/trunk/distribution/pom.xml > openwebbeans/trunk/distribution/src/assembly/dist-binary.xml > > Modified: openwebbeans/trunk/distribution/pom.xml > URL: > http://svn.apache.org/viewvc/openwebbeans/trunk/distribution/pom.xml?rev=960716&r1=960715&r2=960716&view=diff > ============================================================================== > --- openwebbeans/trunk/distribution/pom.xml (original) > +++ openwebbeans/trunk/distribution/pom.xml Mon Jul 5 21:56:21 2010 > @@ -27,11 +27,10 @@ > <artifactId>openwebbeans</artifactId> > <version>1.0.0-SNAPSHOT</version> > <relativePath>../pom.xml</relativePath> > - <relativePath>../pom.xml</relativePath> > </parent> > > <groupId>org.apache.openwebbeans</groupId> > - <artifactId>apache-openwebbeans</artifactId> > + <artifactId>openwebbeans-distribution</artifactId> > <packaging>pom</packaging> > > <name>OpenWebBeans :: Distribution</name> > @@ -42,51 +41,54 @@ > <skipReports>true</skipReports> > </properties> > > - <build> > - <plugins> > - <plugin> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-assembly-plugin</artifactId> > - <version>2.2-beta-2</version> > - <configuration> > - <tarLongFileMode>gnu</tarLongFileMode> > - <descriptors> > - <!-- > <descriptor>src/assembly/dist-all.xml</descriptor> --> > - > <descriptor>src/assembly/dist-sources.xml</descriptor> > - <descriptor>src/assembly/dist-binary.xml</descriptor> > - </descriptors> > - </configuration> > - <executions> > - <execution> > - <phase>package</phase> > - <goals> > - <goal>single</goal> > - </goals> > - </execution> > - </executions> > - </plugin> > - <plugin> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-install-plugin</artifactId> > - <configuration> > - <createChecksum>true</createChecksum> > - </configuration> > - </plugin> > - <plugin> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-gpg-plugin</artifactId> > - <executions> > - <execution> > - <id>sign-artifacts</id> > - <phase>verify</phase> > - <goals> > - <goal>sign</goal> > - </goals> > - </execution> > - </executions> > - </plugin> > - </plugins> > - </build> > + <profiles> > + <profile> > + <id>apache-release</id> > + <build> > + <plugins> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-assembly-plugin</artifactId> > + <version>2.2-beta-5</version> > + <configuration> > + <tarLongFileMode>gnu</tarLongFileMode> > + <descriptors> > + > <descriptor>src/assembly/dist-binary.xml</descriptor> > + </descriptors> > + </configuration> > + <executions> > + <execution> > + <phase>package</phase> > + <goals> > + <goal>single</goal> > + </goals> > + </execution> > + </executions> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-install-plugin</artifactId> > + <configuration> > + <createChecksum>true</createChecksum> > + </configuration> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-gpg-plugin</artifactId> > + <executions> > + <execution> > + <id>sign-artifacts</id> > + <phase>verify</phase> > + <goals> > + <goal>sign</goal> > + </goals> > + </execution> > + </executions> > + </plugin> > + </plugins> > + </build> > + </profile> > + </profiles> > > <!-- > The assemblies work off of dependency sets since the stuff to be > @@ -97,12 +99,10 @@ > <dependency> > <groupId>org.apache.geronimo.specs</groupId> > <artifactId>geronimo-atinject_1.0_spec</artifactId> > - <version>1.0-beta</version> > </dependency> > <dependency> > <groupId>org.apache.geronimo.specs</groupId> > <artifactId>geronimo-jcdi_1.0_spec</artifactId> > - <version>1.0-beta</version> > </dependency> > <dependency> > <groupId>${project.groupId}</groupId> > @@ -116,16 +116,36 @@ > </dependency> > <dependency> > <groupId>${project.groupId}</groupId> > + <artifactId>openwebbeans-jsf12</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>${project.groupId}</groupId> > <artifactId>openwebbeans-jms</artifactId> > <version>${project.version}</version> > </dependency> > <dependency> > <groupId>${project.groupId}</groupId> > + <artifactId>openwebbeans-ejb-common</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>${project.groupId}</groupId> > <artifactId>openwebbeans-ejb</artifactId> > <version>${project.version}</version> > </dependency> > <dependency> > <groupId>${project.groupId}</groupId> > + <artifactId>openwebbeans-ee-common</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>${project.groupId}</groupId> > + <artifactId>openwebbeans-el10</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>${project.groupId}</groupId> > <artifactId>openwebbeans-resource</artifactId> > <version>${project.version}</version> > </dependency> > @@ -134,5 +154,25 @@ > <artifactId>openwebbeans-spi</artifactId> > <version>${project.version}</version> > </dependency> > + <dependency> > + <groupId>${project.groupId}</groupId> > + <artifactId>openwebbeans-osgi</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>${project.groupId}</groupId> > + <artifactId>openwebbeans-tomcat6</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>${project.groupId}</groupId> > + <artifactId>openwebbeans-tomcat7</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>${project.groupId}</groupId> > + <artifactId>openwebbeans-web</artifactId> > + <version>${project.version}</version> > + </dependency> > </dependencies> > </project> > > Modified: openwebbeans/trunk/distribution/src/assembly/dist-binary.xml > URL: > http://svn.apache.org/viewvc/openwebbeans/trunk/distribution/src/assembly/dist-binary.xml?rev=960716&r1=960715&r2=960716&view=diff > ============================================================================== > --- openwebbeans/trunk/distribution/src/assembly/dist-binary.xml (original) > +++ openwebbeans/trunk/distribution/src/assembly/dist-binary.xml Mon Jul 5 > 21:56:21 2010 > @@ -37,7 +37,7 @@ under the License. > </file> > > <file> > - <source>../readme/README_M4.txt</source> > + <source>../readme/README_1_0_0-alpha-1.txt</source> > </file> > > <file> > @@ -185,16 +185,16 @@ under the License. > <includes> > <include>org.apache.openwebbeans:openwebbeans-impl</include> > </includes> > - <excludes> > - > <exclude>org.apache.openwebbeans:openwebbeans-impl:jar:sources</exclude> > - </excludes> > + <excludes> > + > <exclude>org.apache.openwebbeans:openwebbeans-impl:jar:sources</exclude> > + </excludes> > </dependencySet> > > <dependencySet> > <outputDirectory>api</outputDirectory> > <includes> > - > <include>org.apache.geronimo.specs:geronimo-atinject_1.0_spec:jar:1.0-beta</include> > - > <include>org.apache.geronimo.specs:geronimo-jcdi_1.0_spec:jar:1.0-beta</include> > + > <include>org.apache.geronimo.specs:geronimo-atinject_1.0_spec:jar:1.0</include> > + > <include>org.apache.geronimo.specs:geronimo-jcdi_1.0_spec:jar:1.0</include> > </includes> > </dependencySet> > > @@ -206,11 +206,11 @@ under the License. > <include>org.apache.openwebbeans:openwebbeans-jsf</include> > <include>org.apache.openwebbeans:openwebbeans-jms</include> > </includes> > - <excludes> > - > <exclude>org.apache.openwebbeans:openwebbeans-ejb:jar:sources</exclude> > - > <exclude>org.apache.openwebbeans:openwebbeans-resource:jar:sources</exclude> > - > <exclude>org.apache.openwebbeans:openwebbeans-jsf:jar:sources</exclude> > - > <exclude>org.apache.openwebbeans:openwebbeans-jms:jar:sources</exclude> > + <excludes> > + > <exclude>org.apache.openwebbeans:openwebbeans-ejb:jar:sources</exclude> > + > <exclude>org.apache.openwebbeans:openwebbeans-resource:jar:sources</exclude> > + > <exclude>org.apache.openwebbeans:openwebbeans-jsf:jar:sources</exclude> > + > <exclude>org.apache.openwebbeans:openwebbeans-jms:jar:sources</exclude> > </excludes> > </dependencySet> > > @@ -219,8 +219,8 @@ under the License. > <includes> > <include>org.apache.openwebbeans:openwebbeans-spi</include> > </includes> > - <excludes> > - > <exclude>org.apache.openwebbeans:openwebbeans-spi:jar:sources</exclude> > + <excludes> > + > <exclude>org.apache.openwebbeans:openwebbeans-spi:jar:sources</exclude> > </excludes> > </dependencySet> > > >
