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 2010/11/18 05:57:47 UTC
svn commit: r1036324 - in /openejb/branches/openejb-3.1.x:
assembly/openejb-itests-standalone-client/ assembly/openejb-standalone/
assembly/openejb-tomcat/openejb-tomcat-bundle/
assembly/openejb-tomcat/openejb-tomcat-catalina/ assembly/openejb-tomcat/o...
Author: dblevins
Date: Thu Nov 18 04:57:46 2010
New Revision: 1036324
URL: http://svn.apache.org/viewvc?rev=1036324&view=rev
Log:
Yet another excellent patch from Stephen Connolly, OPENEJB-1402: use ${project.version} inplace of the deprecated ${version} in pom.xml files
A.k.a. maven 3 support
Modified:
openejb/branches/openejb-3.1.x/assembly/openejb-itests-standalone-client/pom.xml
openejb/branches/openejb-3.1.x/assembly/openejb-standalone/pom.xml
openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/branches/openejb-3.1.x/assembly/openejb-webapp-common/pom.xml
openejb/branches/openejb-3.1.x/container/openejb-activemq4/pom.xml
openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml
openejb/branches/openejb-3.1.x/container/openejb-osgi/pom.xml
openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml
openejb/branches/openejb-3.1.x/itests/openejb-itests-app/pom.xml
openejb/branches/openejb-3.1.x/itests/openejb-itests-beans/pom.xml
openejb/branches/openejb-3.1.x/itests/openejb-itests-client/pom.xml
openejb/branches/openejb-3.1.x/itests/openejb-itests-interceptor-beans/pom.xml
openejb/branches/openejb-3.1.x/itests/openejb-itests-servlets/pom.xml
openejb/branches/openejb-3.1.x/itests/openejb-itests-web/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-activemq/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-admin/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-axis/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-axis2/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-client/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-corba/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-cxf/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-derbynet/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-hsql/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-http/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-multicast/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-server/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-telnet/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-webadmin/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-webservices/pom.xml
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-itests-standalone-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-itests-standalone-client/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-itests-standalone-client/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-itests-standalone-client/pom.xml Thu Nov 18 04:57:46 2010
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -78,20 +78,20 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-servlets</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-standalone/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-standalone/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-standalone/pom.xml Thu Nov 18 04:57:46 2010
@@ -113,12 +113,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -132,44 +132,44 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-multicast</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-hsql</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-http</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-telnet</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -180,13 +180,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
<scope>test</scope>
</dependency>
@@ -202,13 +202,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
<type>ejb</type>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml Thu Nov 18 04:57:46 2010
@@ -132,7 +132,7 @@
<id>war</id>
<phase>package</phase>
<configuration>
- <finalName>${artifactId}-${version}</finalName>
+ <finalName>${artifactId}-${project.version}</finalName>
</configuration>
<goals>
<goal>attached</goal>
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml Thu Nov 18 04:57:46 2010
@@ -52,32 +52,32 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-tomcat-common</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-http</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml Thu Nov 18 04:57:46 2010
@@ -34,27 +34,27 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-webapp-common</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml Thu Nov 18 04:57:46 2010
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml Thu Nov 18 04:57:46 2010
@@ -84,19 +84,19 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-tomcat-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-tomcat-catalina</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -124,13 +124,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -141,68 +141,68 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-tomcat-common</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-hsql</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-http</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-telnet</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-standalone-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-web</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>war</type>
<scope>test</scope>
</dependency>
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-webapp-common/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-webapp-common/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-webapp-common/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-webapp-common/pom.xml Thu Nov 18 04:57:46 2010
@@ -33,12 +33,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -52,44 +52,44 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-multicast</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-hsql</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-http</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-telnet</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
Modified: openejb/branches/openejb-3.1.x/container/openejb-activemq4/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-activemq4/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-activemq4/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-activemq4/pom.xml Thu Nov 18 04:57:46 2010
@@ -76,7 +76,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
- <argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -enableassertions</argLine>
+ <argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -enableassertions</argLine>
<workingDirectory>${basedir}/target</workingDirectory>
<systemProperties>
<property>
@@ -147,13 +147,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<exclusions>
<!-- Ignore ActiveMQ 5.x-->
<exclusion>
@@ -209,7 +209,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
- <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -Xdebug -Xnoagent -Djava.compiler=NONE
+ <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
</argLine>
<workingDirectory>${basedir}/target</workingDirectory>
Modified: openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml Thu Nov 18 04:57:46 2010
@@ -118,7 +118,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
- <argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -enableassertions</argLine>
+ <argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -enableassertions</argLine>
<workingDirectory>${basedir}/target</workingDirectory>
<systemProperties>
<property>
@@ -173,7 +173,7 @@
<!--<addClasspath>true</addClasspath>-->
</manifest>
<manifestEntries>
- <Class-Path>openejb-loader-${version}.jar openejb-client-${version}.jar
+ <Class-Path>openejb-loader-${project.version}.jar openejb-client-${project.version}.jar
xbean-finder-shaded-${xbeanVersion}.jar xbean-asm-shaded-${xbeanVersion}.jar</Class-Path>
<J2EE-DeploymentFactory-Implementation-Class>
org.apache.openejb.config.VmDeploymentFactory</J2EE-DeploymentFactory-Implementation-Class>
@@ -208,52 +208,52 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ejb31-api-experimental</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-api</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-jee</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-app</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-interceptor-beans</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -402,7 +402,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
- <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argLine>
+ <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argLine>
<workingDirectory>${basedir}/target</workingDirectory>
<systemProperties>
<property>
Modified: openejb/branches/openejb-3.1.x/container/openejb-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-osgi/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-osgi/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-osgi/pom.xml Thu Nov 18 04:57:46 2010
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml Thu Nov 18 04:57:46 2010
@@ -69,7 +69,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
- <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -enableassertions</argLine>
+ <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -enableassertions</argLine>
<workingDirectory>${basedir}/target</workingDirectory>
<systemProperties>
<property>
@@ -92,31 +92,31 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-app</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -135,7 +135,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
- <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -enableassertions
+ <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -enableassertions
-agentlib:jdwp=transport=dt_socket,server=y,address=5005</argLine>
<workingDirectory>${basedir}/target</workingDirectory>
<systemProperties>
Modified: openejb/branches/openejb-3.1.x/itests/openejb-itests-app/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/itests/openejb-itests-app/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/itests/openejb-itests-app/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/itests/openejb-itests-app/pom.xml Thu Nov 18 04:57:46 2010
@@ -78,24 +78,24 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ejb31-api-experimental</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-interceptor-beans</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: openejb/branches/openejb-3.1.x/itests/openejb-itests-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/itests/openejb-itests-beans/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/itests/openejb-itests-beans/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/itests/openejb-itests-beans/pom.xml Thu Nov 18 04:57:46 2010
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ejb31-api-experimental</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: openejb/branches/openejb-3.1.x/itests/openejb-itests-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/itests/openejb-itests-client/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/itests/openejb-itests-client/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/itests/openejb-itests-client/pom.xml Thu Nov 18 04:57:46 2010
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ejb31-api-experimental</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: openejb/branches/openejb-3.1.x/itests/openejb-itests-interceptor-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/itests/openejb-itests-interceptor-beans/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/itests/openejb-itests-interceptor-beans/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/itests/openejb-itests-interceptor-beans/pom.xml Thu Nov 18 04:57:46 2010
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
</dependency>
</dependencies>
Modified: openejb/branches/openejb-3.1.x/itests/openejb-itests-servlets/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/itests/openejb-itests-servlets/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/itests/openejb-itests-servlets/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/itests/openejb-itests-servlets/pom.xml Thu Nov 18 04:57:46 2010
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
<scope>provided</scope>
</dependency>
Modified: openejb/branches/openejb-3.1.x/itests/openejb-itests-web/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/itests/openejb-itests-web/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/itests/openejb-itests-web/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/itests/openejb-itests-web/pom.xml Thu Nov 18 04:57:46 2010
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-servlets</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: openejb/branches/openejb-3.1.x/server/openejb-activemq/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-activemq/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-activemq/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-activemq/pom.xml Thu Nov 18 04:57:46 2010
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
Modified: openejb/branches/openejb-3.1.x/server/openejb-admin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-admin/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-admin/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-admin/pom.xml Thu Nov 18 04:57:46 2010
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: openejb/branches/openejb-3.1.x/server/openejb-axis/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-axis/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-axis/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-axis/pom.xml Thu Nov 18 04:57:46 2010
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>axis</groupId>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: openejb/branches/openejb-3.1.x/server/openejb-axis2/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-axis2/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-axis2/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-axis2/pom.xml Thu Nov 18 04:57:46 2010
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- maven is dropping this dep for some strange reason, so include it explicitly -->
Modified: openejb/branches/openejb-3.1.x/server/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/pom.xml Thu Nov 18 04:57:46 2010
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ejb31-api-experimental</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
Modified: openejb/branches/openejb-3.1.x/server/openejb-corba/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-corba/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-corba/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-corba/pom.xml Thu Nov 18 04:57:46 2010
@@ -33,17 +33,17 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: openejb/branches/openejb-3.1.x/server/openejb-cxf/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-cxf/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-cxf/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-cxf/pom.xml Thu Nov 18 04:57:46 2010
@@ -57,17 +57,17 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-http</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: openejb/branches/openejb-3.1.x/server/openejb-derbynet/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-derbynet/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-derbynet/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-derbynet/pom.xml Thu Nov 18 04:57:46 2010
@@ -34,17 +34,17 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified: openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml Thu Nov 18 04:57:46 2010
@@ -57,8 +57,8 @@
<configuration>
<forkMode>pertest</forkMode>
<!-- DEBUG: Uncomment this line and comment out the next -->
- <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${project.build.directory}/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
- <argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${version}.jar=foo=bar"</argLine>
+ <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${project.build.directory}/openejb-javaagent-${project.version}.jar=foo=bar</argLine>-->
+ <argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${project.version}.jar=foo=bar"</argLine>
<!--
<systemProperties>
<property>
@@ -86,45 +86,45 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-multicast</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
<scope>test</scope>
</dependency>
Modified: openejb/branches/openejb-3.1.x/server/openejb-hsql/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-hsql/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-hsql/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-hsql/pom.xml Thu Nov 18 04:57:46 2010
@@ -34,17 +34,17 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
Modified: openejb/branches/openejb-3.1.x/server/openejb-http/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-http/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-http/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-http/pom.xml Thu Nov 18 04:57:46 2010
@@ -62,8 +62,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- DEBUG: Uncomment this line and comment out the next -->
- <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${project.build.directory}/target/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
- <argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${version}.jar=foo=bar"</argLine>
+ <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${project.build.directory}/target/openejb-javaagent-${project.version}.jar=foo=bar</argLine>-->
+ <argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${project.version}.jar=foo=bar"</argLine>
<systemProperties>
<property>
<name>openejb.home</name>
@@ -84,22 +84,22 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -116,13 +116,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: openejb/branches/openejb-3.1.x/server/openejb-multicast/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-multicast/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-multicast/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-multicast/pom.xml Thu Nov 18 04:57:46 2010
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: openejb/branches/openejb-3.1.x/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-server/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-server/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-server/pom.xml Thu Nov 18 04:57:46 2010
@@ -66,17 +66,17 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified: openejb/branches/openejb-3.1.x/server/openejb-telnet/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-telnet/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-telnet/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-telnet/pom.xml Thu Nov 18 04:57:46 2010
@@ -38,17 +38,17 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: openejb/branches/openejb-3.1.x/server/openejb-webadmin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-webadmin/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-webadmin/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-webadmin/pom.xml Thu Nov 18 04:57:46 2010
@@ -56,8 +56,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- DEBUG: Uncomment this line and comment out the next -->
- <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${project.build.directory}/target/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
- <argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${version}.jar=foo=bar"</argLine>
+ <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${project.build.directory}/target/openejb-javaagent-${project.version}.jar=foo=bar</argLine>-->
+ <argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${project.version}.jar=foo=bar"</argLine>
<systemProperties>
<property>
<name>openejb.home</name>
@@ -78,32 +78,32 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-http</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: openejb/branches/openejb-3.1.x/server/openejb-webservices/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-webservices/pom.xml?rev=1036324&r1=1036323&r2=1036324&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-webservices/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-webservices/pom.xml Thu Nov 18 04:57:46 2010
@@ -33,22 +33,22 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-http</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>