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/21 22:50:13 UTC
[26/28] tomee git commit: Prep version
http://git-wip-us.apache.org/repos/asf/tomee/blob/40be966c/arquillian/arquillian-tomee-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index 218bfd3..9626d56 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -1,643 +1,643 @@
-<?xml version="1.0"?>
-<!-- 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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>arquillian</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>arquillian-tomee-tests</artifactId>
- <packaging>pom</packaging>
-
- <name>OpenEJB :: Arquillian Adaptors Parent :: Tests</name>
-
- <modules>
- <module>arquillian-tomee-webprofile-tests</module>
- <module>arquillian-tomee-jaxrs-tests</module>
- <module>arquillian-tomee-jaxws-tests</module>
- <module>arquillian-tomee-jms-tests</module>
- <module>arquillian-tomee-codi-tests</module>
- <module>arquillian-tomee-config-tests</module>
- </modules>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>2.0.0</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.2.4</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>ziplock</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>${version.arquillian}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
- <version>${version.shrinkwrap.descriptor}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-api-javaee</artifactId>
- <version>${version.shrinkwrap.descriptor}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>arquillian-tomee-embedded</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>arquillian-tomee-remote</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>arquillian-tomee-webapp-remote</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency> <!-- tomee-embedded needs it + dependencies but tomee-*-remote doesn't need dependencies so to avoid conflicts bringing it back here -->
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </dependency>
-
- <!-- just to get it in the correct order -->
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
- <classifier>webprofile</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat</artifactId>
- <version>${tomcat.version}</version>
- <type>zip</type>
- </dependency>
- </dependencies>
-
- <profiles>
-
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>test-tomee-embedded</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <systemPropertyVariables>
- <tomee.version>${tomee.version}</tomee.version>
- <arquillian.launch>tomee-embedded</arquillian.launch>
- <openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <skip>true</skip>
- <parallel>none</parallel>
- <threadCount>1</threadCount>
- <reuseForks>true</reuseForks>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>all-adapters</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>configure-adapters</id>
- <phase>test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>
- // goal: manage the profile-under-test property
- // -> set to webprofile use all distributions
- // -> set to plus use only plus
- // -> set to plume use only plume
- def props = project.properties
-
- def skip = props['maven.test.skip']
-
- props['skip.embedded'] = 'true'
- props['skip.remote.webprofile'] = 'true'
- props['skip.remote.plus'] = 'true'
- props['skip.remote.plume'] = 'true'
- props['skip.webapp.webprofile'] = 'true'
- props['skip.webapp.plus'] = 'true'
- props['skip.webapp.plume'] = 'true'
-
- if ("true" != skip) {
- def minProfile = props['profile-under-test']
-
- if ("webprofile" == minProfile) {
- props['skip.embedded'] = 'false'
- props['skip.remote.webprofile'] = 'false'
- props['skip.webapp.webprofile'] = 'false'
- props['skip.remote.plus'] = 'false'
- props['skip.webapp.plus'] = 'false'
- props['skip.remote.plume'] = 'false'
- props['skip.webapp.plume'] = 'false'
- } else if ("plus" == minProfile) {
- props['skip.embedded'] = 'false'
- props['skip.remote.plus'] = 'false'
- props['skip.webapp.plus'] = 'false'
- props['skip.remote.plume'] = props['skip.remote.plume'] ? props['skip.remote.plume'] : 'false'
- props['skip.webapp.plume'] = props['skip.webapp.plume'] ? props['skip.webapp.plume'] : 'false'
- }
- }
-
- println("Embedded adapter activated ? " + !Boolean.parseBoolean(props['skip.embedded']))
- println("Remote webprofile adapter activated ? " +
- !Boolean.parseBoolean(props['skip.remote.webprofile']))
- println("Remote plus adapter activated ? " + !Boolean.parseBoolean(props['skip.remote.plus']))
- println("Remote plume adapter activated ? " + !Boolean.parseBoolean(props['skip.remote.plume']))
- println("Webapp weprofile adapter activated ? " +
- !Boolean.parseBoolean(props['skip.webapp.webprofile']))
- println("Webapp plus adapter activated ? " + !Boolean.parseBoolean(props['skip.webapp.plus']))
- println("Webapp plume adapter activated ? " + !Boolean.parseBoolean(props['skip.webapp.plume']))
- </source>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>test-tomee-embedded</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${skip.embedded}</skip>
- <systemPropertyVariables>
- <tomee.version>${tomee.version}</tomee.version>
- <arquillian.launch>tomee-embedded</arquillian.launch>
- <openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
- </systemPropertyVariables>
- </configuration>
- </execution>
- <execution>
- <id>test-tomee-remote</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${skip.remote.webprofile}</skip>
- <systemPropertyVariables>
- <openejb.arquillian.debug>true</openejb.arquillian.debug>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.classifier>webprofile</tomee.classifier>
- <arquillian.launch>tomee-remote</arquillian.launch>
- <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
- </systemPropertyVariables>
- </configuration>
- </execution>
- <execution>
- <id>test-tomee-remote-plume</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${skip.remote.plume}</skip>
- <systemPropertyVariables>
- <openejb.arquillian.debug>true</openejb.arquillian.debug>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.classifier>plume</tomee.classifier>
- <arquillian.launch>tomee-remote</arquillian.launch>
- <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
- </systemPropertyVariables>
- <excludes>
- <exclude>**/AppComposerTest.java</exclude>
- </excludes>
- </configuration>
- </execution>
- <execution>
- <id>test-tomee-remote-plus</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${skip.remote.plus}</skip>
- <systemPropertyVariables>
- <openejb.arquillian.debug>true</openejb.arquillian.debug>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.classifier>plus</tomee.classifier>
- <arquillian.launch>tomee-remote</arquillian.launch>
- <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
- </systemPropertyVariables>
- </configuration>
- </execution>
- <execution>
- <id>test-tomee-webapp-remote</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${skip.webapp.webprofile}</skip>
- <systemPropertyVariables>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
- <tomee.artifactId>tomee-webapp</tomee.artifactId>
- <arquillian.launch>tomee-webapp</arquillian.launch>
- <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
- </systemPropertyVariables>
- </configuration>
- </execution>
- <execution>
- <id>test-tomee-webapp-remote-plus</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${skip.webapp.plus}</skip>
- <systemPropertyVariables>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
- <tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
- <arquillian.launch>tomee-webapp</arquillian.launch>
- <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
- </systemPropertyVariables>
- </configuration>
- </execution>
- <execution>
- <id>test-tomee-webapp-remote-plume</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${skip.webapp.plume}</skip>
- <systemPropertyVariables>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
- <tomee.artifactId>tomee-plume-webapp</tomee.artifactId>
- <arquillian.launch>tomee-webapp</arquillian.launch>
- <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
- </systemPropertyVariables>
- <excludes>
- <exclude>**/AppComposerTest.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <skip>true</skip>
- <parallel>none</parallel>
- <threadCount>1</threadCount>
- <reuseForks>true</reuseForks>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
-
- <profile>
- <id>buildbot</id>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>arquillian-tomee-embedded</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>arquillian-tomee-remote</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>arquillian-tomee-webapp-remote</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- just to get it in the correct order -->
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
- <classifier>webprofile</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
- <classifier>plus</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
- <classifier>plume</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>tomee-webapp</artifactId>
- <version>${tomee.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>tomee-plus-webapp</artifactId>
- <version>${tomee.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>tomee-plume-webapp</artifactId>
- <version>${tomee.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat</artifactId>
- <version>${tomcat.version}</version>
- <type>zip</type>
- </dependency>
-
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>test-tomee-embedded</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <systemPropertyVariables>
- <tomee.version>${tomee.version}</tomee.version>
- <arquillian.launch>tomee-embedded</arquillian.launch>
- <openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
- </systemPropertyVariables>
- </configuration>
- </execution>
-
- <!-- Remote against Web Profile, JAX-RS and Plus -->
-
- <execution>
- <id>test-tomee-remote-webprofile</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <systemPropertyVariables>
- <openejb.arquillian.debug>true</openejb.arquillian.debug>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.classifier>webprofile</tomee.classifier>
- <arquillian.launch>tomee-remote</arquillian.launch>
- <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
- </systemPropertyVariables>
- </configuration>
- </execution>
- <execution>
- <id>test-tomee-remote-plus</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <systemPropertyVariables>
- <openejb.arquillian.debug>true</openejb.arquillian.debug>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.classifier>plus</tomee.classifier>
- <arquillian.launch>tomee-remote</arquillian.launch>
- <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
- </systemPropertyVariables>
- </configuration>
- </execution>
- <execution>
- <id>test-tomee-remote-plume</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <systemPropertyVariables>
- <openejb.arquillian.debug>true</openejb.arquillian.debug>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.classifier>plume</tomee.classifier>
- <arquillian.launch>tomee-remote</arquillian.launch>
- <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
- </systemPropertyVariables>
- <excludes>
- <exclude>**/AppComposerTest.java</exclude>
- </excludes>
- </configuration>
- </execution>
-
- <!-- Tomcat + war against Web Profile, JAX-RS and Plus -->
-
- <execution>
- <id>test-tomee-webapp-remote-webprofile</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <systemPropertyVariables>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
- <tomee.artifactId>tomee-webapp</tomee.artifactId>
- <arquillian.launch>tomee-webapp</arquillian.launch>
- <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
- </systemPropertyVariables>
- </configuration>
- </execution>
- <execution>
- <id>test-tomee-webapp-remote-plus</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <systemPropertyVariables>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
- <tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
- <arquillian.launch>tomee-webapp</arquillian.launch>
- <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
- </systemPropertyVariables>
- </configuration>
- </execution>
- <execution>
- <id>test-tomee-webapp-remote-plume</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <systemPropertyVariables>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
- <tomee.artifactId>tomee-plume-webapp</tomee.artifactId>
- <arquillian.launch>tomee-webapp</arquillian.launch>
- <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
- </systemPropertyVariables>
- <excludes>
- <exclude>**/AppComposerTest.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <skip>true</skip>
- <parallel>none</parallel>
- <threadCount>1</threadCount>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
-
- <profile>
- <!--
- Added to make it easy to quickly verify if something "should" work
- -->
- <id>glassfish-embedded</id>
- <properties>
- <version.glassfish>3.1.2.2</version.glassfish>
- <version.arquillian.glassfish.embedded>1.0.0.CR4</version.arquillian.glassfish.embedded>
- <version.mockito>1.9.0</version.mockito>
- <version.maven.embedded.glassfish.plugin>3.1.1</version.maven.embedded.glassfish.plugin>
- <version.maven.war.plugin>2.1.1</version.maven.war.plugin>
- <version.maven.compiler.plugin>2.3.2</version.maven.compiler.plugin>
- <version.maven.failsafe.plugin>2.11</version.maven.failsafe.plugin>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>${version.arquillian}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.extras</groupId>
- <artifactId>glassfish-embedded-all</artifactId>
- <version>${version.glassfish}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-glassfish-embedded-3.1</artifactId>
- <version>${version.arquillian.glassfish.embedded}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <properties>
- <profile-under-test>webprofile</profile-under-test>
- </properties>
-</project>
+<?xml version="1.0"?>
+<!-- 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>arquillian</artifactId>
+ <groupId>org.apache.tomee</groupId>
+ <version>7.0.0-M1</version>
+ </parent>
+ <artifactId>arquillian-tomee-tests</artifactId>
+ <packaging>pom</packaging>
+
+ <name>OpenEJB :: Arquillian Adaptors Parent :: Tests</name>
+
+ <modules>
+ <module>arquillian-tomee-webprofile-tests</module>
+ <module>arquillian-tomee-jaxrs-tests</module>
+ <module>arquillian-tomee-jaxws-tests</module>
+ <module>arquillian-tomee-jms-tests</module>
+ <module>arquillian-tomee-codi-tests</module>
+ <module>arquillian-tomee-config-tests</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>javaee-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ <version>2.0.0</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.2.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>ziplock</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>${version.arquillian}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+ <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
+ <version>${version.shrinkwrap.descriptor}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+ <artifactId>shrinkwrap-descriptors-api-javaee</artifactId>
+ <version>${version.shrinkwrap.descriptor}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>arquillian-tomee-embedded</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>arquillian-tomee-webapp-remote</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency> <!-- tomee-embedded needs it + dependencies but tomee-*-remote doesn't need dependencies so to avoid conflicts bringing it back here -->
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>7.0.0-M1</version>
+ </dependency>
+
+ <!-- just to get it in the correct order -->
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <classifier>webprofile</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-tomee-embedded</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <systemPropertyVariables>
+ <tomee.version>${tomee.version}</tomee.version>
+ <arquillian.launch>tomee-embedded</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>true</skip>
+ <parallel>none</parallel>
+ <threadCount>1</threadCount>
+ <reuseForks>true</reuseForks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>all-adapters</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>configure-adapters</id>
+ <phase>test</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ // goal: manage the profile-under-test property
+ // -> set to webprofile use all distributions
+ // -> set to plus use only plus
+ // -> set to plume use only plume
+ def props = project.properties
+
+ def skip = props['maven.test.skip']
+
+ props['skip.embedded'] = 'true'
+ props['skip.remote.webprofile'] = 'true'
+ props['skip.remote.plus'] = 'true'
+ props['skip.remote.plume'] = 'true'
+ props['skip.webapp.webprofile'] = 'true'
+ props['skip.webapp.plus'] = 'true'
+ props['skip.webapp.plume'] = 'true'
+
+ if ("true" != skip) {
+ def minProfile = props['profile-under-test']
+
+ if ("webprofile" == minProfile) {
+ props['skip.embedded'] = 'false'
+ props['skip.remote.webprofile'] = 'false'
+ props['skip.webapp.webprofile'] = 'false'
+ props['skip.remote.plus'] = 'false'
+ props['skip.webapp.plus'] = 'false'
+ props['skip.remote.plume'] = 'false'
+ props['skip.webapp.plume'] = 'false'
+ } else if ("plus" == minProfile) {
+ props['skip.embedded'] = 'false'
+ props['skip.remote.plus'] = 'false'
+ props['skip.webapp.plus'] = 'false'
+ props['skip.remote.plume'] = props['skip.remote.plume'] ? props['skip.remote.plume'] : 'false'
+ props['skip.webapp.plume'] = props['skip.webapp.plume'] ? props['skip.webapp.plume'] : 'false'
+ }
+ }
+
+ println("Embedded adapter activated ? " + !Boolean.parseBoolean(props['skip.embedded']))
+ println("Remote webprofile adapter activated ? " +
+ !Boolean.parseBoolean(props['skip.remote.webprofile']))
+ println("Remote plus adapter activated ? " + !Boolean.parseBoolean(props['skip.remote.plus']))
+ println("Remote plume adapter activated ? " + !Boolean.parseBoolean(props['skip.remote.plume']))
+ println("Webapp weprofile adapter activated ? " +
+ !Boolean.parseBoolean(props['skip.webapp.webprofile']))
+ println("Webapp plus adapter activated ? " + !Boolean.parseBoolean(props['skip.webapp.plus']))
+ println("Webapp plume adapter activated ? " + !Boolean.parseBoolean(props['skip.webapp.plume']))
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-tomee-embedded</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${skip.embedded}</skip>
+ <systemPropertyVariables>
+ <tomee.version>${tomee.version}</tomee.version>
+ <arquillian.launch>tomee-embedded</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-tomee-remote</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${skip.remote.webprofile}</skip>
+ <systemPropertyVariables>
+ <openejb.arquillian.debug>true</openejb.arquillian.debug>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.classifier>webprofile</tomee.classifier>
+ <arquillian.launch>tomee-remote</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-tomee-remote-plume</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${skip.remote.plume}</skip>
+ <systemPropertyVariables>
+ <openejb.arquillian.debug>true</openejb.arquillian.debug>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.classifier>plume</tomee.classifier>
+ <arquillian.launch>tomee-remote</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ <excludes>
+ <exclude>**/AppComposerTest.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-tomee-remote-plus</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${skip.remote.plus}</skip>
+ <systemPropertyVariables>
+ <openejb.arquillian.debug>true</openejb.arquillian.debug>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.classifier>plus</tomee.classifier>
+ <arquillian.launch>tomee-remote</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-tomee-webapp-remote</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${skip.webapp.webprofile}</skip>
+ <systemPropertyVariables>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
+ <tomee.artifactId>tomee-webapp</tomee.artifactId>
+ <arquillian.launch>tomee-webapp</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-tomee-webapp-remote-plus</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${skip.webapp.plus}</skip>
+ <systemPropertyVariables>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
+ <tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
+ <arquillian.launch>tomee-webapp</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-tomee-webapp-remote-plume</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${skip.webapp.plume}</skip>
+ <systemPropertyVariables>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
+ <tomee.artifactId>tomee-plume-webapp</tomee.artifactId>
+ <arquillian.launch>tomee-webapp</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ <excludes>
+ <exclude>**/AppComposerTest.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>true</skip>
+ <parallel>none</parallel>
+ <threadCount>1</threadCount>
+ <reuseForks>true</reuseForks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+
+ <profile>
+ <id>buildbot</id>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>arquillian-tomee-embedded</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>arquillian-tomee-webapp-remote</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- just to get it in the correct order -->
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <classifier>webprofile</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <classifier>plus</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <classifier>plume</classifier>
+ <type>zip</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>tomee-webapp</artifactId>
+ <version>${tomee.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>tomee-plus-webapp</artifactId>
+ <version>${tomee.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>tomee-plume-webapp</artifactId>
+ <version>${tomee.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
+ <type>zip</type>
+ </dependency>
+
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-tomee-embedded</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <systemPropertyVariables>
+ <tomee.version>${tomee.version}</tomee.version>
+ <arquillian.launch>tomee-embedded</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+
+ <!-- Remote against Web Profile, JAX-RS and Plus -->
+
+ <execution>
+ <id>test-tomee-remote-webprofile</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <systemPropertyVariables>
+ <openejb.arquillian.debug>true</openejb.arquillian.debug>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.classifier>webprofile</tomee.classifier>
+ <arquillian.launch>tomee-remote</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-tomee-remote-plus</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <systemPropertyVariables>
+ <openejb.arquillian.debug>true</openejb.arquillian.debug>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.classifier>plus</tomee.classifier>
+ <arquillian.launch>tomee-remote</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-tomee-remote-plume</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <systemPropertyVariables>
+ <openejb.arquillian.debug>true</openejb.arquillian.debug>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.classifier>plume</tomee.classifier>
+ <arquillian.launch>tomee-remote</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ <excludes>
+ <exclude>**/AppComposerTest.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+
+ <!-- Tomcat + war against Web Profile, JAX-RS and Plus -->
+
+ <execution>
+ <id>test-tomee-webapp-remote-webprofile</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <systemPropertyVariables>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
+ <tomee.artifactId>tomee-webapp</tomee.artifactId>
+ <arquillian.launch>tomee-webapp</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-tomee-webapp-remote-plus</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <systemPropertyVariables>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
+ <tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
+ <arquillian.launch>tomee-webapp</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-tomee-webapp-remote-plume</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <systemPropertyVariables>
+ <tomee.version>${tomee.version}</tomee.version>
+ <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
+ <tomee.artifactId>tomee-plume-webapp</tomee.artifactId>
+ <arquillian.launch>tomee-webapp</arquillian.launch>
+ <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
+ </systemPropertyVariables>
+ <excludes>
+ <exclude>**/AppComposerTest.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>true</skip>
+ <parallel>none</parallel>
+ <threadCount>1</threadCount>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+
+ <profile>
+ <!--
+ Added to make it easy to quickly verify if something "should" work
+ -->
+ <id>glassfish-embedded</id>
+ <properties>
+ <version.glassfish>3.1.2.2</version.glassfish>
+ <version.arquillian.glassfish.embedded>1.0.0.CR4</version.arquillian.glassfish.embedded>
+ <version.mockito>1.9.0</version.mockito>
+ <version.maven.embedded.glassfish.plugin>3.1.1</version.maven.embedded.glassfish.plugin>
+ <version.maven.war.plugin>2.1.1</version.maven.war.plugin>
+ <version.maven.compiler.plugin>2.3.2</version.maven.compiler.plugin>
+ <version.maven.failsafe.plugin>2.11</version.maven.failsafe.plugin>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>${version.arquillian}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.extras</groupId>
+ <artifactId>glassfish-embedded-all</artifactId>
+ <version>${version.glassfish}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-glassfish-embedded-3.1</artifactId>
+ <version>${version.arquillian.glassfish.embedded}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+ <properties>
+ <profile-under-test>webprofile</profile-under-test>
+ </properties>
+</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/40be966c/arquillian/arquillian-tomee-webapp-remote/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml
index 736c21f..48f9bda 100644
--- a/arquillian/arquillian-tomee-webapp-remote/pom.xml
+++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.tomee</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>7.0.0-M1</version>
</parent>
<artifactId>arquillian-tomee-webapp-remote</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/tomee/blob/40be966c/arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/pom.xml b/arquillian/pom.xml
index a22eefc..abc9d8f 100644
--- a/arquillian/pom.xml
+++ b/arquillian/pom.xml
@@ -1,47 +1,47 @@
-<?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/xsd/maven-4.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>
-
- <artifactId>arquillian</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>OpenEJB :: Arquillian Adaptors Parent</name>
-
- <modules>
- <module>arquillian-common</module>
- <module>arquillian-tomee-common</module>
- <module>arquillian-openejb-transaction-provider</module>
- <module>arquillian-tomee-embedded</module>
- <module>arquillian-tomee-remote</module>
- <module>arquillian-tomee-webapp-remote</module>
- <module>arquillian-tomee-tests</module>
- <module>arquillian-tomee-moviefun-example</module>
- <module>arquillian-openejb-embedded</module>
- <module>ziplock</module>
- <module>arquillian-tck</module>
- </modules>
-</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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>tomee-project</artifactId>
+ <groupId>org.apache.tomee</groupId>
+ <version>7.0.0-M1</version>
+ </parent>
+
+ <artifactId>arquillian</artifactId>
+ <version>7.0.0-M1</version>
+ <packaging>pom</packaging>
+ <name>OpenEJB :: Arquillian Adaptors Parent</name>
+
+ <modules>
+ <module>arquillian-common</module>
+ <module>arquillian-tomee-common</module>
+ <module>arquillian-openejb-transaction-provider</module>
+ <module>arquillian-tomee-embedded</module>
+ <module>arquillian-tomee-remote</module>
+ <module>arquillian-tomee-webapp-remote</module>
+ <module>arquillian-tomee-tests</module>
+ <module>arquillian-tomee-moviefun-example</module>
+ <module>arquillian-openejb-embedded</module>
+ <module>ziplock</module>
+ <module>arquillian-tck</module>
+ </modules>
+</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/40be966c/arquillian/ziplock/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/ziplock/pom.xml b/arquillian/ziplock/pom.xml
index 18cb8f8..397473b 100644
--- a/arquillian/ziplock/pom.xml
+++ b/arquillian/ziplock/pom.xml
@@ -1,68 +1,68 @@
-<?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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>arquillian</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>ziplock</artifactId>
- <packaging>jar</packaging>
-
- <name>OpenEJB :: Arquillian Adaptors Parent :: ZipLock</name>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-api</artifactId>
- <version>${version.shrinkwrap.shrinkwrap}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>2.1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-jee</artifactId>
- <version>${openejb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- <version>${javaee-api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-impl-base</artifactId>
- <version>${version.shrinkwrap.shrinkwrap}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>arquillian</artifactId>
+ <groupId>org.apache.tomee</groupId>
+ <version>7.0.0-M1</version>
+ </parent>
+ <artifactId>ziplock</artifactId>
+ <packaging>jar</packaging>
+
+ <name>OpenEJB :: Arquillian Adaptors Parent :: ZipLock</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-api</artifactId>
+ <version>${version.shrinkwrap.shrinkwrap}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ <version>2.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>openejb-jee</artifactId>
+ <version>${openejb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>${javaee-api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ <version>${version.shrinkwrap.shrinkwrap}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/40be966c/assembly/openejb-lite/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/openejb-lite/pom.xml b/assembly/openejb-lite/pom.xml
index 801dada..1ffc133 100644
--- a/assembly/openejb-lite/pom.xml
+++ b/assembly/openejb-lite/pom.xml
@@ -1,96 +1,96 @@
-<?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.
--->
-
-<!-- $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">
- <parent>
- <artifactId>assembly</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-lite</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Assembly :: All In One EJB Lite jar</name>
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>lite</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <excludes>
- <exclude>*:*:sources</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>**/LICENSE.txt</exclude>
- <exclude>**/NOTICE.txt</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
-
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-jdk14</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</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.
+-->
+
+<!-- $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">
+ <parent>
+ <artifactId>assembly</artifactId>
+ <groupId>org.apache.tomee</groupId>
+ <version>7.0.0-M1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-lite</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Assembly :: All In One EJB Lite jar</name>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>lite</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createSourcesJar>true</createSourcesJar>
+ <useBaseVersion>true</useBaseVersion>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <artifactSet>
+ <excludes>
+ <exclude>*:*:sources</exclude>
+ </excludes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>**/LICENSE.txt</exclude>
+ <exclude>**/NOTICE.txt</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>javaee-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-jdk14</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+</project>
+