You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/09/25 14:34:18 UTC
tomee git commit: Align version properties
Repository: tomee
Updated Branches:
refs/heads/master 1e9e03a53 -> 9fb577a69
Align version properties
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9fb577a6
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9fb577a6
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9fb577a6
Branch: refs/heads/master
Commit: 9fb577a69950b149bc793f00bf4f2bbb07f97844
Parents: 1e9e03a
Author: andygumbrecht@apache.org <an...@gmx.de>
Authored: Fri Sep 25 14:34:01 2015 +0200
Committer: andygumbrecht@apache.org <an...@gmx.de>
Committed: Fri Sep 25 14:34:01 2015 +0200
----------------------------------------------------------------------
arquillian/arquillian-tomee-tests/pom.xml | 5 ++-
examples/datasource-versioning/pom.xml | 7 ++--
examples/deltaspike-fullstack/pom.xml | 9 ++---
examples/moviefun-rest/pom.xml | 11 +++++-
examples/mtom/pom.xml | 8 ++--
examples/polling-parent/polling-web/pom.xml | 7 ++--
examples/polling-parent/pom.xml | 27 +++++++------
examples/quartz-app/pom.xml | 10 ++++-
examples/resources-jmx-example/pom.xml | 14 ++++---
.../resources-jmx-ejb/pom.xml | 8 ++--
tomee/apache-tomee/pom.xml | 2 +-
tomee/apache-tomee/src/main/resources/tomee.sh | 2 +-
tomee/pom.xml | 40 +++++++++-----------
tomee/tomee-common/pom.xml | 4 +-
tomee/tomee-deb/pom.xml | 8 ++--
tomee/tomee-jdbc/pom.xml | 2 +-
tomee/tomee-plume-webapp/pom.xml | 4 +-
tomee/tomee-plus-webapp/pom.xml | 14 +++----
tomee/tomee-webaccess/pom.xml | 6 +--
tomee/tomee-webapp/pom.xml | 10 ++---
tomee/tomee-webservices/pom.xml | 14 +++----
21 files changed, 114 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/arquillian/arquillian-tomee-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index 561ed95..bc613fb 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -11,12 +11,15 @@
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.0.0-SNAPSHOT</version>
</parent>
+
<artifactId>arquillian-tomee-tests</artifactId>
<packaging>pom</packaging>
@@ -116,7 +119,7 @@
<dependency> <!-- tomee-embedded needs it + dependencies but tomee-*-remote doesn't need dependencies so to avoid conflicts bringing it back here -->
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<!-- just to get it in the correct order -->
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/examples/datasource-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/examples/datasource-versioning/pom.xml b/examples/datasource-versioning/pom.xml
index 282503c..9a4bbe5 100644
--- a/examples/datasource-versioning/pom.xml
+++ b/examples/datasource-versioning/pom.xml
@@ -18,6 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.superbiz</groupId>
<artifactId>datasource-versioning</artifactId>
<packaging>jar</packaging>
@@ -26,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.tomee>7.0.0-SNAPSHOT</version.tomee>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
</properties>
<build>
@@ -44,7 +45,7 @@
<plugin>
<groupId>org.apache.tomee.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
<configuration>
<tomeeClassifier>plus</tomeeClassifier>
<args>-Xmx512m -XX:PermSize=256m</args>
@@ -136,7 +137,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/examples/deltaspike-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml
index 4cf0d0a..9079ccc 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -25,8 +25,7 @@
<version.myfaces2>2.2.7</version.myfaces2>
<version.deltaspike>1.3.0</version.deltaspike>
<version.extval>2.0.8</version.extval>
- <version.openejb>7.0.0-SNAPSHOT</version.openejb>
- <version.tomee>7.0.0-SNAPSHOT</version.tomee>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
</properties>
<build>
@@ -61,7 +60,7 @@
<plugin>
<groupId>org.apache.tomee.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
<configuration>
<context>ROOT</context>
<simpleLog>true</simpleLog>
@@ -70,7 +69,7 @@
<plugin>
<groupId>org.apache.tomee.maven</groupId>
<artifactId>tomee-embedded-maven-plugin</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
<configuration>
<classpathAsWar>true</classpathAsWar>
</configuration>
@@ -116,7 +115,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/examples/moviefun-rest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index d19e433..e169dd3 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -15,17 +15,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.superbiz</groupId>
<artifactId>moviefun-rest</artifactId>
<packaging>war</packaging>
<version>1.1.0-SNAPSHOT</version>
<name>OpenEJB :: Web Examples :: Moviefun Rest</name>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomee.version>7.0.0-SNAPSHOT</tomee.version>
<version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
- <version.openejb>7.0.0-SNAPSHOT</version.openejb>
</properties>
+
<repositories>
<repository>
<id>apache-m2-snapshot</id>
@@ -33,6 +35,7 @@
<url>https://repository.apache.org/content/groups/snapshots</url>
</repository>
</repositories>
+
<pluginRepositories>
<pluginRepository>
<id>apache-m2-snapshot</id>
@@ -40,6 +43,7 @@
<url>https://repository.apache.org/content/groups/snapshots</url>
</pluginRepository>
</pluginRepositories>
+
<build>
<finalName>moviefun</finalName>
<plugins>
@@ -129,6 +133,7 @@
</plugin>
</plugins>
</build>
+
<dependencyManagement>
<dependencies>
<!-- Override dependency resolver with test version. This must go *BEFORE*
@@ -150,6 +155,7 @@
</dependency>
</dependencies>
</dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.tomee</groupId>
@@ -172,7 +178,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -277,6 +283,7 @@
</dependencies>
</profile>
</profiles>
+
<!-- This section allows you to configure where to publish libraries for
sharing. It is not required and may be deleted. For more information see:
http://maven.apache.org/plugins/maven-deploy-plugin/ -->
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/examples/mtom/pom.xml
----------------------------------------------------------------------
diff --git a/examples/mtom/pom.xml b/examples/mtom/pom.xml
index add88d1..6ba3d4f 100644
--- a/examples/mtom/pom.xml
+++ b/examples/mtom/pom.xml
@@ -28,7 +28,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.openejb>7.0.0-SNAPSHOT</version.openejb>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
</properties>
<repositories>
@@ -57,19 +57,19 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-junit</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-mockito</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/examples/polling-parent/polling-web/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-web/pom.xml b/examples/polling-parent/polling-web/pom.xml
index 2e0a5a4..9fceb25 100644
--- a/examples/polling-parent/polling-web/pom.xml
+++ b/examples/polling-parent/polling-web/pom.xml
@@ -19,12 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<artifactId>polling-parent</artifactId>
<groupId>jug</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>polling-web</artifactId>
<name>OpenEJB :: Examples :: Polling :: Web</name>
@@ -79,7 +80,7 @@
<plugin>
<groupId>org.apache.tomee.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -94,7 +95,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
- <configuration> <!-- arquillian tomee embedded and can openejb conflicts since first one is suite scoped -->
+ <configuration> <!-- arquillian tomee embedded and openejb can conflict, since first one is suite scoped -->
<reuseForks>false</reuseForks>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/examples/polling-parent/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/pom.xml b/examples/polling-parent/pom.xml
index 36e67ff..23b1d32 100644
--- a/examples/polling-parent/pom.xml
+++ b/examples/polling-parent/pom.xml
@@ -26,6 +26,12 @@
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenEJB :: Examples :: Polling</name>
+
+ <properties>
+ <xbean.version>4.4</xbean.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
+ </properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -82,7 +88,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-api</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
@@ -90,13 +96,13 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
@@ -104,19 +110,19 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-embedded</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>ziplock</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -159,14 +165,7 @@
<version>1.3.4</version>
</dependency>
</dependencies>
- </dependencyManagement>
-
- <properties>
- <xbean.version>4.0</xbean.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.tomee>7.0.0-SNAPSHOT</version.tomee>
- <version.openejb>7.0.0-SNAPSHOT</version.openejb>
- </properties>
+ </dependencyManagement>
<!--
This section allows you to configure where to publish libraries for sharing.
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/examples/quartz-app/pom.xml
----------------------------------------------------------------------
diff --git a/examples/quartz-app/pom.xml b/examples/quartz-app/pom.xml
index 671b973..da00a57 100644
--- a/examples/quartz-app/pom.xml
+++ b/examples/quartz-app/pom.xml
@@ -19,19 +19,23 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.superbiz.quartz</groupId>
<artifactId>quartz-app</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenEJB :: Examples :: Quartz</name>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.openejb>7.0.0-SNAPSHOT</version.openejb>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
</properties>
+
<modules>
<module>quartz-ra</module>
<module>quartz-beans</module>
</modules>
+
<repositories>
<repository>
<id>apache-m2-snapshot</id>
@@ -39,6 +43,7 @@
<url>https://repository.apache.org/content/groups/snapshots/</url>
</repository>
</repositories>
+
<build>
<defaultGoal>install</defaultGoal>
<pluginManagement>
@@ -60,6 +65,7 @@
</plugins>
</pluginManagement>
</build>
+
<dependencyManagement>
<dependencies>
<!--
@@ -78,7 +84,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/examples/resources-jmx-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/resources-jmx-example/pom.xml b/examples/resources-jmx-example/pom.xml
index 4eb983d..58c1850 100644
--- a/examples/resources-jmx-example/pom.xml
+++ b/examples/resources-jmx-example/pom.xml
@@ -30,8 +30,13 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.tomee>7.0.0-SNAPSHOT</version.tomee>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
</properties>
+
+ <modules>
+ <module>resources-jmx-ejb</module>
+ <module>resources-jmx-ear</module>
+ </modules>
<repositories>
<repository>
@@ -69,15 +74,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
</plugin>
</plugins>
</pluginManagement>
</build>
- <modules>
- <module>resources-jmx-ejb</module>
- <module>resources-jmx-ear</module>
- </modules>
+
<dependencyManagement>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
index 207d968..76d2bd5 100644
--- a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
+++ b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
@@ -21,11 +21,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.superbiz</groupId>
<artifactId>resources-jmx</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
+
<artifactId>resources-jmx-ejb</artifactId>
<packaging>ejb</packaging>
<name>OpenEJB :: Examples :: Resources/JMX Example :: EJB Module</name>
@@ -60,13 +62,13 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-provisionning</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -78,7 +80,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>ziplock</artifactId>
- <version>${version.tomee}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/tomee/apache-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 0851d5c..fb29423 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -235,7 +235,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-jpa-integration</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/tomee/apache-tomee/src/main/resources/tomee.sh
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/main/resources/tomee.sh b/tomee/apache-tomee/src/main/resources/tomee.sh
index e5e09cf..5bd1795 100644
--- a/tomee/apache-tomee/src/main/resources/tomee.sh
+++ b/tomee/apache-tomee/src/main/resources/tomee.sh
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version="${version.openejb}"
+version="${tomee.version}"
DEBUG=
#DEBUG="-Xnoagent -Djava.compiler=NONE -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/pom.xml b/tomee/pom.xml
index 0b17ff1..0909182 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -21,22 +21,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<artifactId>tomee-project</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.0.0-SNAPSHOT</version>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>tomee</artifactId>
- <version>7.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenEJB :: TomEE</name>
- <properties>
- <version.openejb>7.0.0-SNAPSHOT</version.openejb>
- </properties>
-
<modules>
<module>tomee-loader</module>
<module>tomee-catalina</module>
@@ -83,7 +79,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
@@ -124,7 +120,7 @@
<dependency> <!-- to avoid to force exclusions everywhere -->
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.openjpa</groupId>
@@ -172,7 +168,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core-hibernate</artifactId>
<type>pom</type>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
@@ -330,12 +326,12 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-client</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -346,27 +342,27 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-rest</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-http</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -376,12 +372,12 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-transport</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
@@ -396,17 +392,17 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core-eclipselink</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/tomee/tomee-common/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/pom.xml b/tomee/tomee-common/pom.xml
index 0fd27bd..6061228 100644
--- a/tomee/tomee-common/pom.xml
+++ b/tomee/tomee-common/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.swizzle</groupId>
@@ -48,7 +48,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-client</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/tomee/tomee-deb/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-deb/pom.xml b/tomee/tomee-deb/pom.xml
index 8904ccc..721ef1a 100644
--- a/tomee/tomee-deb/pom.xml
+++ b/tomee/tomee-deb/pom.xml
@@ -69,22 +69,22 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-hsql</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/tomee/tomee-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-jdbc/pom.xml b/tomee/tomee-jdbc/pom.xml
index c11a96b..8fb881b 100644
--- a/tomee/tomee-jdbc/pom.xml
+++ b/tomee/tomee-jdbc/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/tomee/tomee-plume-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 0778420..dd74603 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -151,13 +151,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-provisionning</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-ssh</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
</dependency>
-->
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/tomee/tomee-plus-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 64b2391..09e5e7a 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -66,7 +66,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-transport</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -78,7 +78,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -90,7 +90,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-rest</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -102,7 +102,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
@@ -150,13 +150,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-provisionning</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-ssh</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
</dependency>
-->
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/tomee/tomee-webaccess/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml
index 2e16c34..9271621 100644
--- a/tomee/tomee-webaccess/pom.xml
+++ b/tomee/tomee-webaccess/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/tomee/tomee-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index 58cf9b2..1e0a66b 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -179,7 +179,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-client</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -191,7 +191,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -203,7 +203,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-hsql</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -215,7 +215,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-http</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -247,7 +247,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9fb577a6/tomee/tomee-webservices/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webservices/pom.xml b/tomee/tomee-webservices/pom.xml
index 74f3dd3..0ae18ac 100644
--- a/tomee/tomee-webservices/pom.xml
+++ b/tomee/tomee-webservices/pom.xml
@@ -53,22 +53,22 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-rest</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
<exclusions>
<exclusion>
<groupId>javax.xml.stream</groupId>
@@ -94,17 +94,17 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-http</artifactId>
- <version>${version.openejb}</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>