[jboss-svn-commits] JBoss Common SVN: r3707 - in arquillian/trunk: api and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Nov 15 09:24:50 EST 2009
Author: aslak
Date: 2009-11-15 09:24:50 -0500 (Sun, 15 Nov 2009)
New Revision: 3707
Modified:
arquillian/trunk/api/pom.xml
arquillian/trunk/build/pom.xml
arquillian/trunk/impl-base/pom.xml
arquillian/trunk/junit/pom.xml
arquillian/trunk/pom.xml
Log:
ARQ-18 Updated poms to use project.version, external dep controlled by build/pom.xml
Modified: arquillian/trunk/api/pom.xml
===================================================================
--- arquillian/trunk/api/pom.xml 2009-11-15 14:14:52 UTC (rev 3706)
+++ arquillian/trunk/api/pom.xml 2009-11-15 14:24:50 UTC (rev 3707)
@@ -5,7 +5,7 @@
<!-- Parent -->
<parent>
<groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-parent</artifactId>
+ <artifactId>arquillian-build</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -15,7 +15,6 @@
<!-- Artifact Configuration -->
<artifactId>arquillian-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<name>Arquillian API</name>
<description>Client View of the Arquillian Project</description>
@@ -36,7 +35,6 @@
<dependency>
<groupId>org.jboss.tmpdpl</groupId>
<artifactId>tmpdpl-api-shrinkwrap</artifactId>
- <version>0.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
Modified: arquillian/trunk/build/pom.xml
===================================================================
--- arquillian/trunk/build/pom.xml 2009-11-15 14:14:52 UTC (rev 3706)
+++ arquillian/trunk/build/pom.xml 2009-11-15 14:24:50 UTC (rev 3707)
@@ -28,6 +28,9 @@
<!-- Versioning -->
<version.junit_junit>4.6</version.junit_junit>
+ <version.tmpdpl_tmpdpl>0.1.1-SNAPSHOT</version.tmpdpl_tmpdpl>
+ <version.shrinkwrap_shrinkwrap>1.0.0-SNAPSHOT</version.shrinkwrap_shrinkwrap>
+ <version.jboss_embedded>0.1.0-SNAPSHOT</version.jboss_embedded>
</properties>
@@ -109,8 +112,7 @@
<!-- Enforce Maven Environment -->
<plugin>
- <artifactId>maven-enforcer-plugin
- </artifactId>
+ <artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-maven-environment</id>
@@ -142,12 +144,42 @@
<!-- Dependency Management -->
<dependencyManagement>
<dependencies>
-
<dependency>
+ <groupId>org.jboss.tmpdpl</groupId>
+ <artifactId>tmpdpl-api</artifactId>
+ <version>${version.tmpdpl_tmpdpl}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.tmpdpl</groupId>
+ <artifactId>tmpdpl-api-shrinkwrap</artifactId>
+ <version>${version.tmpdpl_tmpdpl}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.tmpdpl</groupId>
+ <artifactId>tmpdpl-api-shrinkwrap</artifactId>
+ <version>${version.tmpdpl_tmpdpl}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-api</artifactId>
+ <version>${version.shrinkwrap_shrinkwrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ <version>${version.shrinkwrap_shrinkwrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.embedded</groupId>
+ <artifactId>jboss-embedded-assembly</artifactId>
+ <classifier>launcher</classifier>
+ <type>jar</type>
+ <version>${version.jboss_embedded}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit_junit}</version>
- <scope>test</scope>
</dependency>
</dependencies>
Modified: arquillian/trunk/impl-base/pom.xml
===================================================================
--- arquillian/trunk/impl-base/pom.xml 2009-11-15 14:14:52 UTC (rev 3706)
+++ arquillian/trunk/impl-base/pom.xml 2009-11-15 14:24:50 UTC (rev 3707)
@@ -18,16 +18,13 @@
<!-- Artifact Configuration -->
<artifactId>arquillian-impl-base</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<name>Arquillian Implementation Base</name>
- <description>Common Base for Implementations of the Project</description>
+ <description>Common Base for Implementations of the Project</description>
<!-- Properties -->
<properties>
- <!-- Versioning -->
- <version.org.jboss.arquillian_arquillian.api>0.0.1-SNAPSHOT</version.org.jboss.arquillian_arquillian.api>
</properties>
@@ -40,12 +37,11 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-api</artifactId>
- <version>${version.org.jboss.arquillian_arquillian.api}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-assembly</artifactId>
- <version>0.1.0-SNAPSHOT</version>
<classifier>launcher</classifier>
</dependency>
@@ -55,7 +51,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: arquillian/trunk/junit/pom.xml
===================================================================
--- arquillian/trunk/junit/pom.xml 2009-11-15 14:14:52 UTC (rev 3706)
+++ arquillian/trunk/junit/pom.xml 2009-11-15 14:24:50 UTC (rev 3707)
@@ -17,7 +17,6 @@
<!-- Artifact Configuration -->
<artifactId>arquillian-junit</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<name>Arquillian JUnit Implementation</name>
<description>JUnit Implementations for the the Project</description>
@@ -25,9 +24,6 @@
<!-- Properties -->
<properties>
- <!-- Versioning -->
- <version.org.jboss.arquillian_arquillian.impl-base>0.0.1-SNAPSHOT</version.org.jboss.arquillian_arquillian.impl-base>
-
</properties>
<!-- Dependencies -->
@@ -39,7 +35,7 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-impl-base</artifactId>
- <version>${version.org.jboss.arquillian_arquillian.impl-base}</version>
+ <version>${project.version}</version>
</dependency>
<!--
External Projects
@@ -47,7 +43,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: arquillian/trunk/pom.xml
===================================================================
--- arquillian/trunk/pom.xml 2009-11-15 14:14:52 UTC (rev 3706)
+++ arquillian/trunk/pom.xml 2009-11-15 14:24:50 UTC (rev 3707)
@@ -15,6 +15,22 @@
<!-- Model Information -->
<modelVersion>4.0.0</modelVersion>
+ <!-- Plugin Configuration -->
+ <build>
+ <plugins>
+ <!-- Deploy -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!-- Don't include this aggregator in the deployment -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
<!-- Artifact Information -->
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
@@ -32,28 +48,4 @@
<module>junit</module>
</modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.tmpdpl</groupId>
- <artifactId>tmpdpl-api</artifactId>
- <version>0.1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.tmpdpl</groupId>
- <artifactId>tmpdpl-api-shrinkwrap</artifactId>
- <version>0.1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-impl-base</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
More information about the jboss-svn-commits
mailing list