[jboss-svn-commits] JBoss Common SVN: r4747 - in arquillian/trunk: bundle and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 15 06:09:17 EDT 2010
Author: thomas.diesler at jboss.com
Date: 2010-07-15 06:09:16 -0400 (Thu, 15 Jul 2010)
New Revision: 4747
Modified:
arquillian/trunk/bundle/pom.xml
arquillian/trunk/containers/osgi-embedded-4.2/pom.xml
arquillian/trunk/containers/pom.xml
arquillian/trunk/pom.xml
arquillian/trunk/protocols/pom.xml
arquillian/trunk/testenrichers/pom.xml
Log:
Use profiles to customize the build
mvn install => build all modules (like before)
mvn -Pall install => build all modules
mvn -Posgi install => only build osgi related modules
Modified: arquillian/trunk/bundle/pom.xml
===================================================================
--- arquillian/trunk/bundle/pom.xml 2010-07-15 05:59:08 UTC (rev 4746)
+++ arquillian/trunk/bundle/pom.xml 2010-07-15 10:09:16 UTC (rev 4747)
@@ -30,7 +30,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.jboss.arquillian.osgi.ArquillianBundleActivator</Bundle-Activator>
<Export-Package></Export-Package>
<Import-Package>
@@ -64,7 +64,7 @@
</Embed-Dependency>
<_exportcontents>
javax.inject;version=${version.javax.inject_javax.inject},
- org.jboss.arquillian.junit;version=${version},
+ org.jboss.arquillian.junit;version=${project.version},
org.jboss.shrinkwrap.api;version=${version.shrinkwrap_shrinkwrap},
org.jboss.shrinkwrap.api.asset;version=${version.shrinkwrap_shrinkwrap},
org.jboss.shrinkwrap.api.spec;version=${version.shrinkwrap_shrinkwrap},
@@ -95,17 +95,17 @@
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-jmx</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.testenricher</groupId>
<artifactId>arquillian-testenricher-osgi</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-junit</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
Modified: arquillian/trunk/containers/osgi-embedded-4.2/pom.xml
===================================================================
--- arquillian/trunk/containers/osgi-embedded-4.2/pom.xml 2010-07-15 05:59:08 UTC (rev 4746)
+++ arquillian/trunk/containers/osgi-embedded-4.2/pom.xml 2010-07-15 10:09:16 UTC (rev 4747)
@@ -67,12 +67,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.packager</groupId>
- <artifactId>arquillian-packager-osgi</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bundle</artifactId>
<version>${project.version}</version>
Modified: arquillian/trunk/containers/pom.xml
===================================================================
--- arquillian/trunk/containers/pom.xml 2010-07-15 05:59:08 UTC (rev 4746)
+++ arquillian/trunk/containers/pom.xml 2010-07-15 10:09:16 UTC (rev 4747)
@@ -23,25 +23,46 @@
<!-- Aggregate Modules -->
<modules>
- <module>jsr88-remote-1.2</module>
- <module>osgi-embedded-4.2</module>
-<!-- <module>jbossas-remote-4_2</module> -->
- <module>jbossas-remote-5</module>
- <module>jbossas-remote-5.1</module>
- <module>jbossas-remote-6</module>
- <module>jbossas-managed-5.1</module>
- <module>jbossas-managed-6</module>
- <module>jbossas-embedded-6</module>
- <module>glassfish-remote-3</module>
- <module>glassfish-embedded-3</module>
- <module>jetty-embedded-6.1</module>
- <module>jetty-embedded-7</module>
- <module>tomcat-embedded-6</module>
- <module>weld-se-embedded-1</module>
- <module>weld-ee-embedded-1.1</module>
- <module>openejb-embedded-3.1</module>
- <module>reloaded-embedded-1</module>
- <module>openwebbeans-embedded-1</module>
</modules>
+ <!-- Profiles -->
+ <profiles>
+
+ <!-- Build all Arquillian modules -->
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>jsr88-remote-1.2</module>
+ <module>osgi-embedded-4.2</module>
+ <!-- module>jbossas-remote-4_2</module -->
+ <module>jbossas-remote-5</module>
+ <module>jbossas-remote-5.1</module>
+ <module>jbossas-remote-6</module>
+ <module>jbossas-managed-5.1</module>
+ <module>jbossas-managed-6</module>
+ <module>jbossas-embedded-6</module>
+ <module>glassfish-remote-3</module>
+ <module>glassfish-embedded-3</module>
+ <module>jetty-embedded-6.1</module>
+ <module>jetty-embedded-7</module>
+ <module>tomcat-embedded-6</module>
+ <module>weld-se-embedded-1</module>
+ <module>weld-ee-embedded-1.1</module>
+ <module>openejb-embedded-3.1</module>
+ <module>reloaded-embedded-1</module>
+ <module>openwebbeans-embedded-1</module>
+ </modules>
+ </profile>
+
+ <!-- Build Arquillian OSGi modules -->
+ <profile>
+ <id>osgi</id>
+ <modules>
+ <module>osgi-embedded-4.2</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: arquillian/trunk/pom.xml
===================================================================
--- arquillian/trunk/pom.xml 2010-07-15 05:59:08 UTC (rev 4746)
+++ arquillian/trunk/pom.xml 2010-07-15 10:09:16 UTC (rev 4747)
@@ -41,31 +41,63 @@
<url>http://www.jboss.org</url>
<description>Arquillian Aggregator</description>
- <!-- Aggregate Modules -->
- <modules>
- <!-- Core -->
- <module>api</module>
- <module>spi</module>
- <module>build</module>
- <module>impl-base</module>
-
- <!-- Tools -->
-<!-- <module>archetypes/junit-javaee6</module> -->
+ <!-- Profiles -->
+ <profiles>
+
+ <!-- Build all Arquillian modules -->
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+
+ <!-- Core -->
+ <module>api</module>
+ <module>spi</module>
+ <module>build</module>
+ <module>impl-base</module>
+
+ <!-- Tools -->
+ <!-- module>archetypes/junit-javaee6</module -->
+
+ <!-- Test Framework -->
+ <module>junit</module>
+ <module>testng</module>
+
+ <!-- Extensions -->
+ <module>protocols</module>
+ <module>testenrichers</module>
+ <module>bundle</module>
+ <module>containers</module>
+
+ <module>frameworks</module>
+ <module>examples</module>
+
+ <module>doc/reference</module>
+ </modules>
+ </profile>
- <!-- Test Framework -->
- <module>junit</module>
- <module>testng</module>
+ <!-- Build Arquillian OSGi modules -->
+ <profile>
+ <id>osgi</id>
+ <modules>
+
+ <!-- Core -->
+ <module>api</module>
+ <module>spi</module>
+ <module>impl-base</module>
+
+ <!-- Test Framework -->
+ <module>junit</module>
+
+ <!-- Extensions -->
+ <module>protocols</module>
+ <module>testenrichers</module>
+ <module>bundle</module>
+ <module>containers</module>
+ </modules>
+ </profile>
+ </profiles>
- <!-- Extensions -->
- <module>protocols</module>
- <module>testenrichers</module>
- <module>bundle</module>
- <module>containers</module>
-
- <module>frameworks</module>
- <module>examples</module>
-
- <module>doc/reference</module>
-</modules>
-
</project>
Modified: arquillian/trunk/protocols/pom.xml
===================================================================
--- arquillian/trunk/protocols/pom.xml 2010-07-15 05:59:08 UTC (rev 4746)
+++ arquillian/trunk/protocols/pom.xml 2010-07-15 10:09:16 UTC (rev 4747)
@@ -23,14 +23,29 @@
<url>http://www.jboss.org</url>
<description>Arquillian Protocol Aggregator</description>
- <!-- Aggregate Modules -->
- <modules>
-
- <module>servlet-2.5</module>
- <module>servlet-3</module>
- <module>local</module>
- <module>jmx</module>
+ <!-- Profiles -->
+ <profiles>
+
+ <!-- Build all Arquillian modules -->
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>servlet-2.5</module>
+ <module>servlet-3</module>
+ <module>local</module>
+ <module>jmx</module>
+ </modules>
+ </profile>
- </modules>
-
+ <!-- Build Arquillian OSGi modules -->
+ <profile>
+ <id>osgi</id>
+ <modules>
+ <module>jmx</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: arquillian/trunk/testenrichers/pom.xml
===================================================================
--- arquillian/trunk/testenrichers/pom.xml 2010-07-15 05:59:08 UTC (rev 4746)
+++ arquillian/trunk/testenrichers/pom.xml 2010-07-15 10:09:16 UTC (rev 4747)
@@ -23,14 +23,29 @@
<url>http://www.jboss.org</url>
<description>Arquillian TestEnricher Aggregator</description>
- <!-- Aggregate Modules -->
- <modules>
-
- <module>cdi</module>
- <module>ejb</module>
- <module>osgi</module>
- <module>resource</module>
+ <!-- Profiles -->
+ <profiles>
+
+ <!-- Build all Arquillian modules -->
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>cdi</module>
+ <module>ejb</module>
+ <module>osgi</module>
+ <module>resource</module>
+ </modules>
+ </profile>
- </modules>
-
+ <!-- Build Arquillian OSGi modules -->
+ <profile>
+ <id>osgi</id>
+ <modules>
+ <module>osgi</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
More information about the jboss-svn-commits
mailing list