Author: andygumbrecht
Date: Mon May 5 09:15:27 2014
New Revision: 1592469
URL: http://svn.apache.org/r1592469
Log:
Version.
TomEE project cleanup
Modified:
tomee/tomee/trunk/examples/change-jaxws-url/pom.xml
tomee/tomee/trunk/examples/groovy-cdi/pom.xml
tomee/tomee/trunk/examples/groovy-spock/pom.xml
tomee/tomee/trunk/examples/lookup-of-ejbs-with-descriptor/pom.xml
tomee/tomee/trunk/examples/lookup-of-ejbs/pom.xml
tomee/tomee/trunk/tomee/apache-tomee/pom.xml
tomee/tomee/trunk/tomee/apache-tomee/src/main/resources/tomee.sh
tomee/tomee/trunk/tomee/pom.xml
tomee/tomee/trunk/tomee/tomee-catalina/pom.xml
tomee/tomee/trunk/tomee/tomee-common/pom.xml
tomee/tomee/trunk/tomee/tomee-deb/pom.xml
tomee/tomee/trunk/tomee/tomee-embedded/pom.xml
tomee/tomee/trunk/tomee/tomee-jaxrs-webapp/pom.xml
tomee/tomee/trunk/tomee/tomee-jaxrs/pom.xml
tomee/tomee/trunk/tomee/tomee-jdbc/pom.xml
tomee/tomee/trunk/tomee/tomee-loader/pom.xml
tomee/tomee/trunk/tomee/tomee-mojarra/pom.xml
tomee/tomee/trunk/tomee/tomee-plume-webapp/pom.xml
tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml
tomee/tomee/trunk/tomee/tomee-util/pom.xml
tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
tomee/tomee/trunk/tomee/tomee-webapp/pom.xml
tomee/tomee/trunk/tomee/tomee-webservices/pom.xml
Modified: tomee/tomee/trunk/examples/change-jaxws-url/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/change-jaxws-url/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/change-jaxws-url/pom.xml (original)
+++ tomee/tomee/trunk/examples/change-jaxws-url/pom.xml Mon May 5 09:15:27 2014
@@ -71,7 +71,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<configuration>
<tomeeVersion>${tomee.version}</tomeeVersion>
<tomeeClassifier>plus</tomeeClassifier>
Modified: tomee/tomee/trunk/examples/groovy-cdi/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/groovy-cdi/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/groovy-cdi/pom.xml (original)
+++ tomee/tomee/trunk/examples/groovy-cdi/pom.xml Mon May 5 09:15:27 2014
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.1.6</version>
+ <version>2.2.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/groovy-spock/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/groovy-spock/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/groovy-spock/pom.xml (original)
+++ tomee/tomee/trunk/examples/groovy-spock/pom.xml Mon May 5 09:15:27 2014
@@ -104,8 +104,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.1.0</version>
- <!-- spock doesn't work with 2.0.0-rc-4 -->
+ <version>2.2.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/lookup-of-ejbs-with-descriptor/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/lookup-of-ejbs-with-descriptor/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/lookup-of-ejbs-with-descriptor/pom.xml (original)
+++ tomee/tomee/trunk/examples/lookup-of-ejbs-with-descriptor/pom.xml Mon May
5 09:15:27 2014
@@ -40,8 +40,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
@@ -63,7 +63,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.1</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
Modified: tomee/tomee/trunk/examples/lookup-of-ejbs/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/lookup-of-ejbs/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/lookup-of-ejbs/pom.xml (original)
+++ tomee/tomee/trunk/examples/lookup-of-ejbs/pom.xml Mon May 5 09:15:27 2014
@@ -40,8 +40,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
@@ -63,7 +63,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.1</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
Modified: tomee/tomee/trunk/tomee/apache-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/apache-tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/apache-tomee/pom.xml Mon May 5 09:15:27 2014
@@ -20,21 +20,29 @@
<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";>
+
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
<version>1.6.1-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-tomee</artifactId>
<packaging>pom</packaging>
<name>OpenEJB :: TomEE :: Apache TomEE</name>
+ <properties>
+
<webprofile.work-dir>${project.build.directory}/webprofile-work-dir</webprofile.work-dir>
+ <plus.work-dir>${project.build.directory}/plus-work-dir</plus.work-dir>
+ <plume.work-dir>${project.build.directory}/plume-work-dir</plume.work-dir>
+ <jaxrs.work-dir>${project.build.directory}/jaxrs-work-dir</jaxrs.work-dir>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -50,7 +58,6 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
- <version>1.8.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -61,42 +68,40 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${openejb.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat</artifactId>
- <version>${tomcat.version}</version>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency> <!-- to be sure to have it -->
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-plus-webapp</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency> <!-- to be sure to have it -->
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-plume-webapp</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency> <!-- to be sure to have it -->
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-jaxrs-webapp</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
@@ -126,7 +131,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
<executions>
<execution>
<id>filter-resources</id>
@@ -140,7 +144,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<id>copy-tomcat-for-webprofile</id>
@@ -229,7 +232,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-jpa-integration</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
</dependencies>
<configuration>
@@ -381,7 +384,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>attach-artifacts</id>
@@ -439,12 +441,5 @@
</plugins>
</build>
- <properties>
-
<webprofile.work-dir>${project.build.directory}/webprofile-work-dir</webprofile.work-dir>
- <plus.work-dir>${project.build.directory}/plus-work-dir</plus.work-dir>
-
<plume.work-dir>${project.build.directory}/plume-work-dir</plume.work-dir>
-
<jaxrs.work-dir>${project.build.directory}/jaxrs-work-dir</jaxrs.work-dir>
- </properties>
-
</project>
Modified: tomee/tomee/trunk/tomee/apache-tomee/src/main/resources/tomee.sh
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/src/main/resources/tomee.sh?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/apache-tomee/src/main/resources/tomee.sh (original)
+++ tomee/tomee/trunk/tomee/apache-tomee/src/main/resources/tomee.sh Mon May 5
09:15:27 2014
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version="${openejb.version}"
+version="${version.openejb}"
port=8080
DEBUG=
Modified: tomee/tomee/trunk/tomee/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/pom.xml Mon May 5 09:15:27 2014
@@ -18,18 +18,25 @@
-->
<!-- $Rev$ $Date$ -->
-<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";>
+<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";>
+
<parent>
<artifactId>openejb</artifactId>
<groupId>org.apache.openejb</groupId>
<version>4.6.1-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee</artifactId>
<version>1.6.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenEJB :: TomEE</name>
+ <properties>
+ <version.openejb>4.6.1-SNAPSHOT</version.openejb>
+ </properties>
+
<modules>
<module>tomee-loader</module>
<module>tomee-catalina</module>
@@ -75,7 +82,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<exclusions>
<exclusion>
<groupId>org.apache.openejb</groupId>
@@ -116,7 +123,7 @@
<dependency> <!-- to avoid to force exclusions everywhere -->
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<exclusions>
<exclusion>
<groupId>org.apache.openjpa</groupId>
@@ -164,7 +171,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core-hibernate</artifactId>
<type>pom</type>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<exclusions>
<exclusion>
<groupId>org.apache.openejb</groupId>
@@ -196,5 +203,190 @@
</profile>
</profiles>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>3.5.1</version>
+ </dependency>
+ <dependency>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-dbcp</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina-ha</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ <version>${tomcat.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${org.apache.openwebbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-client</artifactId>
+ <version>${version.openejb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${version.openejb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-server</artifactId>
+ <version>${version.openejb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-ejbd</artifactId>
+ <version>${version.openejb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-rest</artifactId>
+ <version>${version.openejb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-cxf-rs</artifactId>
+ <version>${version.openejb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-http</artifactId>
+ <version>${version.openejb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat7-websocket</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-cxf-transport</artifactId>
+ <version>${version.openejb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-loader</artifactId>
+ <version>${version.openejb}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>javax.faces-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.faces</artifactId>
+ <version>${mojarra.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-webservices</artifactId>
+ <version>${version.openejb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-cxf</artifactId>
+ <version>${version.openejb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core-eclipselink</artifactId>
+ <version>${version.openejb}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
</project>
Modified: tomee/tomee/trunk/tomee/tomee-catalina/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/pom.xml Mon May 5 09:15:27 2014
@@ -26,20 +26,22 @@
<groupId>org.apache.openejb</groupId>
<version>1.6.1-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-catalina</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: TomEE :: Catalina</name>
<description>This module contains the classes that will be added to the
catalina class loader</description>
+
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
</plugin>
</plugins>
</reporting>
+
<build>
<plugins>
<plugin>
@@ -54,7 +56,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.0.1</version>
<configuration>
<linkXRef>true</linkXRef>
<sourceEncoding>utf-8</sourceEncoding>
@@ -89,55 +90,48 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-loader</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-server</artifactId>
- <version>${openejb.version}</version>
+ <artifactId>tomee-jdbc</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-ejbd</artifactId>
- <version>${openejb.version}</version>
+ <artifactId>openejb-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-http</artifactId>
- <version>${openejb.version}</version>
+ <artifactId>openejb-ejbd</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>tomee-jdbc</artifactId>
- <version>${tomee.version}</version>
+ <artifactId>openejb-http</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat7-websocket</artifactId>
- <version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-coyote</artifactId>
- <version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina-ha</artifactId>
- <version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: tomee/tomee/trunk/tomee/tomee-common/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-common/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-common/pom.xml Mon May 5 09:15:27 2014
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
<dependency>
<groupId>org.codehaus.swizzle</groupId>
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/tomee/tomee-deb/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/pom.xml Mon May 5 09:15:27 2014
@@ -63,13 +63,11 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
-
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -126,22 +124,22 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-hsql</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
</dependencies>
<build>
Modified: tomee/tomee/trunk/tomee/tomee-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-embedded/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-embedded/pom.xml Mon May 5 09:15:27 2014
@@ -19,17 +19,21 @@
<!-- $Rev: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec 2007) $ -->
-<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";>
+<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";>
+
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
<version>1.6.1-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-embedded</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: TomEE :: TomEE Embedded</name>
<version>1.6.1-SNAPSHOT</version>
+
<build>
<plugins>
<plugin>
@@ -66,28 +70,35 @@
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>tomee-catalina</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>tomee-myfaces</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>${org.apache.openwebbeans.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${openejb.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -99,51 +110,40 @@
<dependency>
<artifactId>commons-beanutils</artifactId>
<groupId>commons-beanutils</groupId>
- <version>1.8.3</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>1.2</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
- <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-dbcp</artifactId>
- <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcat.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina-ha</artifactId>
- <version>${tomcat.version}</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-coyote</artifactId>
- <version>${tomcat.version}</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
- <version>${tomcat.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -152,17 +152,14 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>3.5.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -174,30 +171,16 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${openejb.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>tomee-catalina</artifactId>
- <version>${tomee.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>tomee-myfaces</artifactId>
- <version>${tomee.version}</version>
- </dependency>
-
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
Modified: tomee/tomee/trunk/tomee/tomee-jaxrs-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-jaxrs-webapp/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-jaxrs-webapp/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-jaxrs-webapp/pom.xml Mon May 5 09:15:27 2014
@@ -35,13 +35,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webapp</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${openejb.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -53,7 +52,6 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-transport</artifactId>
- <version>${openejb.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -65,7 +63,6 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-rest</artifactId>
- <version>${openejb.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -77,7 +74,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-jaxrs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -92,7 +89,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.2</version>
<executions>
<execution>
<id>war</id>
@@ -112,6 +108,4 @@
</plugins>
</build>
-
-
</project>
\ No newline at end of file
Modified: tomee/tomee/trunk/tomee/tomee-jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-jaxrs/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-jaxrs/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-jaxrs/pom.xml Mon May 5 09:15:27 2014
@@ -33,60 +33,52 @@
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <classifier>tomcat</classifier>
+ <artifactId>tomee-loader</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-rest</artifactId>
- <version>${openejb.version}</version>
+ <artifactId>tomee-catalina</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-cxf-rs</artifactId>
- <version>${openejb.version}</version>
+ <artifactId>tomee-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>tomee-common</artifactId>
- <version>${tomee.version}</version>
+ <artifactId>javaee-api</artifactId>
+ <classifier>tomcat</classifier>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>tomee-loader</artifactId>
- <version>${tomee.version}</version>
+ <artifactId>openejb-rest</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>tomee-catalina</artifactId>
- <version>${tomee.version}</version>
+ <artifactId>openejb-cxf-rs</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-http</artifactId>
- <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-coyote</artifactId>
- <version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tomee/tomee/trunk/tomee/tomee-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-jdbc/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-jdbc/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-jdbc/pom.xml Mon May 5 09:15:27 2014
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/tomee/tomee-loader/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-loader/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-loader/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-loader/pom.xml Mon May 5 09:15:27 2014
@@ -19,33 +19,36 @@
<!-- $Rev: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec 2007) $ -->
-<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";>
+<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";>
+
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
<version>1.6.1-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-loader</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: TomEE :: Loader</name>
+
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${openejb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
+
</project>
Modified: tomee/tomee/trunk/tomee/tomee-mojarra/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-mojarra/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-mojarra/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-mojarra/pom.xml Mon May 5 09:15:27 2014
@@ -19,17 +19,25 @@
<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";>
+
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
<version>1.6.1-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-mojarra</artifactId>
<name>OpenEJB :: TomEE :: Mojarra</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>tomee-catalina</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
<!--
provided = in the webapp
since MyFaces is our default implementation
@@ -37,26 +45,16 @@
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.faces</artifactId>
- <version>${mojarra.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>javax.faces-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>tomee-catalina</artifactId>
- <version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: tomee/tomee/trunk/tomee/tomee-plume-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-plume-webapp/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-plume-webapp/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-plume-webapp/pom.xml Mon May 5 09:15:27 2014
@@ -19,7 +19,9 @@
<!-- $Rev: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec 2007) $ -->
-<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";>
+<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";>
+
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
@@ -27,6 +29,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
+
<artifactId>tomee-plume-webapp</artifactId>
<name>OpenEJB :: TomEE :: Plume Webapp</name>
<packaging>war</packaging>
@@ -36,19 +39,16 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core-eclipselink</artifactId>
- <version>${openejb.version}</version>
</dependency>
-
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.faces</artifactId>
- <version>${mojarra.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webapp</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
@@ -66,7 +66,6 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${openejb.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -78,7 +77,6 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-transport</artifactId>
- <version>${openejb.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -90,7 +88,6 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${openejb.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -102,12 +99,12 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <scope>runtime</scope> <!-- transitive from xerces but in test scope in
parent so needed here -->
+ <scope>runtime</scope>
+ <!-- transitive from xerces but in test scope in parent so needed here
-->
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-rest</artifactId>
- <version>${openejb.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -119,7 +116,6 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${openejb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.openejb</groupId>
@@ -131,7 +127,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -155,13 +151,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-provisionning</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ssh</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>runtime</scope>
</dependency>
-->
Modified: tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml Mon May 5 09:15:27 2014
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webapp</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-transport</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-rest</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<exclusions>
<exclusion>
<groupId>org.apache.openejb</groupId>
@@ -113,7 +113,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -137,13 +137,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-provisionning</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ssh</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>runtime</scope>
</dependency>
-->
Modified: tomee/tomee/trunk/tomee/tomee-util/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-util/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-util/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-util/pom.xml Mon May 5 09:15:27 2014
@@ -33,7 +33,6 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>4.6.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml Mon May 5 09:15:27 2014
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -181,13 +181,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/tomee/tomee-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webapp/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webapp/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webapp/pom.xml Mon May 5 09:15:27 2014
@@ -157,7 +157,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -169,7 +169,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-hsql</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-http</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -215,7 +215,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<exclusions>
<exclusion>
<groupId>org.apache.openejb</groupId>
@@ -226,7 +226,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-catalina</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -242,7 +242,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-myfaces</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -254,13 +254,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-mojarra</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -276,7 +276,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-loader</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: tomee/tomee/trunk/tomee/tomee-webservices/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webservices/pom.xml?rev=1592469&r1=1592468&r2=1592469&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webservices/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webservices/pom.xml Mon May 5 09:15:27 2014
@@ -52,22 +52,22 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-webservices</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-rest</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
<exclusions>
<exclusion>
<groupId>javax.xml.stream</groupId>
@@ -78,32 +78,32 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-loader</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-catalina</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-http</artifactId>
- <version>${openejb.version}</version>
+ <version>${version.openejb}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-jaxrs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
