Remove tck 1.1 related folders.

weld · Nov 19, 2014 · f4b4ea5 · f4b4ea5
1 parent cc58c1f
commit f4b4ea5
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 9 deletions.
diff --git a/jboss-tck-runner/1.1/pom.xml → jboss-tck-runner/pom.xml b/jboss-tck-runner/1.1/pom.xml → jboss-tck-runner/pom.xml
@@ -3,10 +3,10 @@
         <artifactId>weld-core-parent</artifactId>
         <groupId>org.jboss.weld</groupId>
         <version>2.2.7-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>weld-jboss-runner-tck11</artifactId>
+    <artifactId>weld-jboss-runner-tck</artifactId>
     <name>CDI TCK runner (1.1, 1.2) for Weld (WildFly)</name>
     <description>Aggregates dependencies and runs the CDI TCK (both standalone and on WildFly)</description>
 
@@ -58,7 +58,7 @@
 
         <dependency>
             <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-porting-package-tck11</artifactId>
+            <artifactId>weld-porting-package-tck</artifactId>
         </dependency>
 
         <dependency>
@@ -135,7 +135,7 @@
                         </goals>
                         <configuration>
                             <includeGroupIds>org.jboss.weld</includeGroupIds>
-                            <includeArtifactIds>weld-porting-package-tck11</includeArtifactIds>
+                            <includeArtifactIds>weld-porting-package-tck</includeArtifactIds>
                             <stripVersion>true</stripVersion>
                             <overWriteReleases>true</overWriteReleases>
                             <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>

diff --git a/...runner/1.1/src/main/assembly/assembly.xml → ...tck-runner/src/main/assembly/assembly.xml b/...runner/1.1/src/main/assembly/assembly.xml → ...tck-runner/src/main/assembly/assembly.xml
diff --git a/...ldFly8DeploymentExceptionTransformer.java → ...ldFly8DeploymentExceptionTransformer.java b/...ldFly8DeploymentExceptionTransformer.java → ...ldFly8DeploymentExceptionTransformer.java
diff --git a/...k/wildfly8/WildFly8EEResourceManager.java → ...k/wildfly8/WildFly8EEResourceManager.java b/...k/wildfly8/WildFly8EEResourceManager.java → ...k/wildfly8/WildFly8EEResourceManager.java
diff --git a/.../weld/tck/wildfly8/WildFly8Extension.java → .../weld/tck/wildfly8/WildFly8Extension.java b/.../weld/tck/wildfly8/WildFly8Extension.java → .../weld/tck/wildfly8/WildFly8Extension.java
diff --git a/...est/resources/META-INF/cdi-tck.properties → ...est/resources/META-INF/cdi-tck.properties b/...est/resources/META-INF/cdi-tck.properties → ...est/resources/META-INF/cdi-tck.properties
diff --git a/...oss.arquillian.core.spi.LoadableExtension → ...oss.arquillian.core.spi.LoadableExtension b/...oss.arquillian.core.spi.LoadableExtension → ...oss.arquillian.core.spi.LoadableExtension
diff --git a/...k-runner/1.1/src/test/resources/log4j.xml → ...s-tck-runner/src/test/resources/log4j.xml b/...k-runner/1.1/src/test/resources/log4j.xml → ...s-tck-runner/src/test/resources/log4j.xml
diff --git a/...k-runner/1.1/src/test/tck12/tck-tests.xml → ...s-tck-runner/src/test/tck12/tck-tests.xml b/...k-runner/1.1/src/test/tck12/tck-tests.xml → ...s-tck-runner/src/test/tck12/tck-tests.xml
diff --git a/...k-runner/1.1/src/test/tck20/tck-tests.xml → ...s-tck-runner/src/test/tck20/tck-tests.xml b/...k-runner/1.1/src/test/tck20/tck-tests.xml → ...s-tck-runner/src/test/tck20/tck-tests.xml
diff --git a/...1.1/src/test/weld-embedded/arquillian.xml → ...ner/src/test/weld-embedded/arquillian.xml b/...1.1/src/test/weld-embedded/arquillian.xml → ...ner/src/test/weld-embedded/arquillian.xml
diff --git a/...nner/1.1/src/test/wildfly8/arquillian.xml → ...k-runner/src/test/wildfly8/arquillian.xml b/...nner/1.1/src/test/wildfly8/arquillian.xml → ...k-runner/src/test/wildfly8/arquillian.xml
diff --git a/pom.xml b/pom.xml
@@ -366,7 +366,7 @@
 
             <dependency>
                 <groupId>org.jboss.weld</groupId>
-                <artifactId>weld-porting-package-tck11</artifactId>
+                <artifactId>weld-porting-package-tck</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
@@ -569,7 +569,7 @@
                 </property>
             </activation>
             <modules>
-                <module>porting-package/1.1</module>
+                <module>porting-package</module>
                 <module>tests-common</module>
                 <module>tests</module>
                 <module>tests-arquillian</module>
@@ -585,7 +585,7 @@
                 </property>
             </activation>
             <modules>
-                <module>jboss-tck-runner/1.1</module>
+                <module>jboss-tck-runner</module>
             </modules>
         </profile>
         <profile>

diff --git a/porting-package/1.1/pom.xml → porting-package/pom.xml b/porting-package/1.1/pom.xml → porting-package/pom.xml
@@ -3,10 +3,10 @@
         <artifactId>weld-core-parent</artifactId>
         <groupId>org.jboss.weld</groupId>
         <version>2.2.7-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>weld-porting-package-tck11</artifactId>
+    <artifactId>weld-porting-package-tck</artifactId>
     <name>Weld Porting Package for the CDI TCK 1.1</name>
 
     <licenses>

diff --git a/...in/java/org/jboss/weld/tck/BeansImpl.java → ...in/java/org/jboss/weld/tck/BeansImpl.java b/...in/java/org/jboss/weld/tck/BeansImpl.java → ...in/java/org/jboss/weld/tck/BeansImpl.java
diff --git a/...java/org/jboss/weld/tck/ContextsImpl.java → ...java/org/jboss/weld/tck/ContextsImpl.java b/...java/org/jboss/weld/tck/ContextsImpl.java → ...java/org/jboss/weld/tck/ContextsImpl.java
diff --git a/.../main/java/org/jboss/weld/tck/ELImpl.java → .../main/java/org/jboss/weld/tck/ELImpl.java b/.../main/java/org/jboss/weld/tck/ELImpl.java → .../main/java/org/jboss/weld/tck/ELImpl.java
diff --git a/...ain/resources/META-INF/cdi-tck.properties → ...ain/resources/META-INF/cdi-tck.properties b/...ain/resources/META-INF/cdi-tck.properties → ...ain/resources/META-INF/cdi-tck.properties