Remove the web tck tests

Signed-off-by: Scott M Stark <[email protected]>

dist-build/artifact-install.pom

@@ -25,7 +25,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-install-plugin</artifactId>
-        <version>3.0.0-M1</version>
+        <version>3.1.1</version>
         <executions>
           <execution>
             <id>install-tck-parent</id>

dist-build/jboss-runner.pom

@@ -20,8 +20,6 @@
   <url>http://weld.cdi-spec.org</url>
 
   <properties>
-    <!-- This matches the htmlunit version in TCK -->
-    <htmlunit.version>2.50.0</htmlunit.version>
     <cdi.tck.version>${project.version}</cdi.tck.version>
   </properties>
 
@@ -230,7 +228,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.12.1</version>
         <configuration>
           <!-- Disable annotation processor for test sources -->
           <testCompilerArgument>-proc:none</testCompilerArgument>
@@ -324,10 +322,7 @@
       <build>
         <resources>
           <resource>
-            <directory>src/test/resources</directory>
-          </resource>
-          <resource>
-            <directory>src/test/weld-embedded</directory>
+            <directory>src/main/resources</directory>
           </resource>
         </resources>
         <plugins>
@@ -339,6 +334,7 @@
               <excludedGroups>integration,javaee-full,se</excludedGroups>
               <systemPropertyVariables>
                 <arquillian.launch>weld</arquillian.launch>
+                <arquillian.xml>weld-embedded-arquillian.xml</arquillian.xml>
                 <!-- Specified system properties are not
                     available during in-container test execution -->
                 <org.jboss.cdi.tck.libraryDirectory>target/dependency/lib</org.jboss.cdi.tck.libraryDirectory>
@@ -417,6 +413,7 @@
               <groups>se,arquillian</groups>
               <systemPropertyVariables>
                 <arquillian.launch>weld-se</arquillian.launch>
+                <arquillian.xml>weld-se-arquillian.xml</arquillian.xml>
                 <libPath>target</libPath>
               </systemPropertyVariables>
               <suiteXmlFiles>

dist-build/pom.xml

@@ -12,11 +12,6 @@
    <packaging>pom</packaging>
    <name>CDI TCK Distribution</name>
 
-   <modules>
-      <module>porting-package</module>
-      <module>libs</module>
-   </modules>
-
    <dependencies>
       <dependency>
          <groupId>jakarta.enterprise</groupId>

dist-build/src/main/assembly/assembly.xml

@@ -26,6 +26,18 @@
          <destName>pom.xml</destName>
          <filtered>true</filtered>
       </file>
+      <file>
+         <source>src/main/resources/weld-embedded-arquillian.xml</source>
+         <outputDirectory>weld/jboss-tck-runner/src/main/resources</outputDirectory>
+         <destName>weld-embedded-arquillian.xml</destName>
+         <filtered>false</filtered>
+      </file>
+      <file>
+         <source>src/main/resources/weld-se-arquillian.xml</source>
+         <outputDirectory>weld/jboss-tck-runner/src/main/resources</outputDirectory>
+         <destName>weld-se-arquillian.xml</destName>
+         <filtered>false</filtered>
+      </file>
 
    </files>
    <fileSets>
@@ -68,20 +80,6 @@
          <useProjectArtifact>false</useProjectArtifact>
          <unpack>true</unpack>
       </dependencySet>
-      <dependencySet>
-         <includes>
-            <include>jakarta.enterprise:cdi-tck-dist-porting-package</include>
-         </includes>
-         <useTransitiveDependencies>false</useTransitiveDependencies>
-         <outputDirectory>/weld</outputDirectory>
-         <useProjectArtifact>false</useProjectArtifact>
-         <unpack>true</unpack>
-         <unpackOptions>
-            <excludes>
-               <exclude>jboss-tck-runner/pom.xml</exclude>
-            </excludes>
-         </unpackOptions>
-      </dependencySet>
       <dependencySet>
          <includes>
             <include>jakarta.enterprise:cdi-tck-reference-guide:zip</include>