Author: dblevins
Date: Sun Oct 2 07:14:14 2011
New Revision: 1178136
URL: http://svn.apache.org/viewvc?rev=1178136&view=rev
Log:
Update TomEE version like in the tag
Modified:
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
openejb/trunk/openejb/assembly/openejb-tomcat/tomee-embedded/pom.xml
openejb/trunk/openejb/tck/bval-tomee/pom.xml
openejb/trunk/openejb/tck/cdi-embedded/pom.xml
openejb/trunk/openejb/tck/cdi-tomee-embedded/pom.xml
openejb/trunk/openejb/tck/cdi-tomee/pom.xml
Modified:
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml?rev=1178136&r1=1178135&r2=1178136&view=diff
==============================================================================
---
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
(original)
+++
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
Sun Oct 2 07:14:14 2011
@@ -28,6 +28,7 @@
<artifactId>apache-tomee</artifactId>
<packaging>pom</packaging>
<name>OpenEJB :: Assembly :: TomEE :: Tomcat 7</name>
+ <version>1.0.0-beta-1</version>
<dependencies>
<dependency>
@@ -59,21 +60,28 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-webapp-common</artifactId>
- <version>${project.version}</version>
+ <version>4.0.0-beta-1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>4.0.0-beta-1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-tomcat-common</artifactId>
- <version>${project.version}</version>
+ <version>4.0.0-beta-1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-tomee-utils</artifactId>
- <version>${project.version}</version>
+ <version>4.0.0-beta-1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -94,7 +102,7 @@
<dependency> <!-- to be sure to have it -->
<groupId>${project.groupId}</groupId>
<artifactId>openejb-tomcat-plus-webapp</artifactId>
- <version>${project.version}</version>
+ <version>4.0.0-beta-1</version>
<type>war</type>
<scope>provided</scope>
</dependency>
@@ -184,7 +192,7 @@
<element>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-tomee-utils</artifactId>
- <version>${project.version}</version>
+ <version>4.0.0-beta-1</version>
</element>
</classpath>
</configuration>
@@ -216,7 +224,7 @@
<element>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-tomee-utils</artifactId>
- <version>${project.version}</version>
+ <version>4.0.0-beta-1</version>
</element>
</classpath>
</configuration>
@@ -305,6 +313,7 @@
<properties>
<localRepository>${settings.localRepository}</localRepository>
<examples.version>1.1-SNAPSHOT</examples.version>
+ <openejb.version>4.0.0-beta-1</openejb.version>
<http.proxy.host>${settings.activeProxy.host}</http.proxy.host>
<http.proxy.port>${settings.activeProxy.port}</http.proxy.port>
<http.proxy.username>${settings.activeProxy.username}</http.proxy.username>
Modified:
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy?rev=1178136&r1=1178135&r2=1178136&view=diff
==============================================================================
---
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
(original)
+++
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
Sun Oct 2 07:14:14 2011
@@ -86,6 +86,8 @@ class SetupCommand {
def webapp = require('tomee.webapp')
def tomcatVersion = require('tomcat.version')
System.setProperty('tomcat.version', tomcatVersion)
+ def openejbVersion = require('openejb.version')
+ System.setProperty('openejb.version', openejbVersion)
def localRepo = require('localRepository')
def openejbHome = "${workDir}/apache-tomcat-${tomcatVersion}"
def examplesVersion = require('examples.version')
@@ -129,7 +131,7 @@ class SetupCommand {
ant.unzip(src: dest, dest: "${workDir}")
ant.echo("Deploying the openejb war")
- ant.unzip(src:
"${localRepo}/org/apache/openejb/${webapp}/${project.version}/${webapp}-${project.version}.war",
+ ant.unzip(src:
"${localRepo}/org/apache/openejb/${webapp}/${openejbVersion}/${webapp}-${openejbVersion}.war",
dest:
"${workDir}/apache-tomcat-${tomcatVersion}/webapps/openejb")
ant.echo("Installing to: ${catalinaHome}")
Modified: openejb/trunk/openejb/assembly/openejb-tomcat/tomee-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/openejb-tomcat/tomee-embedded/pom.xml?rev=1178136&r1=1178135&r2=1178136&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/openejb-tomcat/tomee-embedded/pom.xml
(original)
+++ openejb/trunk/openejb/assembly/openejb-tomcat/tomee-embedded/pom.xml Sun
Oct 2 07:14:14 2011
@@ -29,6 +29,7 @@
<artifactId>tomee-embedded</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Assembly :: TomEE Embedded</name>
+ <version>1.0.0-beta-1</version>
<build>
<plugins>
<plugin>
@@ -46,7 +47,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-jsf</artifactId>
- <version>${project.version}</version>
+ <version>4.0.0-beta-1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>4.0.0-beta-1</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: openejb/trunk/openejb/tck/bval-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/bval-tomee/pom.xml?rev=1178136&r1=1178135&r2=1178136&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/bval-tomee/pom.xml (original)
+++ openejb/trunk/openejb/tck/bval-tomee/pom.xml Sun Oct 2 07:14:14 2011
@@ -29,7 +29,7 @@
<description>Aggregates dependencies and runs the JSR-303 TCK in
TomEE</description>
<properties>
-
<openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-${project.version}</openejb.home>
+
<openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-1.0.0-beta-1</openejb.home>
</properties>
<dependencies>
@@ -69,7 +69,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
<type>zip</type>
- <version>${project.version}</version>
+ <version>1.0.0-beta-1</version>
<classifier>webprofile</classifier>
</dependency>
<dependency>
@@ -140,7 +140,7 @@
<artifactItem>
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
- <version>${project.version}</version>
+ <version>1.0.0-beta-1</version>
<type>zip</type>
<classifier>webprofile</classifier>
<outputDirectory>${project.build.directory}</outputDirectory>
Modified: openejb/trunk/openejb/tck/cdi-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-embedded/pom.xml?rev=1178136&r1=1178135&r2=1178136&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-embedded/pom.xml (original)
+++ openejb/trunk/openejb/tck/cdi-embedded/pom.xml Sun Oct 2 07:14:14 2011
@@ -26,6 +26,8 @@
<artifactId>cdi-embedded</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: TCK :: CDI Embedded</name>
+ <version>1.0.0-beta-1</version>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -36,12 +38,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tck-common</artifactId>
- <version>${project.version}</version>
+ <version>4.0.0-beta-1</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${project.version}</version>
+ <version>4.0.0-beta-1</version>
</dependency>
<dependency>
Modified: openejb/trunk/openejb/tck/cdi-tomee-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee-embedded/pom.xml?rev=1178136&r1=1178135&r2=1178136&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-tomee-embedded/pom.xml (original)
+++ openejb/trunk/openejb/tck/cdi-tomee-embedded/pom.xml Sun Oct 2 07:14:14
2011
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-embedded</artifactId>
- <version>${project.version}</version>
+ <version>1.0.0-beta-1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: openejb/trunk/openejb/tck/cdi-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee/pom.xml?rev=1178136&r1=1178135&r2=1178136&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb/tck/cdi-tomee/pom.xml Sun Oct 2 07:14:14 2011
@@ -28,7 +28,7 @@
<name>OpenEJB :: TCK :: CDI TomEE</name>
<properties>
<!-- where we will unpack tomcat -->
-
<openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-${project.version}</openejb.home>
+
<openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-1.0.0-beta-1</openejb.home>
</properties>
<dependencies>
<dependency>
@@ -45,7 +45,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
<type>zip</type>
- <version>${project.version}</version>
+ <version>1.0.0-beta-1</version>
<classifier>webprofile</classifier>
</dependency>
<dependency>
@@ -125,7 +125,7 @@
<artifactItem>
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
- <version>${project.version}</version>
+ <version>1.0.0-beta-1</version>
<type>zip</type>
<classifier>webprofile</classifier>
<outputDirectory>${project.build.directory}</outputDirectory>
