Author: objectiser Date: 2009-10-19 12:01:54 -0400 (Mon, 19 Oct 2009) New Revision: 192 Modified: trunk/docs/docbook/pom.xml trunk/integration-tests/build.xml trunk/integration-tests/pom.xml trunk/pom.xml trunk/runtime/engine/pom.xml Log: RIFTSAW-35 - incorporated integration-tests sub-project into top level pom, triggered by profile "integration". Also made the documentation generation a separate profile "docs". Modified: trunk/docs/docbook/pom.xml =================================================================== --- trunk/docs/docbook/pom.xml 2009-10-19 14:27:40 UTC (rev 191) +++ trunk/docs/docbook/pom.xml 2009-10-19 16:01:54 UTC (rev 192) @@ -10,11 +10,16 @@ <packaging>pom</packaging> <name>RiftSaw::Docs</name> - <modules> - <module>gettingstartedguide</module> - <module>userguide</module> - </modules> - + <profiles> + <profile> + <id>docs</id> + <modules> + <module>gettingstartedguide</module> + <module>userguide</module> + </modules> + </profile> + </profiles> + <repositories> <repository> <snapshots> Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2009-10-19 14:27:40 UTC (rev 191) +++ trunk/integration-tests/build.xml 2009-10-19 16:01:54 UTC (rev 192) @@ -1,7 +1,7 @@ <project name="integration-tests" basedir="."> <property environment="env" /> - <property name="riftsaw.engine.version" value="2.0-M1" /> + <property name="riftsaw.engine.version" value="2.0-SNAPSHOT" /> <property file="${riftsaw.test.deployment.properties}" /> Modified: trunk/integration-tests/pom.xml =================================================================== --- trunk/integration-tests/pom.xml 2009-10-19 14:27:40 UTC (rev 191) +++ trunk/integration-tests/pom.xml 2009-10-19 16:01:54 UTC (rev 192) @@ -11,7 +11,7 @@ <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0-M1</version> + <version>2.0-SNAPSHOT</version> </parent> <properties> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-19 14:27:40 UTC (rev 191) +++ trunk/pom.xml 2009-10-19 16:01:54 UTC (rev 192) @@ -52,9 +52,18 @@ <modules> <module>runtime</module> <module>console</module> - <!--module>docs/docbook</module--> + <module>docs/docbook</module> <module>distribution</module> </modules> + + <profiles> + <profile> + <id>integration</id> + <modules> + <module>integration-tests</module> + </modules> + </profile> + </profiles> <properties> <riftsaw.engine.version>2.0-SNAPSHOT</riftsaw.engine.version> @@ -94,12 +103,6 @@ <type>war</type> </dependency> <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-system-jmx</artifactId> - <scope>provided</scope> - <version>${jboss.version}</version> - </dependency> - <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> <version>${wsdl4j.version}</version> Modified: trunk/runtime/engine/pom.xml =================================================================== --- trunk/runtime/engine/pom.xml 2009-10-19 14:27:40 UTC (rev 191) +++ trunk/runtime/engine/pom.xml 2009-10-19 16:01:54 UTC (rev 192) @@ -114,6 +114,7 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-system-jmx</artifactId> <scope>provided</scope> + <version>${jboss.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId>