[jboss-osgi-commits] JBoss-OSGI SVN: r91598 - in projects/jboss-osgi/trunk: distribution/javadoc and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-07-23 04:06:22 -0400 (Thu, 23 Jul 2009) New Revision: 91598 Modified: projects/jboss-osgi/trunk/distribution/javadoc/pom.xml projects/jboss-osgi/trunk/distribution/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml projects/jboss-osgi/trunk/reactor/pom.xml Log: Attach blueprint sources to reactor Modified: projects/jboss-osgi/trunk/distribution/javadoc/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/javadoc/pom.xml 2009-07-23 07:29:05 UTC (rev 91597) +++ projects/jboss-osgi/trunk/distribution/javadoc/pom.xml 2009-07-23 08:06:22 UTC (rev 91598) @@ -60,6 +60,7 @@ </configuration> <executions> <execution> + <phase>package</phase> <goals> <goal>jar</goal> </goals> Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-23 07:29:05 UTC (rev 91597) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-23 08:06:22 UTC (rev 91598) @@ -29,8 +29,8 @@ <!-- Modules --> <modules> + <module>javadoc</module> <module>docbook</module> - <module>javadoc</module> <module>installer</module> </modules> Modified: projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml 2009-07-23 07:29:05 UTC (rev 91597) +++ projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml 2009-07-23 08:06:22 UTC (rev 91598) @@ -89,6 +89,29 @@ </instructions> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <!-- For some reason the distribution javadoc module needs this --> + <file>target/jboss-osgi-blueprint-${version}-sources.jar</file> + <classifier>sources</classifier> + <type>jar</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Modified: projects/jboss-osgi/trunk/reactor/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/pom.xml 2009-07-23 07:29:05 UTC (rev 91597) +++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-07-23 08:06:22 UTC (rev 91598) @@ -11,6 +11,58 @@ <!-- $Id: pom.xml 91403 2009-07-18 14:01:46Z thomas.diesler(a)jboss.com $ --> + <!-- + + The reactor is used to pull in external subprojects and build them + as part of this maven reactor build. It is a one-stop entry point + to build, test and deploy dependent SNAPSHOTs. + + To pull in a particular subproject, set one or more of these svn:external definitions + + spi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/spi/trunk + bundles/apache-xerces https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... + bundles/common https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... + bundles/hotdeploy https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... + bundles/husky https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... + bundles/jaxb https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... + bundles/jmx https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... + bundles/jndi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... + bundles/jboss-common-core https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... + bundles/jboss-xml-binding https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... + bundles/microcontainer https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... + bundles/remotelog https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... + bundles/webconsole https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... + runtime/deployers https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... + runtime/equinox https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... + runtime/felix https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... + runtime/jbossas https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... + runtime/knopflerfish https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... + + and enable the associated maven module + + <module>spi</module> + <module>runtime/equinox</module> + <module>runtime/felix</module> + <module>runtime/knopflerfish</module> + <module>runtime/deployers</module> + <module>bundles/common</module> + <module>bundles/jboss-common-core</module> + <module>bundles/apache-xerces</module> + <module>bundles/jaxb</module> + <module>bundles/jboss-xml-binding</module> + <module>bundles/jndi</module> + <module>bundles/jmx</module> + <module>bundles/remotelog</module> + <module>bundles/webconsole</module> + <module>bundles/hotdeploy</module> + <module>bundles/microcontainer</module> + <module>bundles/husky</module> + <module>runtime/jbossas</module> + + A release MUST NOT contain any svn:external definitions. + + --> + <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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -25,28 +77,8 @@ <artifactId>jboss-osgi</artifactId> <version>1.0.0.Beta3</version> </parent> - + <modules> - <!-- - <module>spi</module> - <module>runtime/equinox</module> - <module>runtime/felix</module> - <module>runtime/knopflerfish</module> - <module>runtime/deployers</module> - <module>bundles/common</module> - <module>bundles/jboss-common-core</module> - <module>bundles/apache-xerces</module> - <module>bundles/jaxb</module> - <module>bundles/jboss-xml-binding</module> - <module>bundles/jndi</module> - <module>bundles/jmx</module> - <module>bundles/remotelog</module> - <module>bundles/webconsole</module> - <module>bundles/hotdeploy</module> - <module>bundles/microcontainer</module> - <module>bundles/husky</module> - <module>runtime/jbossas</module> - --> <module>blueprint</module> </modules>