You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/11/07 12:32:51 UTC
[2/3] tomee git commit: using project.version instead of
tomee.version for tomee modules
using project.version instead of tomee.version for tomee modules
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f4792499
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f4792499
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f4792499
Branch: refs/heads/master
Commit: f479249972c529bd70a4341568c27ab45ea6fb94
Parents: e88ea2f
Author: rmannibucau <rm...@apache.org>
Authored: Sun Nov 6 18:31:09 2016 +0100
Committer: rmannibucau <rm...@apache.org>
Committed: Sun Nov 6 18:31:09 2016 +0100
----------------------------------------------------------------------
tomee/apache-tomee/pom.xml | 2 +-
tomee/pom.xml | 30 +++++++++++++++---------------
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 +++++++-------
10 files changed, 47 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4792499/tomee/apache-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index b5ae4c2..bc3aba0 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>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4792499/tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/pom.xml b/tomee/pom.xml
index fdc9484..1e3d96a 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
@@ -120,7 +120,7 @@
<dependency> <!-- to avoid to force exclusions everywhere -->
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.openjpa</groupId>
@@ -168,7 +168,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core-hibernate</artifactId>
<type>pom</type>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
@@ -326,12 +326,12 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-client</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -342,27 +342,27 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-rest</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-http</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -372,12 +372,12 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-transport</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
@@ -392,17 +392,17 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core-eclipselink</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4792499/tomee/tomee-common/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/pom.xml b/tomee/tomee-common/pom.xml
index 87b4f67..04359dd 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>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.swizzle</groupId>
@@ -48,7 +48,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-client</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4792499/tomee/tomee-deb/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-deb/pom.xml b/tomee/tomee-deb/pom.xml
index 82eac83..a2b2f9b 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>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-hsql</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4792499/tomee/tomee-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-jdbc/pom.xml b/tomee/tomee-jdbc/pom.xml
index 0881a83..67c605d 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>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4792499/tomee/tomee-plume-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 9dc0ad2..5237a54 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>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-ssh</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
-->
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4792499/tomee/tomee-plus-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 69c46bf..a5611a4 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>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -66,7 +66,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-transport</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -78,7 +78,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -90,7 +90,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-rest</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -102,7 +102,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
@@ -150,13 +150,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-provisionning</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-ssh</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
-->
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4792499/tomee/tomee-webaccess/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml
index 1a8661f..1266f35 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>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4792499/tomee/tomee-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index 34a0f26..712cacc 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>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -191,7 +191,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -203,7 +203,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-hsql</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -215,7 +215,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-http</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -247,7 +247,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4792499/tomee/tomee-webservices/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webservices/pom.xml b/tomee/tomee-webservices/pom.xml
index 53588b7..bc7319c 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>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-rest</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>javax.xml.stream</groupId>
@@ -94,17 +94,17 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-http</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>