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/23 19:36:07 UTC
[2/5] tomee git commit: Inline openejb.version with tomee.version Big
pom.xml cleanup Many minor version updates
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
index 71c9c04..6c6cacb 100644
--- a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,151 +1,151 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific 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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <version>${version}</version>
- <packaging>war</packaging>
- <name>${artifactId} TomEE Webapp</name>
- <url>http://tomee.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- <version>7.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- to test with TomEE and Arquillian
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>arquillian-tomee-remote</artifactId>
- <version>[TOMEE]</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>1.1.5.Final</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- -->
-
- <!-- to test with OpenEJB embedded and Arquillian
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>arquillian-openejb-embedded</artifactId>
- <version>[OPENEJB]</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>1.1.5.Final</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- -->
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomee.maven</groupId>
- <artifactId>tomee-maven-plugin</artifactId>
- <version>[TOMEE]</version>
- <configuration>
- <context>ROOT</context>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <version>2.3.0</version>
- <configuration>
- <includes>**/entities/*.class</includes>
- <excludes>**/entities/XML*.class</excludes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- </configuration>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <!-- set the version to be the same as the level in your runtime -->
- <version>2.3.0</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <id>apache-snapshot</id>
- <name>Apache Snapshot Repository</name>
- <url>https://repository.apache.org/content/groups/snapshots/</url>
- </repository>
- </repositories>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+ <packaging>war</packaging>
+ <name>${artifactId} TomEE Webapp</name>
+ <url>http://tomee.apache.org</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>7.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- to test with TomEE and Arquillian
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>[TOMEE]</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>1.1.5.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ -->
+
+ <!-- to test with OpenEJB embedded and Arquillian
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>arquillian-openejb-embedded</artifactId>
+ <version>[OPENEJB]</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>1.1.5.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ -->
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomee.maven</groupId>
+ <artifactId>tomee-maven-plugin</artifactId>
+ <version>[TOMEE]</version>
+ <configuration>
+ <context>ROOT</context>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>2.4.0</version>
+ <configuration>
+ <includes>**/entities/*.class</includes>
+ <excludes>**/entities/XML*.class</excludes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+ <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>enhancer</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <!-- set the version to be the same as the level in your runtime -->
+ <version>2.4.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>apache-snapshot</id>
+ <name>Apache Snapshot Repository</name>
+ <url>https://repository.apache.org/content/groups/snapshots/</url>
+ </repository>
+ </repositories>
+
+</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 79f0226..48f49ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,12 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>17</version>
+ <relativePath><!--Resolve on repository--></relativePath>
</parent>
<groupId>org.apache.tomee</groupId>
<artifactId>tomee-project</artifactId>
<packaging>pom</packaging>
-
<version>7.0.0-SNAPSHOT</version>
<name>Apache OpenEJB</name>
@@ -91,8 +91,7 @@
</scm>
<properties>
- <openejb.version>7.0.0-SNAPSHOT</openejb.version>
- <tomee.version>7.0.0-SNAPSHOT</tomee.version>
+ <tomee.version>${project.version}</tomee.version>
<openjpa.version>2.4.0</openjpa.version>
<org.apache.openwebbeans.version>1.6.2</org.apache.openwebbeans.version>
@@ -153,7 +152,7 @@
<commons-dbcp.version>2.1</commons-dbcp.version>
<commons-pool.version>2.3</commons-pool.version>
<commons-collections.version>3.2.1</commons-collections.version>
- <commons-codec.version>1.9</commons-codec.version>
+ <commons-codec.version>1.10</commons-codec.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
<commons-discovery.version>0.5</commons-discovery.version>
<commons-lang3.version>3.4</commons-lang3.version>
@@ -163,7 +162,7 @@
<bval.version>1.1.0</bval.version>
<org.apache.activemq.version>5.12.0</org.apache.activemq.version>
<org.springframework.version>3.1.4.RELEASE</org.springframework.version>
- <junit.version>4.11</junit.version>
+ <junit.version>4.12</junit.version>
<org.apache.axis2.version>1.4.1</org.apache.axis2.version>
<scannotation.version>1.0.2</scannotation.version>
<geronimo.connector.version>3.1.3</geronimo.connector.version>
@@ -171,16 +170,16 @@
<geronimo-javamail_1.4_spec.version>1.8.4</geronimo-javamail_1.4_spec.version>
<myfaces.version>2.2.8</myfaces.version>
<mojarra.version>2.1.28</mojarra.version>
- <slf4j.version>1.7.7</slf4j.version>
+ <slf4j.version>1.7.10</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.0.1</log4j2.version>
<osgi.framework.version>4.2.0</osgi.framework.version>
<version.hsqldb>2.3.2</version.hsqldb>
<version.axiom>1.2.14</version.axiom>
<version.xalan>2.7.1</version.xalan>
- <version.hibernate>4.2.15.Final</version.hibernate>
+ <version.hibernate>4.2.18.Final</version.hibernate>
<version.eclipselink>2.4.2</version.eclipselink>
- <version.groovy>2.3.7</version.groovy>
+ <version.groovy>2.4.2</version.groovy>
<!-- arquillian related -->
<version.arquillian.bom>1.1.5.Final</version.arquillian.bom>
@@ -210,7 +209,7 @@
<dependency> <!-- java 8 NPE fix -->
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</dependency>
</dependencies>
</plugin>
@@ -227,12 +226,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -242,17 +241,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
+ <version>2.18.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.17</version>
+ <version>2.18.1</version>
</plugin>
<plugin> <!-- maven-dependency-plugin:properties doesn't work as well as this one for us -->
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -262,7 +261,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.swizzle</groupId>
@@ -277,12 +276,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.2</version>
+ <version>3.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -317,7 +316,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-doap-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
</plugin>
</plugins>
</pluginManagement>
@@ -427,7 +426,7 @@
<artifact>
<groupId>${project.groupId}</groupId>
<artifactId>tomee</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</artifact>
<doapOptions>
<programmingLanguage>Java</programmingLanguage>
@@ -778,235 +777,15 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
<version>${javaee-api.version}</version>
<classifier>tomcat</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.4_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaspic_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxr_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.3_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-osgi-locator</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
<version>${javaee-api.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.4_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaspic_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxr_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.3_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-osgi-locator</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
@@ -1553,7 +1332,7 @@
<dependency>
<artifactId>xmlsec</artifactId>
<groupId>org.apache.santuario</groupId>
- <version>1.5.7</version>
+ <version>1.5.8</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -1563,7 +1342,7 @@
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1662,7 +1441,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>0.12.0</version>
+ <version>0.14.0</version>
</dependency>
<dependency>
<groupId>jline</groupId>
@@ -1833,7 +1612,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.8.8</version>
+ <version>6.8.21</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1910,7 +1689,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>5.1.2.Final</version>
+ <version>5.1.3.Final</version>
<exclusions>
<exclusion>
<groupId>javax.validation</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-activemq/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-activemq/pom.xml b/server/openejb-activemq/pom.xml
index 55e9c70..5bd63ea 100644
--- a/server/openejb-activemq/pom.xml
+++ b/server/openejb-activemq/pom.xml
@@ -29,7 +29,7 @@
<name>OpenEJB :: Server :: ActiveMQ</name>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-axis/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-axis/pom.xml b/server/openejb-axis/pom.xml
index 5a71bda..081effd 100644
--- a/server/openejb-axis/pom.xml
+++ b/server/openejb-axis/pom.xml
@@ -61,7 +61,7 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-webservices</artifactId>
<version>${project.version}</version>
</dependency>
@@ -70,7 +70,7 @@
<artifactId>axis</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-itests-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-bonecp/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-bonecp/pom.xml b/server/openejb-bonecp/pom.xml
index 4f578bf..702034d 100644
--- a/server/openejb-bonecp/pom.xml
+++ b/server/openejb-bonecp/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-client/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml
index 6dc4e20..fc40799 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -21,15 +21,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>
+
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>openejb-client</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Server :: Client</name>
+
<properties>
<openejb.osgi.import.pkg>
javax.ejb,
@@ -125,9 +129,10 @@
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-common-cli/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-common-cli/pom.xml b/server/openejb-common-cli/pom.xml
index 20cd72f..683b5fb 100644
--- a/server/openejb-common-cli/pom.xml
+++ b/server/openejb-common-cli/pom.xml
@@ -36,7 +36,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-daemon/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-daemon/pom.xml b/server/openejb-daemon/pom.xml
index f37b188..e68b200 100644
--- a/server/openejb-daemon/pom.xml
+++ b/server/openejb-daemon/pom.xml
@@ -29,7 +29,7 @@
<name>OpenEJB :: Server :: Daemon</name>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-derbynet/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-derbynet/pom.xml b/server/openejb-derbynet/pom.xml
index cbf9625..0e8f19b 100644
--- a/server/openejb-derbynet/pom.xml
+++ b/server/openejb-derbynet/pom.xml
@@ -33,17 +33,17 @@
<name>OpenEJB :: Server :: Derby Network Service</name>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-ejbd/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-ejbd/pom.xml b/server/openejb-ejbd/pom.xml
index dba7366..4a3c250 100644
--- a/server/openejb-ejbd/pom.xml
+++ b/server/openejb-ejbd/pom.xml
@@ -21,15 +21,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>
+
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>openejb-ejbd</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Server :: EJBd</name>
+
<build>
<plugins>
<plugin>
@@ -45,7 +49,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-javaagent</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}</outputDirectory>
@@ -81,7 +85,7 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<dependency>
@@ -90,39 +94,39 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-multicast</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-itests-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>${project.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-hessian/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-hessian/pom.xml b/server/openejb-hessian/pom.xml
index 593a033..9506d8c 100644
--- a/server/openejb-hessian/pom.xml
+++ b/server/openejb-hessian/pom.xml
@@ -33,7 +33,7 @@ limitations under the License.
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-http</artifactId>
<version>7.0.0-SNAPSHOT</version>
<scope>provided</scope>
@@ -45,9 +45,9 @@ limitations under the License.
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-catalina</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-hsql/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-hsql/pom.xml b/server/openejb-hsql/pom.xml
index 23b40d4..ea4b8cd 100644
--- a/server/openejb-hsql/pom.xml
+++ b/server/openejb-hsql/pom.xml
@@ -33,17 +33,17 @@
<name>OpenEJB :: Server :: Hsql</name>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-http/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-http/pom.xml b/server/openejb-http/pom.xml
index 63d864e..658c0ce 100644
--- a/server/openejb-http/pom.xml
+++ b/server/openejb-http/pom.xml
@@ -21,21 +21,26 @@
<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>server</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ </parent>
+
<artifactId>openejb-http</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Server :: Http</name>
+
<properties>
<openejb.osgi.import.pkg>
org.mortbay*;resolution:=optional,
*
</openejb.osgi.import.pkg>
</properties>
+
<build>
<plugins>
<plugin>
@@ -51,7 +56,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-javaagent</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}</outputDirectory>
@@ -80,28 +85,29 @@
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-ejbd</artifactId>
<version>${project.version}</version>
</dependency>
@@ -118,7 +124,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-itests-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-multicast/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-multicast/pom.xml b/server/openejb-multicast/pom.xml
index c2df1f5..0bb0114 100644
--- a/server/openejb-multicast/pom.xml
+++ b/server/openejb-multicast/pom.xml
@@ -32,7 +32,7 @@
<name>OpenEJB :: Server :: Multicast Discovery</name>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-server/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml
index 0608707..1d9362c 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -60,26 +60,26 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-jee</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-client</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/openejb-webservices/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/pom.xml b/server/openejb-webservices/pom.xml
index baeb9e7..a12d246 100644
--- a/server/openejb-webservices/pom.xml
+++ b/server/openejb-webservices/pom.xml
@@ -32,22 +32,22 @@
<name>OpenEJB :: Server :: Webservices</name>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-http</artifactId>
<version>${project.version}</version>
</dependency>
@@ -59,7 +59,7 @@
<!-- spec dependencies -->
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 41a5abc..1f6cc27 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -18,15 +18,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>
+
<parent>
<artifactId>tomee-project</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>server</artifactId>
<packaging>pom</packaging>
<name>OpenEJB :: Server</name>
+
<modules>
<module>openejb-ejbd</module>
<module>openejb-server</module>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tck/bval-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml
index b259e5c..d1359a1 100644
--- a/tck/bval-embedded/pom.xml
+++ b/tck/bval-embedded/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<dependency>
@@ -54,7 +54,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>arquillian-openejb-embedded</artifactId>
<version>${project.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tck/bval-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml
index 1e4fdb7..3a10a36 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -28,14 +28,14 @@
<name>OpenEJB :: TCK :: Bean Validation TomEE</name>
<properties>
- <openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-${tomee.version}</openejb.home>
+ <openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-${project.version}</openejb.home>
<tck.version>1.1.3.Final</tck.version>
<validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tck-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -53,10 +53,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-tomee</artifactId>
<type>zip</type>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<classifier>webprofile</classifier>
<scope>test</scope>
</dependency>
@@ -66,9 +66,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tck/cdi-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index 2a2a691..fee1049 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<dependency>
@@ -77,9 +77,9 @@
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tck-common</artifactId>
- <version>${openejb.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -135,15 +135,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>arquillian-openejb-embedded</artifactId>
- <version>${openejb.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-catalina</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -153,15 +153,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${openejb.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${openejb.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tck/cdi-tomee-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee-embedded/pom.xml b/tck/cdi-tomee-embedded/pom.xml
index 0b6036b..749c08b 100644
--- a/tck/cdi-tomee-embedded/pom.xml
+++ b/tck/cdi-tomee-embedded/pom.xml
@@ -28,9 +28,9 @@
<name>OpenEJB :: TCK :: CDI-1.2 TomEE Embedded</name>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-embedded</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -38,7 +38,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tck-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -116,13 +116,13 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tck-common</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>cdi-tomee-embedded</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tck/cdi-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index d7f0bb2..3f24efb 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -44,15 +44,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
<version>${javaee-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>plus</classifier>
<scope>test</scope>
@@ -70,9 +70,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -93,15 +93,15 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tck-common</artifactId>
- <version>${openejb.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -140,21 +140,21 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-catalina</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-jaxrs</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -164,15 +164,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>${openejb.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>${openejb.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tck/tck-common/pom.xml
----------------------------------------------------------------------
diff --git a/tck/tck-common/pom.xml b/tck/tck-common/pom.xml
index c4f8c00..73ca13b 100644
--- a/tck/tck-common/pom.xml
+++ b/tck/tck-common/pom.xml
@@ -62,9 +62,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-util</artifactId>
- <version>${tomee.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tomee/apache-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index a52d2ca..0851d5c 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -71,21 +71,21 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-common</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency> <!-- to be sure to have it -->
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-plus-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency> <!-- to be sure to have it -->
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-plume-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
@@ -94,18 +94,19 @@
<!-- needed for EJBContainer impl so scope compile -->
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-client</artifactId>
- <version>${openejb.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
+ <version>${project.version}</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -232,7 +233,7 @@
<artifactId>groovy-maven-plugin</artifactId>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-jpa-integration</artifactId>
<version>${version.openejb}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy b/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
index 3241488..1350839 100644
--- a/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
+++ b/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
@@ -1,121 +1,118 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package commands
-
-import org.apache.tomee.installer.Installer
-import org.apache.tomee.installer.Paths
-import org.apache.tools.ant.taskdefs.optional.net.SetProxy
-
-class SetupCommand {
-
- def pom
- def log
- def project
- AntBuilder ant
- def properties
-
- def require(String name) {
- assert name != null
-
- def value = properties.getProperty(name)
- if (!value || value == 'null') value = project.properties.getProperty(name)
- if (!value || value == 'null') value = System.properties.getProperty(name)
- if (value == 'null') value = null
- log.debug("Require property $name = $value")
-
- if (!value) {
- throw new Exception("Missing required property: $name (resolved to null)" as String)
- }
- return value
- }
-
- def deleteWithRetry = {
- try {
- ant.delete(it)
- } catch (e) {
- log.warn("RETRY Deleting: ${it}")
- ant.delete(it)
- }
- }
-
- def execute() {
- String tomcatVersion = require('tomcat.version')
- System.setProperty('tomcat.version', tomcatVersion)
-
- String tomeeVersion = require('tomee.version')
- System.setProperty('tomee.version', tomeeVersion)
-
- String openejbVersion = require('openejb.version')
- System.setProperty('openejb.version', openejbVersion)
-
- String proxyHost = pom.settings.activeProxy?.host ?: ''
- String proxyPort = pom.settings.activeProxy?.port ?: ''
- if (proxyHost && proxyPort) {
- log.info("Setting proxy host=${proxyHost} and proxy port=${proxyPort}")
- new SetProxy(
- proxyHost: proxyHost,
- proxyPort: proxyPort as int,
- proxyUser: pom.settings.activeProxy.username ?: '',
- proxyPassword: pom.settings.activeProxy.password ?: '',
- nonProxyHosts: pom.settings.activeProxy.nonProxyHosts ?: ''
- ).execute()
- }
-
- def workDir = require('tomee.workdir')
- def webapp = require('tomee.webapp')
-
- def dest = "${workDir}/apache-tomcat-${tomcatVersion}.zip" as String
- def catalinaHome = "${workDir}/apache-tomcat-${tomcatVersion}" as String
- System.setProperty('catalina.home', catalinaHome)
- System.setProperty('catalina.base', catalinaHome)
-
- log.info("extracting ${catalinaHome}")
- ant.unzip(src: dest, dest: "${workDir}")
-
- log.info('Deploying the tomee war')
- def localRepo = pom.settings.localRepository
- ant.unzip(src: "${localRepo}/org/apache/tomee/${webapp}/${tomeeVersion}/${webapp}-${tomeeVersion}.war",
- dest: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee")
-
- log.info("Installing to: ${catalinaHome}")
-
-
- Paths paths = new Paths(new File("${catalinaHome}/webapps/tomee" as String))
- Installer installer = new Installer(paths, true)
- installer.installFull()
-
- // clean up duplicate jars since in TomEE it is useless
- // = gain of space ;)
- deleteWithRetry(file: paths.getJAXBImpl())
- deleteWithRetry(file: paths.getOpenEJBTomcatLoaderJar())
- deleteWithRetry(file: paths.findTomEELibJar('jaxb-impl'))
- deleteWithRetry(file: paths.findTomEELibJar("openejb-javaagent-${openejbVersion}.jar" as String))
- // we need the one without version
-
- deleteWithRetry(file: paths.findOpenEJBWebJar('tomee-loader'))
- deleteWithRetry(file: paths.findOpenEJBWebJar('swizzle-stream'))
-
- log.info('Assigning execute privileges to scripts in Tomcat bin directory')
- ant.chmod(dir: "${workDir}/apache-tomcat-${tomcatVersion}/bin", perm: 'u+x', includes: '**/*.sh')
-
- deleteWithRetry(dir: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/examples")
- deleteWithRetry(dir: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee")
- }
-}
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package commands
+
+import org.apache.tomee.installer.Installer
+import org.apache.tomee.installer.Paths
+import org.apache.tools.ant.taskdefs.optional.net.SetProxy
+
+class SetupCommand {
+
+ def pom
+ def log
+ def project
+ AntBuilder ant
+ def properties
+
+ def require(String name) {
+ assert name != null
+
+ def value = properties.getProperty(name)
+ if (!value || value == 'null') value = project.properties.getProperty(name)
+ if (!value || value == 'null') value = System.properties.getProperty(name)
+ if (value == 'null') value = null
+ log.debug("Require property $name = $value")
+
+ if (!value) {
+ throw new Exception("Missing required property: $name (resolved to null)" as String)
+ }
+ return value
+ }
+
+ def deleteWithRetry = {
+ try {
+ ant.delete(it)
+ } catch (e) {
+ log.warn("RETRY Deleting: ${it}")
+ ant.delete(it)
+ }
+ }
+
+ def execute() {
+ String tomcatVersion = require('tomcat.version')
+ System.setProperty('tomcat.version', tomcatVersion)
+
+ String tomeeVersion = require('tomee.version')
+ System.setProperty('tomee.version', tomeeVersion)
+
+ String proxyHost = pom.settings.activeProxy?.host ?: ''
+ String proxyPort = pom.settings.activeProxy?.port ?: ''
+ if (proxyHost && proxyPort) {
+ log.info("Setting proxy host=${proxyHost} and proxy port=${proxyPort}")
+ new SetProxy(
+ proxyHost: proxyHost,
+ proxyPort: proxyPort as int,
+ proxyUser: pom.settings.activeProxy.username ?: '',
+ proxyPassword: pom.settings.activeProxy.password ?: '',
+ nonProxyHosts: pom.settings.activeProxy.nonProxyHosts ?: ''
+ ).execute()
+ }
+
+ def workDir = require('tomee.workdir')
+ def webapp = require('tomee.webapp')
+
+ def dest = "${workDir}/apache-tomcat-${tomcatVersion}.zip" as String
+ def catalinaHome = "${workDir}/apache-tomcat-${tomcatVersion}" as String
+ System.setProperty('catalina.home', catalinaHome)
+ System.setProperty('catalina.base', catalinaHome)
+
+ log.info("extracting ${catalinaHome}")
+ ant.unzip(src: dest, dest: "${workDir}")
+
+ log.info('Deploying the tomee war')
+ def localRepo = pom.settings.localRepository
+ ant.unzip(src: "${localRepo}/org/apache/tomee/${webapp}/${tomeeVersion}/${webapp}-${tomeeVersion}.war",
+ dest: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee")
+
+ log.info("Installing to: ${catalinaHome}")
+
+
+ Paths paths = new Paths(new File("${catalinaHome}/webapps/tomee" as String))
+ Installer installer = new Installer(paths, true)
+ installer.installFull()
+
+ // clean up duplicate jars since in TomEE it is useless
+ // = gain of space ;)
+ deleteWithRetry(file: paths.getJAXBImpl())
+ deleteWithRetry(file: paths.getOpenEJBTomcatLoaderJar())
+ deleteWithRetry(file: paths.findTomEELibJar('jaxb-impl'))
+ deleteWithRetry(file: paths.findTomEELibJar("openejb-javaagent-${tomeeVersion}.jar" as String))
+ // we need the one without version
+
+ deleteWithRetry(file: paths.findOpenEJBWebJar('tomee-loader'))
+ deleteWithRetry(file: paths.findOpenEJBWebJar('swizzle-stream'))
+
+ log.info('Assigning execute privileges to scripts in Tomcat bin directory')
+ ant.chmod(dir: "${workDir}/apache-tomcat-${tomcatVersion}/bin", perm: 'u+x', includes: '**/*.sh')
+
+ deleteWithRetry(dir: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/examples")
+ deleteWithRetry(dir: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee")
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/pom.xml b/tomee/pom.xml
index fa3da08..0b17ff1 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -81,12 +81,12 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${version.openejb}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
<exclusion>
@@ -122,7 +122,7 @@
</activation>
<dependencies>
<dependency> <!-- to avoid to force exclusions everywhere -->
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${version.openejb}</version>
<exclusions>
@@ -139,7 +139,7 @@
<artifactId>bval-jsr303</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
<exclusion>
@@ -169,13 +169,13 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core-hibernate</artifactId>
<type>pom</type>
<version>${version.openejb}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
<exclusion>
@@ -328,12 +328,12 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-client</artifactId>
<version>${version.openejb}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${version.openejb}</version>
</dependency>
@@ -344,27 +344,27 @@
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
<version>${version.openejb}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-ejbd</artifactId>
<version>${version.openejb}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-rest</artifactId>
<version>${version.openejb}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
<version>${version.openejb}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-http</artifactId>
<version>${version.openejb}</version>
</dependency>
@@ -374,12 +374,12 @@
<version>${tomcat.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-transport</artifactId>
<version>${version.openejb}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
<version>${version.openejb}</version>
</dependency>
@@ -394,17 +394,17 @@
<version>${mojarra.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-webservices</artifactId>
<version>${version.openejb}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf</artifactId>
<version>${version.openejb}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core-eclipselink</artifactId>
<version>${version.openejb}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tomee/tomee-catalina/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/pom.xml b/tomee/tomee-catalina/pom.xml
index baa669e..447be59 100644
--- a/tomee/tomee-catalina/pom.xml
+++ b/tomee/tomee-catalina/pom.xml
@@ -58,40 +58,40 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
<classifier>tomcat</classifier>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-loader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-jdbc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-juli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-ejbd</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-http</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tomee/tomee-common/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/pom.xml b/tomee/tomee-common/pom.xml
index 818d2d2..c42841e 100644
--- a/tomee/tomee-common/pom.xml
+++ b/tomee/tomee-common/pom.xml
@@ -32,7 +32,7 @@
<description>This module contains the classes that will be added to the common class loader</description>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
<version>${version.openejb}</version>
</dependency>
@@ -45,7 +45,7 @@
<artifactId>xbean-naming</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-client</artifactId>
<version>${version.openejb}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tomee/tomee-deb/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-deb/pom.xml b/tomee/tomee-deb/pom.xml
index 9505a44..e7ca8c0 100644
--- a/tomee/tomee-deb/pom.xml
+++ b/tomee/tomee-deb/pom.xml
@@ -59,7 +59,7 @@
<!-- We need to be sure the ZIP files are built before the debian package. -->
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-tomee</artifactId>
<version>${project.version}</version>
<type>pom</type>
@@ -67,22 +67,22 @@
<!-- We use resources from these guys below. -->
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${version.openejb}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf</artifactId>
<version>${version.openejb}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
<version>${version.openejb}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-hsql</artifactId>
<version>${version.openejb}</version>
</dependency>
@@ -102,7 +102,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-tomee</artifactId>
<version>${project.version}</version>
<classifier>plus</classifier>
@@ -111,7 +111,7 @@
<destFileName>tomee-plus.zip</destFileName>
</artifactItem>
<artifactItem>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-tomee</artifactId>
<version>${project.version}</version>
<classifier>webprofile</classifier>
@@ -120,7 +120,7 @@
<destFileName>tomee-webprofile.zip</destFileName>
</artifactItem>
<artifactItem>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-tomee</artifactId>
<version>${project.version}</version>
<classifier>plume</classifier>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tomee/tomee-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml
index 7e98baf..2d11d4d 100644
--- a/tomee/tomee-embedded/pom.xml
+++ b/tomee/tomee-embedded/pom.xml
@@ -103,13 +103,13 @@
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-catalina</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<artifactId>javaee-api</artifactId>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
</exclusion>
<exclusion>
<artifactId>tomcat-annotations-api</artifactId>
@@ -118,12 +118,12 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
<scope>compile</scope>
<classifier>tomcat</classifier>
@@ -134,7 +134,7 @@
<version>${tomcat.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-myfaces</artifactId>
<version>${project.version}</version>
</dependency>
@@ -148,7 +148,7 @@
<artifactId>myfaces-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<scope>compile</scope>
<exclusions>
@@ -158,7 +158,7 @@
</exclusion>
<exclusion>
<artifactId>javaee-api</artifactId>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
</exclusion>
<exclusion>
<artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
@@ -281,17 +281,17 @@
<artifactId>velocity</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-client</artifactId>
<exclusions>
<exclusion>
<artifactId>javaee-api</artifactId>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency> <!-- now in webprofile -->
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-jaxrs</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tomee/tomee-jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-jaxrs/pom.xml b/tomee/tomee-jaxrs/pom.xml
index 9485499..f9ec1b4 100644
--- a/tomee/tomee-jaxrs/pom.xml
+++ b/tomee/tomee-jaxrs/pom.xml
@@ -32,43 +32,43 @@
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-loader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-catalina</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
<classifier>tomcat</classifier>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-rest</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-cxf-rs</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-server</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-ejbd</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-http</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tomee/tomee-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-jdbc/pom.xml b/tomee/tomee-jdbc/pom.xml
index 92668d2..c11a96b 100644
--- a/tomee/tomee-jdbc/pom.xml
+++ b/tomee/tomee-jdbc/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${version.openejb}</version>
<scope>provided</scope>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tomee/tomee-loader/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-loader/pom.xml b/tomee/tomee-loader/pom.xml
index d4d1388..ea13935 100644
--- a/tomee/tomee-loader/pom.xml
+++ b/tomee/tomee-loader/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
</dependency>
<dependency>
@@ -51,7 +51,7 @@
</dependency>
<!--The order of the next two deps is important-->
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-juli</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
@@ -63,7 +63,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-common</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/6f071cbe/tomee/tomee-mojarra/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-mojarra/pom.xml b/tomee/tomee-mojarra/pom.xml
index 238ab68..3cc0f73 100644
--- a/tomee/tomee-mojarra/pom.xml
+++ b/tomee/tomee-mojarra/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tomee-catalina</artifactId>
<version>${project.version}</version>
<scope>provided</scope>