tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andygumbre...@apache.org
Subject [5/5] tomee git commit: Inline openejb.version with tomee.version Big pom.xml cleanup Many minor version updates
Date Wed, 23 Sep 2015 17:36:10 GMT
Inline openejb.version with tomee.version
Big pom.xml cleanup
Many minor version updates


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6f071cbe
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6f071cbe
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6f071cbe

Branch: refs/heads/master
Commit: 6f071cbeff4c1084a412598b8a88161620370b63
Parents: 638d32c
Author: andygumbrecht@apache.org <andy.is@gmx.de>
Authored: Wed Sep 23 19:35:34 2015 +0200
Committer: andygumbrecht@apache.org <andy.is@gmx.de>
Committed: Wed Sep 23 19:35:34 2015 +0200

----------------------------------------------------------------------
 arquillian/arquillian-common/pom.xml            |   5 +-
 arquillian/arquillian-openejb-embedded/pom.xml  |  20 +-
 .../pom.xml                                     |   4 +-
 arquillian/arquillian-tck/pom.xml               |   7 +-
 arquillian/arquillian-tomee-common/pom.xml      |  26 +-
 arquillian/arquillian-tomee-embedded/pom.xml    |  18 +-
 .../arquillian-tomee-moviefun-example/pom.xml   |  14 +-
 arquillian/arquillian-tomee-remote/pom.xml      |  16 +-
 .../arquillian-tomee-jaxrs-tests/pom.xml        |   6 +-
 .../arquillian-tomee-jaxws-tests/pom.xml        |   2 +-
 arquillian/arquillian-tomee-tests/pom.xml       |  64 +-
 .../arquillian-tomee-webapp-remote/pom.xml      |  36 +-
 arquillian/ziplock/pom.xml                      |   6 +-
 assembly/openejb-lite/pom.xml                   |  15 +-
 assembly/openejb-standalone/pom.xml             |  44 +-
 assembly/test/build.xml                         | 724 +++++++++----------
 container/openejb-api/pom.xml                   |   2 +-
 container/openejb-core/pom.xml                  |  33 +-
 .../org/apache/openejb/util/OpenEjbVersion.java | 177 ++---
 container/openejb-jee-accessors/pom.xml         |   6 +-
 container/openejb-jee/pom.xml                   |   2 +-
 container/openejb-junit/pom.xml                 |   2 +-
 examples/access-timeout-meta/pom.xml            |   4 +-
 examples/access-timeout/pom.xml                 |   4 +-
 examples/alternate-descriptors/pom.xml          |   4 +-
 examples/applet/pom.xml                         |   4 +-
 examples/application-composer/pom.xml           |   4 +-
 examples/applicationcomposer-jaxws-cdi/pom.xml  |   4 +-
 examples/applicationexception/pom.xml           |   6 +-
 examples/arquillian-jpa/pom.xml                 |   4 +-
 examples/async-methods/pom.xml                  |   4 +-
 examples/async-postconstruct/pom.xml            |   4 +-
 .../bean-validation-design-by-contract/pom.xml  |   9 +-
 examples/bval-evaluation-redeployment/pom.xml   |   4 +-
 .../cdi-alternative-and-stereotypes/pom.xml     |   4 +-
 examples/cdi-application-scope/pom.xml          |   4 +-
 examples/cdi-basic/pom.xml                      |   4 +-
 examples/cdi-ejbcontext-jaas/pom.xml            |   2 +-
 examples/cdi-events/pom.xml                     |   4 +-
 examples/cdi-interceptors/pom.xml               |   4 +-
 examples/cdi-produces-disposes/pom.xml          |   4 +-
 examples/cdi-produces-field/pom.xml             |   4 +-
 examples/cdi-realm/pom.xml                      |   2 +-
 examples/cdi-request-scope/pom.xml              |   4 +-
 examples/cdi-session-scope/pom.xml              |   4 +-
 examples/change-jaxws-url/pom.xml               |   9 +-
 examples/client-resource-lookup-preview/pom.xml |   4 +-
 examples/component-interfaces/pom.xml           |   6 +-
 examples/cucumber-jvm/pom.xml                   |   4 +-
 examples/custom-injection/pom.xml               |   4 +-
 examples/datasource-ciphered-password/pom.xml   |  14 +-
 examples/datasource-definition/pom.xml          |  11 +-
 examples/datasource-versioning/pom.xml          |   4 +-
 examples/decorators/pom.xml                     |   4 +-
 examples/deltaspike-configproperty/pom.xml      |   4 +-
 examples/deltaspike-exception-handling/pom.xml  |   4 +-
 examples/deltaspike-fullstack/pom.xml           |   6 +-
 examples/deltaspike-i18n/pom.xml                |   4 +-
 examples/dynamic-dao-implementation/pom.xml     |   4 +-
 examples/dynamic-datasource-routing/pom.xml     |  12 +-
 examples/dynamic-implementation/pom.xml         |   4 +-
 examples/dynamic-proxy-to-access-mbean/pom.xml  |   6 +-
 examples/ear-testing/business-logic/pom.xml     |   2 +-
 examples/ear-testing/pom.xml                    |   6 +-
 examples/ejb-examples/pom.xml                   |   6 +-
 examples/ejb-webservice/pom.xml                 |   6 +-
 examples/groovy-cdi/pom.xml                     |   4 +-
 examples/groovy-jpa/pom.xml                     |   4 +-
 examples/groovy-spock/pom.xml                   |   6 +-
 examples/helloworld-weblogic/pom.xml            |   4 +-
 examples/injection-of-connectionfactory/pom.xml |   4 +-
 examples/injection-of-datasource/pom.xml        |   4 +-
 examples/injection-of-ejbs/pom.xml              |   4 +-
 examples/injection-of-entitymanager/pom.xml     |   4 +-
 examples/injection-of-env-entry/pom.xml         |   4 +-
 examples/interceptors/pom.xml                   |   4 +-
 examples/javamail/pom.xml                       |   2 +-
 examples/jpa-eclipselink/pom.xml                |   4 +-
 examples/jpa-enumerated/pom.xml                 |   4 +-
 examples/jpa-hibernate/pom.xml                  |   4 +-
 examples/jsf-cdi-and-ejb/pom.xml                |   4 +-
 examples/jsf-managedBean-and-ejb/pom.xml        |   4 +-
 examples/lookup-of-ejbs-with-descriptor/pom.xml |   4 +-
 examples/lookup-of-ejbs/pom.xml                 |   4 +-
 examples/mbean-auto-registration/pom.xml        |  17 +-
 examples/moviefun-rest/pom.xml                  |   6 +-
 examples/moviefun/pom.xml                       |   6 +-
 examples/movies-complete-meta/pom.xml           |   4 +-
 examples/movies-complete/pom.xml                |   4 +-
 examples/mtom/pom.xml                           |   2 +-
 examples/multi-jpa-provider-testing/pom.xml     |  15 +-
 examples/multiple-arquillian-adapters/pom.xml   |  14 +-
 examples/multiple-tomee-arquillian/pom.xml      |   6 +-
 examples/myfaces-codi-demo/pom.xml              |   2 +-
 examples/persistence-fragment/pom.xml           |   4 +-
 examples/pojo-webservice/pom.xml                |   2 +-
 examples/polling-parent/polling-web/pom.xml     |   4 +-
 examples/polling-parent/pom.xml                 |   6 +-
 examples/projectstage-demo/pom.xml              |   2 +-
 examples/quartz-app/pom.xml                     |   6 +-
 examples/realm-in-tomee/pom.xml                 |   4 +-
 .../reload-persistence-unit-properties/pom.xml  |   4 +-
 examples/resources-declared-in-webapp/pom.xml   |   9 +-
 examples/resources-jmx-example/pom.xml          |   2 +-
 .../rest-applicationcomposer-mockito/pom.xml    |   4 +-
 examples/rest-applicationcomposer/pom.xml       |   4 +-
 examples/rest-cdi/pom.xml                       |   4 +-
 examples/rest-example-with-application/pom.xml  |   9 +-
 examples/rest-example/pom.xml                   |  81 ++-
 examples/rest-jaas/pom.xml                      |   2 +-
 examples/rest-on-ejb/pom.xml                    |  20 +-
 examples/rest-xml-json/pom.xml                  |   4 +-
 examples/scala-basic/pom.xml                    |   2 +-
 examples/schedule-events/pom.xml                |   4 +-
 examples/schedule-expression/pom.xml            |   4 +-
 examples/schedule-methods-meta/pom.xml          |   4 +-
 examples/schedule-methods/pom.xml               |   4 +-
 examples/server-events/pom.xml                  |   4 +-
 examples/simple-cdi-interceptor/pom.xml         |   4 +-
 examples/simple-cmp2/pom.xml                    |  21 +-
 examples/simple-mdb-and-cdi/pom.xml             |   4 +-
 examples/simple-mdb-with-descriptor/pom.xml     |   4 +-
 examples/simple-mdb/pom.xml                     |   4 +-
 examples/simple-rest/pom.xml                    |   4 +-
 examples/simple-singleton/pom.xml               |   4 +-
 examples/simple-stateful-callbacks/pom.xml      |   4 +-
 examples/simple-stateful/pom.xml                |   4 +-
 examples/simple-stateless-callbacks/pom.xml     |   4 +-
 .../simple-stateless-with-descriptor/pom.xml    |   4 +-
 examples/simple-stateless/pom.xml               |   4 +-
 .../simple-webservice-without-interface/pom.xml |   4 +-
 examples/simple-webservice/pom.xml              |   4 +-
 examples/spring-data-proxy-meta/pom.xml         |   4 +-
 examples/spring-data-proxy/pom.xml              |   4 +-
 examples/struts/pom.xml                         |   6 +-
 examples/telephone-stateful/pom.xml             |   4 +-
 examples/testcase-injection/pom.xml             |   4 +-
 examples/testing-security-2/pom.xml             |   6 +-
 examples/testing-security-3/pom.xml             |   6 +-
 examples/testing-security-4/pom.xml             |   6 +-
 examples/testing-security-meta/pom.xml          |   6 +-
 examples/testing-security/pom.xml               |   6 +-
 examples/testing-transactions-bmt/pom.xml       |   4 +-
 examples/testing-transactions/pom.xml           |   4 +-
 examples/tomee-jersey-eclipselink/pom.xml       |   2 +-
 examples/transaction-rollback/pom.xml           |   4 +-
 examples/troubleshooting/pom.xml                |   4 +-
 examples/webservice-attachments/pom.xml         |   4 +-
 examples/webservice-handlerchain/pom.xml        |   4 +-
 examples/webservice-holder/pom.xml              |   4 +-
 examples/webservice-inheritance/pom.xml         |   4 +-
 examples/webservice-security/pom.xml            |   4 +-
 examples/webservice-ws-security/pom.xml         |   6 +-
 .../webservice-ws-with-resources-config/pom.xml |   4 +-
 itests/failover-ejb/pom.xml                     |   9 +-
 itests/failover/pom.xml                         |  11 +-
 itests/legacy-server/pom.xml                    |   5 +-
 itests/openejb-itests-app/pom.xml               |  21 +-
 itests/openejb-itests-beans/pom.xml             |   7 +-
 itests/openejb-itests-client/pom.xml            |  13 +-
 itests/openejb-itests-interceptor-beans/pom.xml |   5 +-
 itests/openejb-itests-servlets/pom.xml          |  11 +-
 itests/openejb-itests-web/pom.xml               |   9 +-
 maven/maven-util/pom.xml                        |   3 +-
 maven/pom.xml                                   |   5 +-
 maven/tomee-embedded-maven-plugin/pom.xml       |   2 +-
 maven/tomee-maven-plugin/pom.xml                |   2 +-
 maven/tomee-webapp-archetype/pom.xml            |   2 +-
 .../main/resources/archetype-resources/pom.xml  | 302 ++++----
 pom.xml                                         | 271 +------
 server/openejb-activemq/pom.xml                 |   2 +-
 server/openejb-axis/pom.xml                     |   4 +-
 server/openejb-bonecp/pom.xml                   |   2 +-
 server/openejb-client/pom.xml                   |   9 +-
 server/openejb-common-cli/pom.xml               |   2 +-
 server/openejb-daemon/pom.xml                   |   2 +-
 server/openejb-derbynet/pom.xml                 |   6 +-
 server/openejb-ejbd/pom.xml                     |  24 +-
 server/openejb-hessian/pom.xml                  |   6 +-
 server/openejb-hsql/pom.xml                     |   6 +-
 server/openejb-http/pom.xml                     |  24 +-
 server/openejb-multicast/pom.xml                |   2 +-
 server/openejb-server/pom.xml                   |  10 +-
 server/openejb-webservices/pom.xml              |  10 +-
 server/pom.xml                                  |   6 +-
 tck/bval-embedded/pom.xml                       |   4 +-
 tck/bval-tomee/pom.xml                          |  12 +-
 tck/cdi-embedded/pom.xml                        |  22 +-
 tck/cdi-tomee-embedded/pom.xml                  |  10 +-
 tck/cdi-tomee/pom.xml                           |  36 +-
 tck/tck-common/pom.xml                          |   4 +-
 tomee/apache-tomee/pom.xml                      |  17 +-
 .../main/groovy/commands/SetupCommand.groovy    | 239 +++---
 tomee/pom.xml                                   |  36 +-
 tomee/tomee-catalina/pom.xml                    |  16 +-
 tomee/tomee-common/pom.xml                      |   4 +-
 tomee/tomee-deb/pom.xml                         |  16 +-
 tomee/tomee-embedded/pom.xml                    |  20 +-
 tomee/tomee-jaxrs/pom.xml                       |  18 +-
 tomee/tomee-jdbc/pom.xml                        |   2 +-
 tomee/tomee-loader/pom.xml                      |   6 +-
 tomee/tomee-mojarra/pom.xml                     |   2 +-
 tomee/tomee-myfaces/pom.xml                     |   5 +-
 tomee/tomee-overlay-runner/pom.xml              |   8 +-
 tomee/tomee-plume-webapp/pom.xml                |  32 +-
 tomee/tomee-plus-webapp/pom.xml                 |  30 +-
 tomee/tomee-util/pom.xml                        |   2 +-
 tomee/tomee-webaccess/pom.xml                   |  16 +-
 tomee/tomee-webapp/pom.xml                      |  56 +-
 tomee/tomee-webservices/pom.xml                 |  24 +-
 utils/log4j2-tomee/pom.xml                      |   2 +-
 utils/openejb-core-eclipselink/pom.xml          |   2 +-
 utils/openejb-core-hibernate/pom.xml            |   9 +-
 utils/openejb-mockito/pom.xml                   |   2 +-
 utils/webdeployer/pom.xml                       |  12 +-
 215 files changed, 1653 insertions(+), 1766 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/arquillian-common/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-common/pom.xml b/arquillian/arquillian-common/pom.xml
index 8dc100d..b21759f 100644
--- a/arquillian/arquillian-common/pom.xml
+++ b/arquillian/arquillian-common/pom.xml
@@ -19,6 +19,7 @@
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
@@ -32,9 +33,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>${openejb.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/arquillian-openejb-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-openejb-embedded/pom.xml b/arquillian/arquillian-openejb-embedded/pom.xml
index 1cc2da7..2133331 100644
--- a/arquillian/arquillian-openejb-embedded/pom.xml
+++ b/arquillian/arquillian-openejb-embedded/pom.xml
@@ -32,9 +32,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>${openejb.version}</version>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -118,15 +118,15 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-common</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-openejb-transaction-provider</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -150,16 +150,16 @@
     </dependency>
 
     <dependency> <!-- shouldn't be a compile/runtime dependency -->
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-http</artifactId>
-      <version>${openejb.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>${openejb.version}</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/arquillian-openejb-transaction-provider/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-openejb-transaction-provider/pom.xml b/arquillian/arquillian-openejb-transaction-provider/pom.xml
index 6ee23f3..4d35556 100644
--- a/arquillian/arquillian-openejb-transaction-provider/pom.xml
+++ b/arquillian/arquillian-openejb-transaction-provider/pom.xml
@@ -31,9 +31,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>${openejb.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/arquillian-tck/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tck/pom.xml b/arquillian/arquillian-tck/pom.xml
index bd34df1..9109a2a 100644
--- a/arquillian/arquillian-tck/pom.xml
+++ b/arquillian/arquillian-tck/pom.xml
@@ -19,12 +19,13 @@
 <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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>arquillian-tck</artifactId>
   <name>OpenEJB :: Arquillian Adaptors Parent :: Arquillian TCK</name>
@@ -61,9 +62,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/arquillian-tomee-common/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
index 84f04a1..1f06951 100644
--- a/arquillian/arquillian-tomee-common/pom.xml
+++ b/arquillian/arquillian-tomee-common/pom.xml
@@ -37,7 +37,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-common</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -61,16 +61,16 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>javaee-api</artifactId>
       <version>${javaee-api.version}</version>
       <type>jar</type>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>tomee-util</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -85,22 +85,22 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-jee</artifactId>
-      <version>${openejb.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>${openejb.version}</version>
+      <version>${project.version}</version>
       <type>jar</type>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
           <artifactId>mbean-annotation-api</artifactId>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
           <artifactId>commons-lang3</artifactId>
@@ -108,19 +108,19 @@
         </exclusion>
         <exclusion>
           <artifactId>javaee-api-embedded</artifactId>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-api</artifactId>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-javaagent</artifactId>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-jee</artifactId>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
           <artifactId>commons-cli</artifactId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/arquillian-tomee-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-embedded/pom.xml b/arquillian/arquillian-tomee-embedded/pom.xml
index 18bd5a2..abf155c 100644
--- a/arquillian/arquillian-tomee-embedded/pom.xml
+++ b/arquillian/arquillian-tomee-embedded/pom.xml
@@ -32,13 +32,13 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>tomee-embedded</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-openejb-transaction-provider</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -113,27 +113,27 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-tomee-common</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>tomee-webservices</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-common</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/arquillian-tomee-moviefun-example/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-moviefun-example/pom.xml b/arquillian/arquillian-tomee-moviefun-example/pom.xml
index 489eed6..0834f09 100644
--- a/arquillian/arquillian-tomee-moviefun-example/pom.xml
+++ b/arquillian/arquillian-tomee-moviefun-example/pom.xml
@@ -104,7 +104,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>javaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -249,9 +249,9 @@
       <artifactId>log4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>tomee-embedded</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
       <!--<classifier>uber</classifier>-->
       <scope>test</scope>
     </dependency>
@@ -284,9 +284,9 @@
       </activation>
       <dependencies>
         <dependency>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>arquillian-tomee-embedded</artifactId>
-          <version>${tomee.version}</version>
+          <version>${project.version}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>
@@ -295,9 +295,9 @@
       <id>arquillian-tomee-remote</id>
       <dependencies>
         <dependency>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>arquillian-tomee-remote</artifactId>
-          <version>${tomee.version}</version>
+          <version>${project.version}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/arquillian-tomee-remote/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-remote/pom.xml b/arquillian/arquillian-tomee-remote/pom.xml
index f6f6522..b2345b8 100644
--- a/arquillian/arquillian-tomee-remote/pom.xml
+++ b/arquillian/arquillian-tomee-remote/pom.xml
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-openejb-transaction-provider</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -89,7 +89,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>apache-tomee</artifactId>
       <type>zip</type>
       <version>7.0.0-SNAPSHOT</version>
@@ -112,14 +112,14 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-client</artifactId>
-      <version>${openejb.version}</version>
+      <version>${project.version}</version>
       <type>jar</type>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-tomee-common</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <type>jar</type>
@@ -127,9 +127,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>tomee-common</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
@@ -146,7 +146,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-common</artifactId>
       <version>7.0.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
index 028145f..df51e36 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
@@ -31,15 +31,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>tomee-jaxrs</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>tomee-webapp</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
       <type>war</type>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
index e89430f..6725a51 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>tomee-webservices</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/arquillian-tomee-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index 218bfd3..561ed95 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -33,7 +33,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
 
@@ -58,7 +58,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>ziplock</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -114,16 +114,16 @@
       <version>${project.version}</version>
     </dependency>
     <dependency> <!-- tomee-embedded needs it + dependencies but tomee-*-remote doesn't need dependencies so to avoid conflicts bringing it back here -->
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
     </dependency>
 
     <!-- just to get it in the correct order -->
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>apache-tomee</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
       <classifier>webprofile</classifier>
       <type>zip</type>
     </dependency>
@@ -158,7 +158,7 @@
                 <configuration>
                   <skip>${maven.test.skip}</skip>
                   <systemPropertyVariables>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <arquillian.launch>tomee-embedded</arquillian.launch>
                     <openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
                   </systemPropertyVariables>
@@ -255,7 +255,7 @@
                 <configuration>
                   <skip>${skip.embedded}</skip>
                   <systemPropertyVariables>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <arquillian.launch>tomee-embedded</arquillian.launch>
                     <openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
                   </systemPropertyVariables>
@@ -271,7 +271,7 @@
                   <skip>${skip.remote.webprofile}</skip>
                   <systemPropertyVariables>
                     <openejb.arquillian.debug>true</openejb.arquillian.debug>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <tomee.classifier>webprofile</tomee.classifier>
                     <arquillian.launch>tomee-remote</arquillian.launch>
                     <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
@@ -288,7 +288,7 @@
                   <skip>${skip.remote.plume}</skip>
                   <systemPropertyVariables>
                     <openejb.arquillian.debug>true</openejb.arquillian.debug>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <tomee.classifier>plume</tomee.classifier>
                     <arquillian.launch>tomee-remote</arquillian.launch>
                     <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
@@ -308,7 +308,7 @@
                   <skip>${skip.remote.plus}</skip>
                   <systemPropertyVariables>
                     <openejb.arquillian.debug>true</openejb.arquillian.debug>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <tomee.classifier>plus</tomee.classifier>
                     <arquillian.launch>tomee-remote</arquillian.launch>
                     <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
@@ -324,7 +324,7 @@
                 <configuration>
                   <skip>${skip.webapp.webprofile}</skip>
                   <systemPropertyVariables>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
                     <tomee.artifactId>tomee-webapp</tomee.artifactId>
                     <arquillian.launch>tomee-webapp</arquillian.launch>
@@ -341,7 +341,7 @@
                 <configuration>
                   <skip>${skip.webapp.plus}</skip>
                   <systemPropertyVariables>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
                     <tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
                     <arquillian.launch>tomee-webapp</arquillian.launch>
@@ -358,7 +358,7 @@
                 <configuration>
                   <skip>${skip.webapp.plume}</skip>
                   <systemPropertyVariables>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
                     <tomee.artifactId>tomee-plume-webapp</tomee.artifactId>
                     <arquillian.launch>tomee-webapp</arquillian.launch>
@@ -404,43 +404,43 @@
 
         <!-- just to get it in the correct order -->
         <dependency>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>apache-tomee</artifactId>
-          <version>${tomee.version}</version>
+          <version>${project.version}</version>
           <classifier>webprofile</classifier>
           <type>zip</type>
         </dependency>
         <dependency>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>apache-tomee</artifactId>
-          <version>${tomee.version}</version>
+          <version>${project.version}</version>
           <classifier>plus</classifier>
           <type>zip</type>
         </dependency>
         <dependency>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>apache-tomee</artifactId>
-          <version>${tomee.version}</version>
+          <version>${project.version}</version>
           <classifier>plume</classifier>
           <type>zip</type>
         </dependency>
 
         <dependency>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>tomee-webapp</artifactId>
-          <version>${tomee.version}</version>
+          <version>${project.version}</version>
           <type>war</type>
         </dependency>
         <dependency>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>tomee-plus-webapp</artifactId>
-          <version>${tomee.version}</version>
+          <version>${project.version}</version>
           <type>war</type>
         </dependency>
         <dependency>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>tomee-plume-webapp</artifactId>
-          <version>${tomee.version}</version>
+          <version>${project.version}</version>
           <type>war</type>
         </dependency>
         <dependency>
@@ -466,7 +466,7 @@
                 <configuration>
                   <skip>${maven.test.skip}</skip>
                   <systemPropertyVariables>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <arquillian.launch>tomee-embedded</arquillian.launch>
                     <openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
                   </systemPropertyVariables>
@@ -485,7 +485,7 @@
                   <skip>${maven.test.skip}</skip>
                   <systemPropertyVariables>
                     <openejb.arquillian.debug>true</openejb.arquillian.debug>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <tomee.classifier>webprofile</tomee.classifier>
                     <arquillian.launch>tomee-remote</arquillian.launch>
                     <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
@@ -502,7 +502,7 @@
                   <skip>${maven.test.skip}</skip>
                   <systemPropertyVariables>
                     <openejb.arquillian.debug>true</openejb.arquillian.debug>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <tomee.classifier>plus</tomee.classifier>
                     <arquillian.launch>tomee-remote</arquillian.launch>
                     <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
@@ -519,7 +519,7 @@
                   <skip>${maven.test.skip}</skip>
                   <systemPropertyVariables>
                     <openejb.arquillian.debug>true</openejb.arquillian.debug>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <tomee.classifier>plume</tomee.classifier>
                     <arquillian.launch>tomee-remote</arquillian.launch>
                     <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
@@ -541,7 +541,7 @@
                 <configuration>
                   <skip>${maven.test.skip}</skip>
                   <systemPropertyVariables>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
                     <tomee.artifactId>tomee-webapp</tomee.artifactId>
                     <arquillian.launch>tomee-webapp</arquillian.launch>
@@ -558,7 +558,7 @@
                 <configuration>
                   <skip>${maven.test.skip}</skip>
                   <systemPropertyVariables>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
                     <tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
                     <arquillian.launch>tomee-webapp</arquillian.launch>
@@ -575,7 +575,7 @@
                 <configuration>
                   <skip>${maven.test.skip}</skip>
                   <systemPropertyVariables>
-                    <tomee.version>${tomee.version}</tomee.version>
+                    <tomee.version>${project.version}</tomee.version>
                     <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
                     <tomee.artifactId>tomee-plume-webapp</tomee.artifactId>
                     <arquillian.launch>tomee-webapp</arquillian.launch>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/arquillian-tomee-webapp-remote/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml
index 736c21f..3af15e5 100644
--- a/arquillian/arquillian-tomee-webapp-remote/pom.xml
+++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-openejb-transaction-provider</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -108,18 +108,18 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-client</artifactId>
-      <version>${openejb.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>${openejb.version}</version>
+      <version>${project.version}</version>
       <exclusions>
         <exclusion>
           <artifactId>mbean-annotation-api</artifactId>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
           <artifactId>commons-lang3</artifactId>
@@ -127,19 +127,19 @@
         </exclusion>
         <exclusion>
           <artifactId>javaee-api-embedded</artifactId>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-api</artifactId>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-javaagent</artifactId>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-jee</artifactId>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
           <artifactId>commons-cli</artifactId>
@@ -251,7 +251,7 @@
         </exclusion>
         <exclusion>
           <artifactId>javaee-api</artifactId>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-bval</artifactId>
@@ -259,19 +259,19 @@
         </exclusion>
         <exclusion>
           <artifactId>mbean-annotation-api</artifactId>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-tomee-common</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>tomee-common</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.swizzle</groupId>
@@ -291,9 +291,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-common</artifactId>
-      <version>${tomee.version}</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/arquillian/ziplock/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/ziplock/pom.xml b/arquillian/ziplock/pom.xml
index 18cb8f8..42f355d 100644
--- a/arquillian/ziplock/pom.xml
+++ b/arquillian/ziplock/pom.xml
@@ -44,12 +44,12 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-jee</artifactId>
-      <version>${openejb.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>javaee-api</artifactId>
       <version>${javaee-api.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/assembly/openejb-lite/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/openejb-lite/pom.xml b/assembly/openejb-lite/pom.xml
index 801dada..0546b43 100644
--- a/assembly/openejb-lite/pom.xml
+++ b/assembly/openejb-lite/pom.xml
@@ -19,16 +19,21 @@
 
 <!-- $Rev$ $Date$ -->
 
-<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">
+<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>
+
   <parent>
     <artifactId>assembly</artifactId>
     <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+
   <artifactId>openejb-lite</artifactId>
   <packaging>jar</packaging>
   <name>OpenEJB :: Assembly :: All In One EJB Lite jar</name>
+
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
@@ -66,14 +71,14 @@
       </plugin>
     </plugins>
   </build>
+
   <dependencies>
     <dependency>
-
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
       <exclusions>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/assembly/openejb-standalone/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/openejb-standalone/pom.xml b/assembly/openejb-standalone/pom.xml
index 427dec2..a986480 100644
--- a/assembly/openejb-standalone/pom.xml
+++ b/assembly/openejb-standalone/pom.xml
@@ -20,15 +20,19 @@
 <!-- $Rev$ $Date$ -->
 
 <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>
+  
   <parent>
     <artifactId>assembly</artifactId>
     <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+  
   <artifactId>openejb-standalone</artifactId>
   <packaging>pom</packaging>
   <name>OpenEJB :: Assembly :: Standalone</name>
+  
   <build>
     <resources>
       <resource>
@@ -118,17 +122,17 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
@@ -136,50 +140,50 @@
       <artifactId>geronimo-javamail_1.4_mail</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-ejbd</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-multicast</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-hsql</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-http</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-daemon</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
@@ -190,13 +194,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-itests-client</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>openejb-itests-beans</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -211,12 +215,12 @@
       </properties>
       <dependencies>
         <dependency>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>openejb-itests-client</artifactId>
           <version>${project.version}</version>
         </dependency>
         <dependency>
-          <groupId>org.apache.tomee</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>openejb-itests-beans</artifactId>
           <version>${project.version}</version>
         </dependency>
@@ -243,7 +247,7 @@
                     <property name="targetDir" value="${basedir}/target/" />
                     <property name="openejb.home" value="${targetDir}/openejb-${project.version}" />
                     <property name="openejb.dist" value="${targetDir}/openejb-${project.version}-bin.zip" />
-                    <property name="openejb.version" value="${project.version}" />
+                    <property name="tomee.version" value="${project.version}" />
 
                     <unjar src="${openejb.dist}" dest="${targetDir}" />
                     <copy file="${targetDir}/openejb-${project.version}-test.jar" todir="${openejb.home}/apps" />
@@ -260,13 +264,13 @@
                       <arg value="local" />
                     </java>
 
-                    <java jar="target/openejb-${openejb.version}-test.jar" fork="yes">
+                    <java jar="target/openejb-{project.version}-test.jar" fork="yes">
                       <sysproperty key="openejb.home" value="${openejb.home}" />
                       <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${openejb.debug.suspend},address=${openejb.debug.port}" />
                       <arg value="remote" />
                     </java>
 
-                    <java jar="target/openejb-${openejb.version}-test.jar" fork="yes">
+                    <java jar="target/openejb-{project.version}-test.jar" fork="yes">
                       <sysproperty key="openejb.home" value="${openejb.home}" />
                       <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${openejb.debug.suspend},address=${openejb.debug.port}" />
                       <arg value="http" />

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/assembly/test/build.xml
----------------------------------------------------------------------
diff --git a/assembly/test/build.xml b/assembly/test/build.xml
index 916e41c..aeba50b 100644
--- a/assembly/test/build.xml
+++ b/assembly/test/build.xml
@@ -1,362 +1,362 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!-- $Revision: 579817 $ $Date: 2007-09-26 14:56:30 -0700 (Wed, 26 Sep 2007) $ -->
-
-<project name="Test OpenEJB" default="test" basedir=".">
-    <description>
-        Tests OpenEJB distribution using the OpenEJB iTest suite.
-    </description>
-
-    <property name="openejb.version" value="4.0.0-beta-1"/>
-    <property name="repo" location="${basedir}/repo"/>
-    <property name="maven.repo" value="file:${user.home}/.m2/repository"/>
-    <property name="target.dir" location="${basedir}/target"/>
-    <property name="windows.sleep" value="5"/>
-    <property name="unix.sleep" value="1"/>
-
-
-    <target name="clean">
-        <delete dir="${basedir}/activemq-data"/>
-        <delete dir="${target.dir}"/>
-    </target>
-
-    <target name="test">
-        <antcall target="openejb.test"/>
-        <antcall target="test:tomcat6"/>
-        <antcall target="test:tomcat55"/>
-    </target>
-
-    <target name="test:all">
-        <antcall target="openejb.test"/>
-        <antcall target="test:tomcat6:all"/>
-        <antcall target="test:tomcat55:all"/>
-    </target>
-
-    <target name="test:tomcat6">
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="6.0.14"/>
-        </antcall>
-    </target>
-
-    <target name="test:tomcat6:all">
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="6.0.14"/>
-        </antcall>
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="6.0.13"/>
-        </antcall>
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="6.0.10"/>
-        </antcall>
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="6.0.9"/>
-        </antcall>
-    </target>
-
-    <target name="test:tomcat55">
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="5.5.26"/>
-        </antcall>
-    </target>
-
-    <target name="test:tomcat55:all">
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="5.5.26"/>
-        </antcall>
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="5.5.25"/>
-        </antcall>
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="5.5.23"/>
-        </antcall>
-        <antcall target="tomcat.test">
-            <param name="tomcat.version" value="5.5.20"/>
-        </antcall>
-    </target>
-
-    <target name="openejb.test" depends="openejb.test.setup">
-        <!-- unpack openejb -->
-        <antcall target="openejb.unpack"/>
-
-        <!-- copy openejb-itests-app.jar to apps dir -->
-        <copy file="${itests.app.file}" todir="${openejb.home}/apps"/>
-
-        <!-- start openejb -->
-        <antcall target="openejb.start"/>
-
-        <!-- run itests -->
-        <antcall target="itests.openejb.run"/>
-
-        <!-- stop openejb -->
-        <antcall target="openejb.stop"/>
-    </target>
-
-    <target name="openejb.unpack">
-        <delete dir="${openejb.home}"/>
-        <mkdir dir="${target.dir}"/>
-        <unjar src="${openejb.app.file}" dest="${target.dir}"/>
-        <chmod perm="u+x">
-            <fileset dir="${openejb.home}/bin">
-                <include name="openejb"/>
-                <include name="**/*.sh"/>
-            </fileset>
-        </chmod>
-    </target>
-
-    <target name="openejb.start">
-        <echo message="Starting OpenEJB ${openejb.version}..."/>
-        <exec executable="${openejb.home}/bin/openejb.bat" spawn="true" osfamily="windows">
-            <env key="OPENEJB_HOME" value="${openejb.home}"/>
-            <arg value="start"/>
-        </exec>
-        <exec executable="${openejb.home}/bin/openejb" spawn="true" osfamily="unix">
-            <arg value="start"/>
-        </exec>
-        <waitfor maxwait="1" maxwaitunit="minute">
-            <and>
-                <socket server="localhost" port="4200"/>
-                <socket server="localhost" port="4201"/>
-                <socket server="localhost" port="4202"/>
-                <socket server="localhost" port="4204"/>
-                <socket server="localhost" port="61616"/>
-            </and>
-        </waitfor>
-        <echo message="                 started"/>
-    </target>
-
-    <target name="openejb.stop">
-        <echo message="Stopping OpenEJB ${openejb.version}..."/>
-        <exec executable="${openejb.home}/bin/openejb.bat" osfamily="windows">
-            <env key="OPENEJB_HOME" value="${openejb.home}"/>
-            <arg value="stop"/>
-        </exec>
-        <exec executable="${openejb.home}/bin/openejb" osfamily="unix">
-            <arg value="stop"/>
-        </exec>
-        <waitfor maxwait="1" maxwaitunit="minute">
-            <not>
-                <or>
-                    <socket server="localhost" port="4200"/>
-                    <socket server="localhost" port="4201"/>
-                    <socket server="localhost" port="4202"/>
-                    <socket server="localhost" port="4204"/>
-                    <socket server="localhost" port="61616"/>
-                </or>
-            </not>
-        </waitfor>
-
-        <condition property="sleep" value="${unix.sleep}" else="${windows.sleep}">
-            <os family="unix"/>
-        </condition>
-        <echo message="                  sleeping for ${sleep} sec"/>
-        <sleep seconds="${sleep}"/>
-
-        <echo message="                  stopped"/>
-    </target>
-
-
-    <target name="tomcat.test" depends="tomcat.test.setup">
-        <!-- unpack tomcat -->
-        <antcall target="tomcat.unpack"/>
-
-        <!-- copy openejb.war to webapps dir -->
-        <copy file="${openejb.war.file}" todir="${tomcat.home}/webapps"/>
-
-        <!-- install itests.war -->
-        <copy file="${itests.war.file}" todir="${tomcat.home}/webapps"/>
-
-        <!-- start tomcat -->
-        <antcall target="tomcat.start"/>
-
-        <!-- run itests (Servlet started mode) -->
-        <antcall target="itests.tomcat.run"/>
-
-        <!-- run installer -->
-        <get src="http://localhost:8080/openejb/installer?action=Install" dest="${target.dir}/installer.out"/>
-
-        <!-- stop tomcat -->
-        <antcall target="tomcat.stop"/>
-
-        <!-- run itests (Listener started mode) -->
-        <antcall target="tomcat.start"/>
-
-        <!-- run itests -->
-        <antcall target="itests.tomcat.run"/>
-
-        <!-- stop tomcat -->
-        <antcall target="tomcat.stop"/>
-
-        <!-- Make sure all resources are collected on windows -->
-        <condition property="sleep" value="1" else="30">
-            <os family="unix"/>
-        </condition>
-        <echo message="Sleeping for ${sleep} sec to avoid Windows failures"/>
-        <sleep seconds="${sleep}"/>
-    </target>
-
-    <target name="tomcat.unpack">
-        <delete dir="${tomcat.home}"/>
-        <mkdir dir="${target.dir}"/>
-        <unjar src="${tomcat.file}" dest="${target.dir}"/>
-        <chmod dir="${tomcat.home}/bin" perm="u+x" includes="**/*.sh"/>
-    </target>
-
-    <target name="tomcat.start">
-        <echo message="Starting Tomcat ${tomcat.version}..."/>
-        <exec executable="${tomcat.home}/bin/startup.bat" spawn="true" osfamily="windows">
-            <env key="CATALINA_HOME" value="${tomcat.home}"/>
-        </exec>
-        <exec executable="${tomcat.home}/bin/startup.sh" osfamily="unix"/>
-        <waitfor maxwait="1" maxwaitunit="minute">
-            <and>
-                <socket server="localhost" port="8080"/>
-                <socket server="localhost" port="8005"/>
-                <socket server="localhost" port="8009"/>
-                <http url="http://localhost:8080/openejb/installer"/>
-            </and>
-        </waitfor>
-
-        <condition property="sleep" value="${unix.sleep}" else="${windows.sleep}">
-            <os family="unix"/>
-        </condition>
-        <echo message="                  sleeping for ${sleep} sec"/>
-        <sleep seconds="${sleep}"/>
-
-        <echo message="                  started"/>
-    </target>
-
-    <target name="tomcat.stop">
-        <echo message="Stopping Tomcat ${tomcat.version}..."/>
-        <exec executable="${tomcat.home}/bin/shutdown.bat" osfamily="windows">
-            <env key="CATALINA_HOME" value="${tomcat.home}"/>
-        </exec>
-        <exec executable="${tomcat.home}/bin/shutdown.sh" osfamily="unix"/>
-        <waitfor maxwait="1" maxwaitunit="minute">
-            <not>
-                <or>
-                    <http url="http://localhost:8080"/>
-                    <socket server="localhost" port="8080"/>
-                    <socket server="localhost" port="8005"/>
-                    <socket server="localhost" port="8009"/>
-                    <socket server="localhost" port="61616"/>
-                </or>
-            </not>
-        </waitfor>
-
-        <condition property="sleep" value="${unix.sleep}" else="${windows.sleep}">
-            <os family="unix"/>
-        </condition>
-        <echo message="                  sleeping for ${sleep} sec"/>
-        <sleep seconds="${sleep}"/>
-
-        <echo message="                  stopped"/>
-    </target>
-
-    <target name="itests.openejb.run">
-        <java jar="${itests.client.file}" fork="yes">
-            <sysproperty key="openejb.home" value="${openejb.home}"/>
-            <arg value="remote"/>
-        </java>
-    </target>
-
-    <target name="itests.tomcat.run">
-        <java jar="${itests.client.file}" fork="yes">
-            <sysproperty key="openejb.home" value="${openejb.home}"/>
-            <arg value="tomcat"/>
-        </java>
-    </target>
-
-    <target name="openejb.test.setup">
-        <property name="openejb.app.url" value="${maven.repo}/org/apache/openejb/openejb-standalone/${openejb.version}/openejb-standalone-${openejb.version}.zip"/>
-        <property name="openejb.app.file" value="${repo}/openejb/distributions/${openejb.version}/openejb.zip"/>
-
-        <property name="itests.app.url" value="${maven.repo}/org/apache/openejb/openejb-itests-app/${openejb.version}/openejb-itests-app-${openejb.version}.jar"/>
-        <property name="itests.app.file" value="${repo}/openejb/distributions/${openejb.version}/openejb-itests-app.jar"/>
-
-        <property name="itests.client.url" value="${maven.repo}/org/apache/openejb/openejb-itests-standalone-client/${openejb.version}/openejb-itests-standalone-client-${openejb.version}.jar"/>
-        <property name="itests.client.file" value="${repo}/openejb/distributions/${openejb.version}/openejb-itests-standalone-client.jar"/>
-
-        <property name="openejb.home" value="${target.dir}/openejb-${openejb.version}"/>
-
-        <antcall target="download.file">
-            <param name="download.url" value="${openejb.app.url}"/>
-            <param name="download.file" value="${openejb.app.file}"/>
-        </antcall>
-        <antcall target="download.file">
-            <param name="download.url" value="${itests.app.url}"/>
-            <param name="download.file" value="${itests.app.file}"/>
-        </antcall>
-        <antcall target="download.file">
-            <param name="download.url" value="${itests.client.url}"/>
-            <param name="download.file" value="${itests.client.file}"/>
-        </antcall>
-    </target>
-
-    <target name="tomcat.test.setup">
-        <property name="openejb.war.url" value="${maven.repo}/org/apache/openejb/openejb-tomcat-webapp/${openejb.version}/openejb-tomcat-webapp-${openejb.version}.war"/>
-        <property name="openejb.war.file" value="${repo}/openejb/distributions/${openejb.version}/openejb.war"/>
-
-        <property name="itests.war.url" value="${maven.repo}/org/apache/openejb/openejb-itests-web/${openejb.version}/openejb-itests-web-${openejb.version}.war"/>
-        <property name="itests.war.file" value="${repo}/openejb/distributions/${openejb.version}/itests.war"/>
-
-        <property name="itests.client.url" value="${maven.repo}/org/apache/openejb/openejb-itests-standalone-client/${openejb.version}/openejb-itests-standalone-client-${openejb.version}.jar"/>
-        <property name="itests.client.file" value="${repo}/openejb/distributions/${openejb.version}/openejb-itests-standalone-client.jar"/>
-
-        <condition property="tomcat.url" value="http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip">
-            <matches pattern="^7\." string="${tomcat.version}"/>
-        </condition>
-        <condition property="tomcat.url" value="http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip">
-            <matches pattern="^6\." string="${tomcat.version}"/>
-        </condition>
-        <condition property="tomcat.url" value="http://archive.apache.org/dist/tomcat/tomcat-5/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip">
-            <matches pattern="^5\.5" string="${tomcat.version}"/>
-        </condition>
-        <fail message="Unknown Tomcat version ${tomcat.version}" unless="tomcat.url"/>
-        <property name="tomcat.file" value="${repo}/tomcat/distributions/${tomcat.version}/tomcat.zip"/>
-
-        <property name="tomcat.home" value="${target.dir}/apache-tomcat-${tomcat.version}"/>
-
-        <antcall target="download.file">
-            <param name="download.url" value="${tomcat.url}"/>
-            <param name="download.file" value="${tomcat.file}"/>
-        </antcall>
-        <antcall target="download.file">
-            <param name="download.url" value="${openejb.war.url}"/>
-            <param name="download.file" value="${openejb.war.file}"/>
-        </antcall>
-        <antcall target="download.file">
-            <param name="download.url" value="${itests.war.url}"/>
-            <param name="download.file" value="${itests.war.file}"/>
-        </antcall>
-        <antcall target="download.file">
-            <param name="download.url" value="${itests.client.url}"/>
-            <param name="download.file" value="${itests.client.file}"/>
-        </antcall>
-    </target>
-
-    <target name="download.uptodate">
-        <available file="${download.file}" property="download.uptodate"/>
-    </target>
-
-    <target name="download.file" depends="download.uptodate" unless="download.uptodate">
-        <dirname property="download.dir" file="${download.file}"/>
-        <mkdir dir="${download.dir}"/>
-        <get src="${download.url}" dest="${download.file}"/>
-    </target>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<!-- $Revision: 579817 $ $Date: 2007-09-26 14:56:30 -0700 (Wed, 26 Sep 2007) $ -->
+
+<project name="Test OpenEJB" default="test" basedir=".">
+    <description>
+        Tests OpenEJB distribution using the OpenEJB iTest suite.
+    </description>
+
+    <property name="tomee.version" value="1.7.2"/>
+    <property name="repo" location="${basedir}/repo"/>
+    <property name="maven.repo" value="file:${user.home}/.m2/repository"/>
+    <property name="target.dir" location="${basedir}/target"/>
+    <property name="windows.sleep" value="5"/>
+    <property name="unix.sleep" value="1"/>
+
+
+    <target name="clean">
+        <delete dir="${basedir}/activemq-data"/>
+        <delete dir="${target.dir}"/>
+    </target>
+
+    <target name="test">
+        <antcall target="openejb.test"/>
+        <antcall target="test:tomcat6"/>
+        <antcall target="test:tomcat55"/>
+    </target>
+
+    <target name="test:all">
+        <antcall target="openejb.test"/>
+        <antcall target="test:tomcat6:all"/>
+        <antcall target="test:tomcat55:all"/>
+    </target>
+
+    <target name="test:tomcat6">
+        <antcall target="tomcat.test">
+            <param name="tomcat.version" value="6.0.14"/>
+        </antcall>
+    </target>
+
+    <target name="test:tomcat6:all">
+        <antcall target="tomcat.test">
+            <param name="tomcat.version" value="6.0.14"/>
+        </antcall>
+        <antcall target="tomcat.test">
+            <param name="tomcat.version" value="6.0.13"/>
+        </antcall>
+        <antcall target="tomcat.test">
+            <param name="tomcat.version" value="6.0.10"/>
+        </antcall>
+        <antcall target="tomcat.test">
+            <param name="tomcat.version" value="6.0.9"/>
+        </antcall>
+    </target>
+
+    <target name="test:tomcat55">
+        <antcall target="tomcat.test">
+            <param name="tomcat.version" value="5.5.26"/>
+        </antcall>
+    </target>
+
+    <target name="test:tomcat55:all">
+        <antcall target="tomcat.test">
+            <param name="tomcat.version" value="5.5.26"/>
+        </antcall>
+        <antcall target="tomcat.test">
+            <param name="tomcat.version" value="5.5.25"/>
+        </antcall>
+        <antcall target="tomcat.test">
+            <param name="tomcat.version" value="5.5.23"/>
+        </antcall>
+        <antcall target="tomcat.test">
+            <param name="tomcat.version" value="5.5.20"/>
+        </antcall>
+    </target>
+
+    <target name="openejb.test" depends="openejb.test.setup">
+        <!-- unpack openejb -->
+        <antcall target="openejb.unpack"/>
+
+        <!-- copy openejb-itests-app.jar to apps dir -->
+        <copy file="${itests.app.file}" todir="${openejb.home}/apps"/>
+
+        <!-- start openejb -->
+        <antcall target="openejb.start"/>
+
+        <!-- run itests -->
+        <antcall target="itests.openejb.run"/>
+
+        <!-- stop openejb -->
+        <antcall target="openejb.stop"/>
+    </target>
+
+    <target name="openejb.unpack">
+        <delete dir="${openejb.home}"/>
+        <mkdir dir="${target.dir}"/>
+        <unjar src="${openejb.app.file}" dest="${target.dir}"/>
+        <chmod perm="u+x">
+            <fileset dir="${openejb.home}/bin">
+                <include name="openejb"/>
+                <include name="**/*.sh"/>
+            </fileset>
+        </chmod>
+    </target>
+
+    <target name="openejb.start">
+        <echo message="Starting OpenEJB ${tomee.version}..."/>
+        <exec executable="${openejb.home}/bin/openejb.bat" spawn="true" osfamily="windows">
+            <env key="OPENEJB_HOME" value="${openejb.home}"/>
+            <arg value="start"/>
+        </exec>
+        <exec executable="${openejb.home}/bin/openejb" spawn="true" osfamily="unix">
+            <arg value="start"/>
+        </exec>
+        <waitfor maxwait="1" maxwaitunit="minute">
+            <and>
+                <socket server="localhost" port="4200"/>
+                <socket server="localhost" port="4201"/>
+                <socket server="localhost" port="4202"/>
+                <socket server="localhost" port="4204"/>
+                <socket server="localhost" port="61616"/>
+            </and>
+        </waitfor>
+        <echo message="                 started"/>
+    </target>
+
+    <target name="openejb.stop">
+        <echo message="Stopping OpenEJB ${tomee.version}..."/>
+        <exec executable="${openejb.home}/bin/openejb.bat" osfamily="windows">
+            <env key="OPENEJB_HOME" value="${openejb.home}"/>
+            <arg value="stop"/>
+        </exec>
+        <exec executable="${openejb.home}/bin/openejb" osfamily="unix">
+            <arg value="stop"/>
+        </exec>
+        <waitfor maxwait="1" maxwaitunit="minute">
+            <not>
+                <or>
+                    <socket server="localhost" port="4200"/>
+                    <socket server="localhost" port="4201"/>
+                    <socket server="localhost" port="4202"/>
+                    <socket server="localhost" port="4204"/>
+                    <socket server="localhost" port="61616"/>
+                </or>
+            </not>
+        </waitfor>
+
+        <condition property="sleep" value="${unix.sleep}" else="${windows.sleep}">
+            <os family="unix"/>
+        </condition>
+        <echo message="                  sleeping for ${sleep} sec"/>
+        <sleep seconds="${sleep}"/>
+
+        <echo message="                  stopped"/>
+    </target>
+
+
+    <target name="tomcat.test" depends="tomcat.test.setup">
+        <!-- unpack tomcat -->
+        <antcall target="tomcat.unpack"/>
+
+        <!-- copy openejb.war to webapps dir -->
+        <copy file="${openejb.war.file}" todir="${tomcat.home}/webapps"/>
+
+        <!-- install itests.war -->
+        <copy file="${itests.war.file}" todir="${tomcat.home}/webapps"/>
+
+        <!-- start tomcat -->
+        <antcall target="tomcat.start"/>
+
+        <!-- run itests (Servlet started mode) -->
+        <antcall target="itests.tomcat.run"/>
+
+        <!-- run installer -->
+        <get src="http://localhost:8080/openejb/installer?action=Install" dest="${target.dir}/installer.out"/>
+
+        <!-- stop tomcat -->
+        <antcall target="tomcat.stop"/>
+
+        <!-- run itests (Listener started mode) -->
+        <antcall target="tomcat.start"/>
+
+        <!-- run itests -->
+        <antcall target="itests.tomcat.run"/>
+
+        <!-- stop tomcat -->
+        <antcall target="tomcat.stop"/>
+
+        <!-- Make sure all resources are collected on windows -->
+        <condition property="sleep" value="1" else="30">
+            <os family="unix"/>
+        </condition>
+        <echo message="Sleeping for ${sleep} sec to avoid Windows failures"/>
+        <sleep seconds="${sleep}"/>
+    </target>
+
+    <target name="tomcat.unpack">
+        <delete dir="${tomcat.home}"/>
+        <mkdir dir="${target.dir}"/>
+        <unjar src="${tomcat.file}" dest="${target.dir}"/>
+        <chmod dir="${tomcat.home}/bin" perm="u+x" includes="**/*.sh"/>
+    </target>
+
+    <target name="tomcat.start">
+        <echo message="Starting Tomcat ${tomcat.version}..."/>
+        <exec executable="${tomcat.home}/bin/startup.bat" spawn="true" osfamily="windows">
+            <env key="CATALINA_HOME" value="${tomcat.home}"/>
+        </exec>
+        <exec executable="${tomcat.home}/bin/startup.sh" osfamily="unix"/>
+        <waitfor maxwait="1" maxwaitunit="minute">
+            <and>
+                <socket server="localhost" port="8080"/>
+                <socket server="localhost" port="8005"/>
+                <socket server="localhost" port="8009"/>
+                <http url="http://localhost:8080/openejb/installer"/>
+            </and>
+        </waitfor>
+
+        <condition property="sleep" value="${unix.sleep}" else="${windows.sleep}">
+            <os family="unix"/>
+        </condition>
+        <echo message="                  sleeping for ${sleep} sec"/>
+        <sleep seconds="${sleep}"/>
+
+        <echo message="                  started"/>
+    </target>
+
+    <target name="tomcat.stop">
+        <echo message="Stopping Tomcat ${tomcat.version}..."/>
+        <exec executable="${tomcat.home}/bin/shutdown.bat" osfamily="windows">
+            <env key="CATALINA_HOME" value="${tomcat.home}"/>
+        </exec>
+        <exec executable="${tomcat.home}/bin/shutdown.sh" osfamily="unix"/>
+        <waitfor maxwait="1" maxwaitunit="minute">
+            <not>
+                <or>
+                    <http url="http://localhost:8080"/>
+                    <socket server="localhost" port="8080"/>
+                    <socket server="localhost" port="8005"/>
+                    <socket server="localhost" port="8009"/>
+                    <socket server="localhost" port="61616"/>
+                </or>
+            </not>
+        </waitfor>
+
+        <condition property="sleep" value="${unix.sleep}" else="${windows.sleep}">
+            <os family="unix"/>
+        </condition>
+        <echo message="                  sleeping for ${sleep} sec"/>
+        <sleep seconds="${sleep}"/>
+
+        <echo message="                  stopped"/>
+    </target>
+
+    <target name="itests.openejb.run">
+        <java jar="${itests.client.file}" fork="yes">
+            <sysproperty key="openejb.home" value="${openejb.home}"/>
+            <arg value="remote"/>
+        </java>
+    </target>
+
+    <target name="itests.tomcat.run">
+        <java jar="${itests.client.file}" fork="yes">
+            <sysproperty key="openejb.home" value="${openejb.home}"/>
+            <arg value="tomcat"/>
+        </java>
+    </target>
+
+    <target name="openejb.test.setup">
+        <property name="openejb.app.url" value="${maven.repo}/org/apache/openejb/openejb-standalone/${tomee.version}/openejb-standalone-${tomee.version}.zip"/>
+        <property name="openejb.app.file" value="${repo}/openejb/distributions/${tomee.version}/openejb.zip"/>
+
+        <property name="itests.app.url" value="${maven.repo}/org/apache/openejb/openejb-itests-app/${tomee.version}/openejb-itests-app-${tomee.version}.jar"/>
+        <property name="itests.app.file" value="${repo}/openejb/distributions/${tomee.version}/openejb-itests-app.jar"/>
+
+        <property name="itests.client.url" value="${maven.repo}/org/apache/openejb/openejb-itests-standalone-client/${tomee.version}/openejb-itests-standalone-client-${tomee.version}.jar"/>
+        <property name="itests.client.file" value="${repo}/openejb/distributions/${tomee.version}/openejb-itests-standalone-client.jar"/>
+
+        <property name="openejb.home" value="${target.dir}/openejb-${tomee.version}"/>
+
+        <antcall target="download.file">
+            <param name="download.url" value="${openejb.app.url}"/>
+            <param name="download.file" value="${openejb.app.file}"/>
+        </antcall>
+        <antcall target="download.file">
+            <param name="download.url" value="${itests.app.url}"/>
+            <param name="download.file" value="${itests.app.file}"/>
+        </antcall>
+        <antcall target="download.file">
+            <param name="download.url" value="${itests.client.url}"/>
+            <param name="download.file" value="${itests.client.file}"/>
+        </antcall>
+    </target>
+
+    <target name="tomcat.test.setup">
+        <property name="openejb.war.url" value="${maven.repo}/org/apache/openejb/openejb-tomcat-webapp/${tomee.version}/openejb-tomcat-webapp-${tomee.version}.war"/>
+        <property name="openejb.war.file" value="${repo}/openejb/distributions/${tomee.version}/openejb.war"/>
+
+        <property name="itests.war.url" value="${maven.repo}/org/apache/openejb/openejb-itests-web/${tomee.version}/openejb-itests-web-${tomee.version}.war"/>
+        <property name="itests.war.file" value="${repo}/openejb/distributions/${tomee.version}/itests.war"/>
+
+        <property name="itests.client.url" value="${maven.repo}/org/apache/openejb/openejb-itests-standalone-client/${tomee.version}/openejb-itests-standalone-client-${tomee.version}.jar"/>
+        <property name="itests.client.file" value="${repo}/openejb/distributions/${tomee.version}/openejb-itests-standalone-client.jar"/>
+
+        <condition property="tomcat.url" value="http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip">
+            <matches pattern="^7\." string="${tomcat.version}"/>
+        </condition>
+        <condition property="tomcat.url" value="http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip">
+            <matches pattern="^6\." string="${tomcat.version}"/>
+        </condition>
+        <condition property="tomcat.url" value="http://archive.apache.org/dist/tomcat/tomcat-5/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip">
+            <matches pattern="^5\.5" string="${tomcat.version}"/>
+        </condition>
+        <fail message="Unknown Tomcat version ${tomcat.version}" unless="tomcat.url"/>
+        <property name="tomcat.file" value="${repo}/tomcat/distributions/${tomcat.version}/tomcat.zip"/>
+
+        <property name="tomcat.home" value="${target.dir}/apache-tomcat-${tomcat.version}"/>
+
+        <antcall target="download.file">
+            <param name="download.url" value="${tomcat.url}"/>
+            <param name="download.file" value="${tomcat.file}"/>
+        </antcall>
+        <antcall target="download.file">
+            <param name="download.url" value="${openejb.war.url}"/>
+            <param name="download.file" value="${openejb.war.file}"/>
+        </antcall>
+        <antcall target="download.file">
+            <param name="download.url" value="${itests.war.url}"/>
+            <param name="download.file" value="${itests.war.file}"/>
+        </antcall>
+        <antcall target="download.file">
+            <param name="download.url" value="${itests.client.url}"/>
+            <param name="download.file" value="${itests.client.file}"/>
+        </antcall>
+    </target>
+
+    <target name="download.uptodate">
+        <available file="${download.file}" property="download.uptodate"/>
+    </target>
+
+    <target name="download.file" depends="download.uptodate" unless="download.uptodate">
+        <dirname property="download.dir" file="${download.file}"/>
+        <mkdir dir="${download.dir}"/>
+        <get src="${download.url}" dest="${download.file}"/>
+    </target>
+</project>

http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/container/openejb-api/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-api/pom.xml b/container/openejb-api/pom.xml
index b2c9cb3..352371b 100644
--- a/container/openejb-api/pom.xml
+++ b/container/openejb-api/pom.xml
@@ -37,7 +37,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomee</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
   </dependencies>


Mime
View raw message