You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/06/03 04:40:13 UTC
svn commit: r1345619 - in /openejb/branches/openejb-4.0.x:
examples/polling-parent/ examples/polling-parent/polling-web/
examples/simple-cmp2/ examples/webapps/moviefun/app/
examples/webapps/rest-example/ maven/ osgi/ tomee/apache-tomee/
tomee/apache-t...
Author: dblevins
Date: Sun Jun 3 02:40:12 2012
New Revision: 1345619
URL: http://svn.apache.org/viewvc?rev=1345619&view=rev
Log:
more version updates
Modified:
openejb/branches/openejb-4.0.x/examples/polling-parent/polling-web/pom.xml
openejb/branches/openejb-4.0.x/examples/polling-parent/pom.xml
openejb/branches/openejb-4.0.x/examples/simple-cmp2/pom.xml
openejb/branches/openejb-4.0.x/examples/webapps/moviefun/app/pom.xml
openejb/branches/openejb-4.0.x/examples/webapps/rest-example/pom.xml
openejb/branches/openejb-4.0.x/maven/pom.xml
openejb/branches/openejb-4.0.x/osgi/pom.xml
openejb/branches/openejb-4.0.x/tomee/apache-tomee/pom.xml
openejb/branches/openejb-4.0.x/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
Modified: openejb/branches/openejb-4.0.x/examples/polling-parent/polling-web/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.x/examples/polling-parent/polling-web/pom.xml?rev=1345619&r1=1345618&r2=1345619&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.x/examples/polling-parent/polling-web/pom.xml (original)
+++ openejb/branches/openejb-4.0.x/examples/polling-parent/polling-web/pom.xml Sun Jun 3 02:40:12 2012
@@ -79,7 +79,7 @@
<plugin>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>4.0.0</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
<configuration>
<tomeeClassifier>plus</tomeeClassifier>
</configuration>
Modified: openejb/branches/openejb-4.0.x/examples/polling-parent/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.x/examples/polling-parent/pom.xml?rev=1345619&r1=1345618&r2=1345619&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.x/examples/polling-parent/pom.xml (original)
+++ openejb/branches/openejb-4.0.x/examples/polling-parent/pom.xml Sun Jun 3 02:40:12 2012
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: openejb/branches/openejb-4.0.x/examples/simple-cmp2/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.x/examples/simple-cmp2/pom.xml?rev=1345619&r1=1345618&r2=1345619&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.x/examples/simple-cmp2/pom.xml (original)
+++ openejb/branches/openejb-4.0.x/examples/simple-cmp2/pom.xml Sun Jun 3 02:40:12 2012
@@ -28,7 +28,7 @@
<name>OpenEJB :: Examples :: Simple CMP2 Entity</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <openejb.version>4.0.0</openejb.version>
+ <openejb.version>4.0.1-SNAPSHOT</openejb.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -107,7 +107,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>${openejb.version}</version>
<scope>test</scope>
</dependency>
Modified: openejb/branches/openejb-4.0.x/examples/webapps/moviefun/app/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.x/examples/webapps/moviefun/app/pom.xml?rev=1345619&r1=1345618&r2=1345619&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.x/examples/webapps/moviefun/app/pom.xml (original)
+++ openejb/branches/openejb-4.0.x/examples/webapps/moviefun/app/pom.xml Sun Jun 3 02:40:12 2012
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<configuration>
<tomeeClassifier>plus</tomeeClassifier>
<args>-Xmx512m -XX:PermSize=256m</args>
Modified: openejb/branches/openejb-4.0.x/examples/webapps/rest-example/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.x/examples/webapps/rest-example/pom.xml?rev=1345619&r1=1345618&r2=1345619&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.x/examples/webapps/rest-example/pom.xml (original)
+++ openejb/branches/openejb-4.0.x/examples/webapps/rest-example/pom.xml Sun Jun 3 02:40:12 2012
@@ -95,7 +95,7 @@
</plugin>
<plugin>
<groupId>org.apache.openejb.maven</groupId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<artifactId>spi-helper-maven-plugin</artifactId>
<executions>
<execution>
@@ -116,7 +116,7 @@
</dependency>
<dependency> <!-- to get the jee6 profile without configuration -->
<groupId>org.apache.openejb.maven</groupId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<artifactId>spi-helper-jee6-profile</artifactId>
</dependency>
</dependencies>
Modified: openejb/branches/openejb-4.0.x/maven/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.x/maven/pom.xml?rev=1345619&r1=1345618&r2=1345619&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.x/maven/pom.xml (original)
+++ openejb/branches/openejb-4.0.x/maven/pom.xml Sun Jun 3 02:40:12 2012
@@ -72,12 +72,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: openejb/branches/openejb-4.0.x/osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.x/osgi/pom.xml?rev=1345619&r1=1345618&r2=1345619&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.x/osgi/pom.xml (original)
+++ openejb/branches/openejb-4.0.x/osgi/pom.xml Sun Jun 3 02:40:12 2012
@@ -41,6 +41,6 @@
<properties>
<karaf.version>2.2.6</karaf.version>
- <karafee.version>1.0.0</karafee.version>
+ <karafee.version>1.0.1-SNAPSHOT</karafee.version>
</properties>
</project>
Modified: openejb/branches/openejb-4.0.x/tomee/apache-tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.x/tomee/apache-tomee/pom.xml?rev=1345619&r1=1345618&r2=1345619&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.x/tomee/apache-tomee/pom.xml (original)
+++ openejb/branches/openejb-4.0.x/tomee/apache-tomee/pom.xml Sun Jun 3 02:40:12 2012
@@ -246,7 +246,7 @@
</descriptors>
<attach>false</attach>
<appendAssemblyId>false</appendAssemblyId>
- <finalName>apache-tomee-webprofile-${project.version}</finalName>
+ <finalName>apache-tomee-webprofile-${tomee.version}</finalName>
</configuration>
<goals>
<goal>single</goal>
@@ -261,7 +261,7 @@
</descriptors>
<attach>false</attach>
<appendAssemblyId>false</appendAssemblyId>
- <finalName>apache-tomee-plus-${project.version}</finalName>
+ <finalName>apache-tomee-plus-${tomee.version}</finalName>
</configuration>
<goals>
<goal>single</goal>
@@ -284,22 +284,22 @@
<configuration>
<artifacts>
<artifact>
- <file>${project.build.directory}/apache-tomee-webprofile-${project.version}.zip</file>
+ <file>${project.build.directory}/apache-tomee-webprofile-${tomee.version}.zip</file>
<type>zip</type>
<classifier>webprofile</classifier>
</artifact>
<artifact>
- <file>${project.build.directory}/apache-tomee-webprofile-${project.version}.tar.gz</file>
+ <file>${project.build.directory}/apache-tomee-webprofile-${tomee.version}.tar.gz</file>
<type>tar.gz</type>
<classifier>webprofile</classifier>
</artifact>
<artifact>
- <file>${project.build.directory}/apache-tomee-plus-${project.version}.zip</file>
+ <file>${project.build.directory}/apache-tomee-plus-${tomee.version}.zip</file>
<type>zip</type>
<classifier>plus</classifier>
</artifact>
<artifact>
- <file>${project.build.directory}/apache-tomee-plus-${project.version}.tar.gz</file>
+ <file>${project.build.directory}/apache-tomee-plus-${tomee.version}.tar.gz</file>
<type>tar.gz</type>
<classifier>plus</classifier>
</artifact>
Modified: openejb/branches/openejb-4.0.x/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.x/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy?rev=1345619&r1=1345618&r2=1345619&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.x/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy (original)
+++ openejb/branches/openejb-4.0.x/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy Sun Jun 3 02:40:12 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}")