Author: pete.muir(a)jboss.org Date: 2009-11-08 19:06:27 -0500 (Sun, 08 Nov 2009) New Revision: 4810 Modified: build/trunk/dist-tck/pom.xml build/trunk/dist-tck/porting-package/pom.xml build/trunk/dist-tck/porting-package/src/main/assembly/assembly.xml build/trunk/dist-tck/src/main/assembly/assembly.xml Log: copy in sig tests Modified: build/trunk/dist-tck/pom.xml =================================================================== --- build/trunk/dist-tck/pom.xml 2009-11-09 00:05:52 UTC (rev 4809) +++ build/trunk/dist-tck/pom.xml 2009-11-09 00:06:27 UTC (rev 4810) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-parent</artifactId> - <version>4</version> + <version>6</version> </parent> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-dist</artifactId> @@ -92,6 +92,14 @@ </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + <version>${cdi.tck.version}</version> + <classifier>sigtest</classifier> + <type>sig</type> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-dist-porting-package</artifactId> <version>${project.version}</version> <type>zip</type> Modified: build/trunk/dist-tck/porting-package/pom.xml =================================================================== --- build/trunk/dist-tck/porting-package/pom.xml 2009-11-09 00:05:52 UTC (rev 4809) +++ build/trunk/dist-tck/porting-package/pom.xml 2009-11-09 00:06:27 UTC (rev 4810) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-parent</artifactId> - <version>4</version> + <version>6</version> </parent> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-dist-porting-package</artifactId> Modified: build/trunk/dist-tck/porting-package/src/main/assembly/assembly.xml =================================================================== --- build/trunk/dist-tck/porting-package/src/main/assembly/assembly.xml 2009-11-09 00:05:52 UTC (rev 4809) +++ build/trunk/dist-tck/porting-package/src/main/assembly/assembly.xml 2009-11-09 00:06:27 UTC (rev 4810) @@ -22,6 +22,7 @@ <useTransitiveDependencies>true</useTransitiveDependencies> <outputDirectory>/porting-package-lib</outputDirectory> <useProjectArtifact>false</useProjectArtifact> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> </dependencySet> </dependencySets> Modified: build/trunk/dist-tck/src/main/assembly/assembly.xml =================================================================== --- build/trunk/dist-tck/src/main/assembly/assembly.xml 2009-11-09 00:05:52 UTC (rev 4809) +++ build/trunk/dist-tck/src/main/assembly/assembly.xml 2009-11-09 00:06:27 UTC (rev 4810) @@ -31,6 +31,7 @@ <useTransitiveDependencies>true</useTransitiveDependencies> <outputDirectory>artifacts</outputDirectory> <useProjectArtifact>false</useProjectArtifact> + <outputFileNameMapping>${artifact.artifactId}-${dashClassifier?}.${artifact.extension}</outputFileNameMapping> </dependencySet> <dependencySet> <excludes> @@ -42,6 +43,7 @@ <useTransitiveDependencies>true</useTransitiveDependencies> <outputDirectory>lib</outputDirectory> <useProjectArtifact>false</useProjectArtifact> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> </dependencySet> <dependencySet> <includes>