Author: jlmonteiro
Date: Tue Jul 17 12:05:34 2012
New Revision: 1362459
URL: http://svn.apache.org/viewvc?rev=1362459&view=rev
Log:
TOMEE-328 Re organize Arquillian versionning in POMs
Modified:
openejb/trunk/openejb/arquillian/arquillian-common/pom.xml
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian/pom.xml
openejb/trunk/openejb/arquillian/ziplock/pom.xml
Modified: openejb/trunk/openejb/arquillian/arquillian-common/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-common/pom.xml?rev=1362459&r1=1362458&r2=1362459&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-common/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-common/pom.xml Tue Jul 17
12:05:34 2012
@@ -25,9 +25,7 @@
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openejb</groupId>
<artifactId>arquillian-common</artifactId>
- <version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>OpenEJB :: Arquillian Adaptors Parent :: Common</name>
Modified: openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml?rev=1362459&r1=1362458&r2=1362459&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml Tue
Jul 17 12:05:34 2012
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
+ <version>${openejb.version}</version>
</dependency>
<dependency>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-common</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>${tomee.version}</version>
</dependency>
</dependencies>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml?rev=1362459&r1=1362458&r2=1362459&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml Tue Jul 17
12:05:34 2012
@@ -24,9 +24,7 @@
<groupId>org.apache.openejb</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-common</artifactId>
- <version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>OpenEJB :: Arquillian Adaptors Parent :: TomEE Common</name>
@@ -55,14 +53,14 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-1</version>
+ <version>${javaee-api.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
+ <version>${openejb.version}</version>
<type>jar</type>
<scope>compile</scope>
<exclusions>
@@ -204,7 +202,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-provisionning</artifactId>
- <version>${version.openejb}</version>
+ <version>${openejb.version}</version>
</dependency>
<dependency>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml?rev=1362459&r1=1362458&r2=1362459&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml Tue Jul
17 12:05:34 2012
@@ -24,9 +24,7 @@
<groupId>org.apache.openejb</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-embedded</artifactId>
- <version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>OpenEJB :: Arquillian Adaptors Parent :: Embedded Adaptor</name>
@@ -36,7 +34,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-embedded</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
@@ -115,28 +113,25 @@
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
<version>${javaee-api.version}</version>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-common</artifactId>
<version>${project.version}</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-common</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>${tomee.version}</version>
</dependency>
</dependencies>
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml?rev=1362459&r1=1362458&r2=1362459&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml
Tue Jul 17 12:05:34 2012
@@ -20,16 +20,13 @@
<artifactId>arquillian</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-moviefun-example</artifactId>
<packaging>war</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>OpenEJB :: Arquillian Adaptors Parent :: Sample :: Moviefun</name>
<properties>
<version.selenium>2.7.0</version.selenium>
<version.selenium.rc>2.0rc2</version.selenium.rc>
- <tomee.version>1.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
@@ -113,14 +110,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>${javaee-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${myfaces.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -146,7 +142,7 @@
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-selenium</artifactId>
- <version>1.0.0.Final</version>
+ <version>${version.arquillian}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -175,14 +171,12 @@
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-api</artifactId>
<version>${version.selenium}</version>
- <type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-impl</artifactId>
- <version>1.0.0.Final</version>
- <type>jar</type>
+ <version>${version.arquillian}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -194,8 +188,7 @@
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-selenium-server</artifactId>
- <version>1.0.0.Final</version>
- <type>jar</type>
+ <version>${version.arquillian}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -223,7 +216,6 @@
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-embedded</artifactId>
<version>${tomee.version}</version>
- <type>jar</type>
<!--<classifier>uber</classifier>-->
<scope>test</scope>
</dependency>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml?rev=1362459&r1=1362458&r2=1362459&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml Tue Jul 17
12:05:34 2012
@@ -24,9 +24,7 @@
<groupId>org.apache.openejb</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>OpenEJB :: Arquillian Adaptors Parent :: Remote</name>
@@ -96,7 +94,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${version.openejb}</version>
+ <version>${openejb.version}</version>
<type>jar</type>
</dependency>
@@ -111,7 +109,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml?rev=1362459&r1=1362458&r2=1362459&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
Tue Jul 17 12:05:34 2012
@@ -25,7 +25,7 @@
<property name="httpPort">-1</property>
<property name="stopPort">-1</property>
<property name="ajpPort">-1</property>
- <property name="version">${version.tomee}</property>
+ <property name="version">${tomee.version}</property>
<property name="dir">target/apache-tomee-remote</property>
<property
name="appWorkingDir">target/arquillian-test-working-dir</property>
</configuration>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml?rev=1362459&r1=1362458&r2=1362459&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml Tue Jul 17
12:05:34 2012
@@ -18,7 +18,6 @@
<version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-tests</artifactId>
- <version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>OpenEJB :: Arquillian Adaptors Parent :: Tests</name>
@@ -40,7 +39,6 @@
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
<version>${project.version}</version>
- <type>jar</type>
</dependency>
<dependency>
@@ -61,14 +59,12 @@
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
<version>${commons-lang3.version}</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
@@ -172,7 +168,7 @@
<configuration>
<systemPropertyVariables>
<tomee.classifier>webprofile</tomee.classifier>
- <tomee.version>${project.version}</tomee.version>
+ <tomee.version>${tomee.version}</tomee.version>
</systemPropertyVariables>
<excludes>
<exclude>**/jaxrs/**</exclude>
@@ -191,7 +187,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
<classifier>webprofile</classifier>
<type>zip</type>
</dependency>
@@ -199,7 +195,6 @@
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${myfaces.version}</version>
- <scope>compile</scope>
</dependency>
</dependencies>
</profile>
@@ -214,7 +209,7 @@
<configuration>
<systemPropertyVariables>
<tomee.classifier>plus</tomee.classifier>
- <tomee.version>${project.version}</tomee.version>
+ <tomee.version>${tomee.version}</tomee.version>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -229,7 +224,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
<classifier>plus</classifier>
<type>zip</type>
</dependency>
@@ -237,7 +232,6 @@
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${myfaces.version}</version>
- <scope>compile</scope>
</dependency>
</dependencies>
</profile>
@@ -252,8 +246,8 @@
<configuration>
<systemPropertyVariables>
<tomee.artifactId>tomee-webapp</tomee.artifactId>
- <tomee.version>${openejb.version}</tomee.version>
- <tomee.tomcatVersion>7.0.27</tomee.tomcatVersion>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
</systemPropertyVariables>
<excludes>
<exclude>**/jaxrs/**</exclude>
@@ -272,7 +266,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webapp</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<type>war</type>
</dependency>
<dependency>
@@ -280,13 +274,11 @@
<artifactId>apache-tomcat</artifactId>
<version>${tomcat.bundle.version}</version>
<type>zip</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${myfaces.version}</version>
- <scope>compile</scope>
</dependency>
</dependencies>
</profile>
@@ -301,8 +293,8 @@
<configuration>
<systemPropertyVariables>
<tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
- <tomee.version>${openejb.version}</tomee.version>
- <tomee.tomcatVersion>7.0.27</tomee.tomcatVersion>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -317,7 +309,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-plus-webapp</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<type>war</type>
</dependency>
<dependency>
@@ -325,13 +317,11 @@
<artifactId>apache-tomcat</artifactId>
<version>${tomcat.bundle.version}</version>
<type>zip</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${myfaces.version}</version>
- <scope>compile</scope>
</dependency>
</dependencies>
</profile>
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1362459&r1=1362458&r2=1362459&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml Tue
Jul 17 12:05:34 2012
@@ -24,9 +24,7 @@
<groupId>org.apache.openejb</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-webapp-remote</artifactId>
- <version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>OpenEJB :: Arquillian Adaptors Parent :: Webapp Remote</name>
@@ -103,15 +101,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${version.openejb}</version>
- <type>jar</type>
+ <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
- <type>jar</type>
- <scope>compile</scope>
+ <version>${openejb.version}</version>
<exclusions>
<exclusion>
<artifactId>mbean-annotation-api</artifactId>
@@ -262,16 +257,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-common</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${version.tomee}</version>
- <type>jar</type>
- <scope>compile</scope>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.swizzle</groupId>
@@ -294,7 +285,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-common</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>${tomee.version}</version>
</dependency>
</dependencies>
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml?rev=1362459&r1=1362458&r2=1362459&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
Tue Jul 17 12:05:34 2012
@@ -29,7 +29,7 @@
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
<property name="tomcatVersion">7.0.27</property>
- <property name="version">${version.tomee}</property>
+ <property name="version">${tomee.version}</property>
<property name="dir">target/apache-tomee-remote</property>
<property
name="appWorkingDir">target/arquillian-test-working-dir</property>
</configuration>
Modified: openejb/trunk/openejb/arquillian/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/pom.xml?rev=1362459&r1=1362458&r2=1362459&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/pom.xml Tue Jul 17 12:05:34 2012
@@ -33,8 +33,6 @@
<properties>
<version.cdi-api>1.0</version.cdi-api>
- <version.openejb>${openejb.version}</version.openejb>
- <version.tomee>1.1.0-SNAPSHOT</version.tomee>
<version.arquillian>1.0.1.Final</version.arquillian>
<version.shrinkwrap.descriptor>2.0.0-alpha-3</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.0.1</version.shrinkwrap.shrinkwrap>
Modified: openejb/trunk/openejb/arquillian/ziplock/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/ziplock/pom.xml?rev=1362459&r1=1362458&r2=1362459&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/ziplock/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/ziplock/pom.xml Tue Jul 17 12:05:34 2012
@@ -24,9 +24,7 @@
<groupId>org.apache.openejb</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>OpenEJB :: Arquillian Adaptors Parent :: ZipLock</name>
@@ -41,13 +39,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-jee</artifactId>
- <version>${version.openejb}</version>
+ <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-1</version>
- <type>jar</type>
+ <version>${javaee-api.version}</version>
</dependency>
</dependencies>
