Author: dblevins
Date: Tue May 29 03:53:39 2012
New Revision: 1343465
URL: http://svn.apache.org/viewvc?rev=1343465&view=rev
Log:
TOMEE-203 - Ensure all tomee-* jars and archives use the TomEE version number
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/pom.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml
openejb/trunk/openejb/arquillian-tomee/pom.xml
openejb/trunk/openejb/container/openejb-core/pom.xml
openejb/trunk/openejb/examples/polling-parent/pom.xml
openejb/trunk/openejb/examples/webapps/rest-example-with-application/pom.xml
openejb/trunk/openejb/examples/webapps/rest-example/pom.xml
openejb/trunk/openejb/maven/pom.xml
openejb/trunk/openejb/osgi/apache-karafee/pom.xml
openejb/trunk/openejb/pom.xml
openejb/trunk/openejb/tck/cdi-embedded/pom.xml
openejb/trunk/openejb/tck/cdi-tomee/pom.xml
openejb/trunk/openejb/tomee/apache-tomcat/pom.xml
openejb/trunk/openejb/tomee/apache-tomee/pom.xml
openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
openejb/trunk/openejb/tomee/pom.xml
openejb/trunk/openejb/tomee/tomee-catalina/pom.xml
openejb/trunk/openejb/tomee/tomee-common/pom.xml
openejb/trunk/openejb/tomee/tomee-embedded/pom.xml
openejb/trunk/openejb/tomee/tomee-jaxrs-webapp/pom.xml
openejb/trunk/openejb/tomee/tomee-jaxrs/pom.xml
openejb/trunk/openejb/tomee/tomee-loader/pom.xml
openejb/trunk/openejb/tomee/tomee-myfaces/pom.xml
openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml
openejb/trunk/openejb/tomee/tomee-webapp/pom.xml
openejb/trunk/openejb/tomee/tomee-webservices/pom.xml
openejb/trunk/openejb/utils/webdeployer/pom.xml
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/pom.xml
Tue May 29 03:53:39 2012
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-common</artifactId>
- <version>1.0.0-beta-3-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -124,7 +124,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>${version.openejb}</version>
+ <version>${version.tomee}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml Tue
May 29 03:53:39 2012
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${version.openejb}</version>
+ <version>${version.tomee}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml Tue
May 29 03:53:39 2012
@@ -68,7 +68,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>${version.openejb}</version>
+ <version>${version.tomee}</version>
</dependency>
<dependency>
@@ -252,7 +252,7 @@
<configuration>
<systemPropertyVariables>
<tomee.artifactId>tomee-webapp</tomee.artifactId>
- <tomee.version>4.0.0-beta-3-SNAPSHOT</tomee.version>
+ <tomee.version>${openejb.version}</tomee.version>
<tomee.tomcatVersion>7.0.27</tomee.tomcatVersion>
</systemPropertyVariables>
<excludes>
@@ -272,7 +272,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webapp</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${openejb.version}</version>
<type>war</type>
</dependency>
<dependency>
@@ -301,7 +301,7 @@
<configuration>
<systemPropertyVariables>
<tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
- <tomee.version>4.0.0-beta-3-SNAPSHOT</tomee.version>
+ <tomee.version>${openejb.version}</tomee.version>
<tomee.tomcatVersion>7.0.27</tomee.tomcatVersion>
</systemPropertyVariables>
</configuration>
@@ -317,7 +317,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-plus-webapp</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${openejb.version}</version>
<type>war</type>
</dependency>
<dependency>
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml
Tue May 29 03:53:39 2012
@@ -269,7 +269,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${version.openejb}</version>
+ <version>${version.tomee}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: openejb/trunk/openejb/arquillian-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/pom.xml Tue May 29 03:53:39 2012
@@ -34,7 +34,7 @@
<properties>
<version.arquillian>1.0.0.Final</version.arquillian>
<version.cdi-api>1.0</version.cdi-api>
- <version.openejb>4.0.0-beta-3-SNAPSHOT</version.openejb>
+ <version.openejb>${openejb.version}</version.openejb>
<version.tomee>1.0.0-beta-3-SNAPSHOT</version.tomee>
<version.shrinkwrap.descriptor>1.1.0-beta-1</version.shrinkwrap.descriptor>
</properties>
Modified: openejb/trunk/openejb/container/openejb-core/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-core/pom.xml Tue May 29 03:53:39
2012
@@ -378,7 +378,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>mbean-annotation-api</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: openejb/trunk/openejb/examples/polling-parent/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/polling-parent/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/polling-parent/pom.xml (original)
+++ openejb/trunk/openejb/examples/polling-parent/pom.xml Tue May 29 03:53:39
2012
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
openejb/trunk/openejb/examples/webapps/rest-example-with-application/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/rest-example-with-application/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
---
openejb/trunk/openejb/examples/webapps/rest-example-with-application/pom.xml
(original)
+++
openejb/trunk/openejb/examples/webapps/rest-example-with-application/pom.xml
Tue May 29 03:53:39 2012
@@ -26,6 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openejb.version>4.0.0-beta-3-SNAPSHOT</openejb.version>
+ <tomee.version>1.0.0-beta-3-SNAPSHOT</tomee.version>
</properties>
<repositories>
<repository>
@@ -77,7 +78,7 @@
<webappArtifact>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-plus-webapp</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<contextPath>openejb</contextPath>
</webappArtifact>
</webapps>
Modified: openejb/trunk/openejb/examples/webapps/rest-example/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/rest-example/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/rest-example/pom.xml (original)
+++ openejb/trunk/openejb/examples/webapps/rest-example/pom.xml Tue May 29
03:53:39 2012
@@ -72,7 +72,7 @@
<artifactId>tomee-maven-plugin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<configuration>
- <tomeeVersion>1.0.0-beta-3-SNAPSHOT</tomeeVersion>
+ <tomeeVersion>${tomee.version}</tomeeVersion>
<tomeeClassifier>plus</tomeeClassifier>
</configuration>
</plugin>
@@ -88,7 +88,7 @@
<webappArtifact>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-plus-webapp</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<contextPath>openejb</contextPath>
</webappArtifact>
</webapps>
@@ -178,7 +178,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: openejb/trunk/openejb/maven/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/pom.xml (original)
+++ openejb/trunk/openejb/maven/pom.xml Tue May 29 03:53:39 2012
@@ -72,12 +72,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${openejb.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: openejb/trunk/openejb/osgi/apache-karafee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/apache-karafee/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/apache-karafee/pom.xml (original)
+++ openejb/trunk/openejb/osgi/apache-karafee/pom.xml Tue May 29 03:53:39 2012
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-karaf-rebranding</artifactId>
- <version>${project.parent.version}</version>
+ <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-feature</artifactId>
- <version>${project.parent.version}</version>
+ <version>${openejb.version}</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
@@ -102,7 +102,7 @@
</goals>
<configuration>
<descriptors>
-
<descriptor>mvn:org.apache.openejb/openejb-feature/${project.parent.version}/xml/features</descriptor>
+
<descriptor>mvn:org.apache.openejb/openejb-feature/${openejb.version}/xml/features</descriptor>
</descriptors>
<features>
<feature>openejb-server</feature>
@@ -129,9 +129,9 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-karaf-rebranding</artifactId>
- <version>${project.parent.version}</version>
+ <version>${openejb.version}</version>
<outputDirectory>target/dependencies</outputDirectory>
-
<destFileName>openejb-karaf-rebranding-${project.parent.version}.jar</destFileName>
+
<destFileName>openejb-karaf-rebranding-${openejb.version}.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
Modified: openejb/trunk/openejb/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Tue May 29 03:53:39 2012
@@ -90,6 +90,9 @@
<properties>
+ <openejb.version>4.0.0-beta-3-SNAPSHOT</openejb.version>
+ <tomee.version>1.0.0-beta-3-SNAPSHOT</tomee.version>
+
<!-- Maven module versions -->
<maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
Modified: openejb/trunk/openejb/tck/cdi-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-embedded/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-embedded/pom.xml (original)
+++ openejb/trunk/openejb/tck/cdi-embedded/pom.xml Tue May 29 03:53:39 2012
@@ -37,12 +37,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tck-common</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${openejb.version}</version>
</dependency>
<dependency>
Modified: openejb/trunk/openejb/tck/cdi-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb/tck/cdi-tomee/pom.xml Tue May 29 03:53:39 2012
@@ -37,17 +37,17 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${project.version}</version>
+ <version>${openejb.version}</version>
</dependency>
<dependency> <!-- for TomEERuntimeException -->
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-catalina</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>webdeployer</artifactId>
- <version>${project.version}</version>
+ <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tck-common</artifactId>
- <version>${project.version}</version>
+ <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: openejb/trunk/openejb/tomee/apache-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomcat/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomcat/pom.xml (original)
+++ openejb/trunk/openejb/tomee/apache-tomcat/pom.xml Tue May 29 03:53:39 2012
@@ -22,7 +22,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: openejb/trunk/openejb/tomee/apache-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomee/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomee/pom.xml (original)
+++ openejb/trunk/openejb/tomee/apache-tomee/pom.xml Tue May 29 03:53:39 2012
@@ -22,13 +22,12 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-tomee</artifactId>
<packaging>pom</packaging>
<name>OpenEJB :: TomEE :: Apache TomEE</name>
- <version>1.0.0-beta-3-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -46,14 +45,14 @@
<groupId>org.apache.commons</groupId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${openejb.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>apache-tomcat</artifactId>
<version>${tomcat.bundle.version}</version>
<type>zip</type>
@@ -67,23 +66,23 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency> <!-- to be sure to have it -->
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>tomee-plus-webapp</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency> <!-- to be sure to have it -->
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>tomee-jaxrs-webapp</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
Modified:
openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
(original)
+++
openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
Tue May 29 03:53:39 2012
@@ -83,6 +83,10 @@ class SetupCommand {
def tomcatVersion = require('tomcat.version')
def tomcatBundleVersion = require('tomcat.bundle.version')
System.setProperty('tomcat.version', tomcatVersion)
+
+ def tomeeVersion = require('tomee.version')
+ System.setProperty('tomee.version', tomeeVersion)
+
def openejbVersion = require('openejb.version')
System.setProperty('openejb.version', openejbVersion)
def localRepo = require('localRepository')
@@ -112,7 +116,7 @@ class SetupCommand {
ant.unzip(src: dest, dest: "${workDir}")
log.info("Deploying the tomee war")
- ant.unzip(src:
"${localRepo}/org/apache/openejb/${webapp}/${openejbVersion}/${webapp}-${openejbVersion}.war",
+ ant.unzip(src:
"${localRepo}/org/apache/openejb/${webapp}/${tomeeVersion}/${webapp}-${tomeeVersion}.war",
dest:
"${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee")
log.info("Installing to: ${catalinaHome}")
Modified: openejb/trunk/openejb/tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/pom.xml (original)
+++ openejb/trunk/openejb/tomee/pom.xml Tue May 29 03:53:39 2012
@@ -26,6 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee</artifactId>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenEJB :: TomEE</name>
@@ -106,7 +107,7 @@
</activation>
<dependencies>
<dependency> <!-- to avoid to force exclusions everywhere -->
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${openejb.version}</version>
<exclusions>
@@ -149,7 +150,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>openejb-core-hibernate</artifactId>
<type>pom</type>
<version>${openejb.version}</version>
Modified: openejb/trunk/openejb/tomee/tomee-catalina/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/pom.xml Tue May 29 03:53:39 2012
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-catalina</artifactId>
@@ -52,12 +52,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-loader</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: openejb/trunk/openejb/tomee/tomee-common/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-common/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-common/pom.xml Tue May 29 03:53:39 2012
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-common</artifactId>
Modified: openejb/trunk/openejb/tomee/tomee-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-embedded/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-embedded/pom.xml Tue May 29 03:53:39 2012
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-embedded</artifactId>
@@ -88,13 +88,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-jsf</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${openejb.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${openejb.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -176,12 +176,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-catalina</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
Modified: openejb/trunk/openejb/tomee/tomee-jaxrs-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-jaxrs-webapp/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-jaxrs-webapp/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-jaxrs-webapp/pom.xml Tue May 29 03:53:39
2012
@@ -5,7 +5,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -15,9 +15,9 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>tomee-webapp</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
<type>war</type>
</dependency>
<dependency>
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-jaxrs</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: openejb/trunk/openejb/tomee/tomee-jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-jaxrs/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-jaxrs/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-jaxrs/pom.xml Tue May 29 03:53:39 2012
@@ -5,7 +5,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -31,17 +31,17 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-loader</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-catalina</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: openejb/trunk/openejb/tomee/tomee-loader/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/pom.xml Tue May 29 03:53:39 2012
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-loader</artifactId>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Modified: openejb/trunk/openejb/tomee/tomee-myfaces/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-myfaces/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-myfaces/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-myfaces/pom.xml Tue May 29 03:53:39 2012
@@ -22,7 +22,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml Tue May 29 03:53:39
2012
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,9 +33,9 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>tomee-webapp</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
<type>war</type>
</dependency>
<dependency>
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: openejb/trunk/openejb/tomee/tomee-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/pom.xml Tue May 29 03:53:39 2012
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-webapp</artifactId>
@@ -162,7 +162,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-catalina</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -178,13 +178,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-myfaces</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -200,7 +200,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-loader</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: openejb/trunk/openejb/tomee/tomee-webservices/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webservices/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webservices/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-webservices/pom.xml Tue May 29 03:53:39
2012
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-webservices</artifactId>
@@ -78,17 +78,17 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-loader</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-catalina</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-jaxrs</artifactId>
- <version>${project.version}</version>
+ <version>${tomee.version}</version>
</dependency>
</dependencies>
</project>
Modified: openejb/trunk/openejb/utils/webdeployer/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/webdeployer/pom.xml?rev=1343465&r1=1343464&r2=1343465&view=diff
==============================================================================
--- openejb/trunk/openejb/utils/webdeployer/pom.xml (original)
+++ openejb/trunk/openejb/utils/webdeployer/pom.xml Tue May 29 03:53:39 2012
@@ -18,23 +18,24 @@
-->
<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>
- <groupId>org.apache.openejb</groupId>
- <artifactId>webdeployer</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
- <name>OpenEJB :: Utils :: TomEE Webapps-based Deployer EJB</name>
<parent>
<artifactId>utils</artifactId>
<groupId>org.apache.openejb</groupId>
<version>4.0.0-beta-3-SNAPSHOT</version>
</parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>webdeployer</artifactId>
+ <name>OpenEJB :: Utils :: TomEE Webapps-based Deployer EJB</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-catalina</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
