You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2019/07/22 13:07:08 UTC

[tomee] 09/31: Revert "TOMEE-2354 - Added TomEE Plus container to execute TCK with MicroProfile Config."

This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch tomee8-java11
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit ecaedc4d2e5e5637dd157786ae7f7bdb0187c47b
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 01:22:48 2018 +0000

    Revert "TOMEE-2354 - Added TomEE Plus container to execute TCK with MicroProfile Config."
    
    This reverts commit 2c51e9cd4e5c1419e5d2f1f311c5d900eb58cbcb.
---
 tck/microprofile-tck/config/pom.xml                | 30 +++-------------------
 .../config/src/test/resources/arquillian.xml       |  2 +-
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index 7888f3b..4cb8e45 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -34,6 +34,9 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <dependenciesToScan>
+            <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
+          </dependenciesToScan>
           <environmentVariables>
             <my_int_property>45</my_int_property>
             <MY_BOOLEAN_PROPERTY>true</MY_BOOLEAN_PROPERTY>
@@ -41,33 +44,6 @@
             <MY_STRING_PROPERTY>woohoo</MY_STRING_PROPERTY>
           </environmentVariables>
         </configuration>
-        <executions>
-          <execution>
-            <id>tomee-microprofile</id>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <dependenciesToScan>
-                <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
-              </dependenciesToScan>
-            </configuration>
-          </execution>
-          <execution>
-            <id>tomee-plus</id>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <dependenciesToScan>
-                <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
-              </dependenciesToScan>
-              <systemPropertyVariables>
-                <arquillian.launch>tomee-plus</arquillian.launch>
-              </systemPropertyVariables>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/tck/microprofile-tck/config/src/test/resources/arquillian.xml b/tck/microprofile-tck/config/src/test/resources/arquillian.xml
index 5451a0c..f40d75f 100644
--- a/tck/microprofile-tck/config/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/config/src/test/resources/arquillian.xml
@@ -21,7 +21,7 @@
             xsi:schemaLocation="
               http://jboss.org/schema/arquillian
               http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-  <container qualifier="tomee-microprofile" default="true">
+  <container qualifier="tomee-remote" default="true">
     <configuration>
       <property name="httpPort">-1</property>
       <property name="ajpPort">-1</property>