[weld-commits] Weld SVN: r4957 - in build/trunk/dist-tck: src/main/assembly and 1 other directory.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-11-10 09:26:25 -0500 (Tue, 10 Nov 2009)
New Revision: 4957

Added:
   build/trunk/dist-tck/assembly.xml
Removed:
   build/trunk/dist-tck/src/main/assembly/assembly.xml
Modified:
   build/trunk/dist-tck/pom.xml
Log:
move assembly.xml, rename

Copied: build/trunk/dist-tck/assembly.xml (from rev 4956, build/trunk/dist-tck/src/main/assembly/assembly.xml)
===================================================================
--- build/trunk/dist-tck/assembly.xml	                        (rev 0)
+++ build/trunk/dist-tck/assembly.xml	2009-11-10 14:26:25 UTC (rev 4957)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<assembly 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/assembly-1.1.1.xsd
+          ">
+   <id>dist</id>
+   <baseDirectory>jsr299-tck-${cdi.tck.version}</baseDirectory>
+   <formats>
+      <format>zip</format>
+   </formats>
+   
+   <fileSets>
+      <fileSet>
+         <directory>${project.basedir}</directory>
+         <outputDirectory>/</outputDirectory>
+         <includes>
+            <include>readme.txt</include>
+            <include>apl.txt</include>
+            <include>release-notes.txt</include>
+         </includes>
+      </fileSet>
+   </fileSets>
+
+   <dependencySets>
+      <dependencySet>
+         <includes>
+            <include>org.jboss.jsr299.tck:jsr299-tck-impl</include>
+            <include>org.jboss.jsr299.tck:jsr299-tck-api</include>
+         </includes>
+         <useTransitiveDependencies>true</useTransitiveDependencies>
+         <outputDirectory>artifacts</outputDirectory>
+         <useProjectArtifact>false</useProjectArtifact>
+         <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+      </dependencySet>
+      <dependencySet>
+         <excludes>
+            <exclude>org.jboss.jsr299.tck:jsr299-tck-impl</exclude>
+            <exclude>org.jboss.jsr299.tck:jsr299-tck-api</exclude>
+            <exclude>org.jboss.jsr299.tck:jsr299-tck-reference-guide</exclude>
+            <exclude>org.jboss.jsr299.tck:jsr299-tck-dist-porting-package</exclude>
+         </excludes>
+         <useTransitiveDependencies>true</useTransitiveDependencies>
+         <outputDirectory>lib</outputDirectory>
+         <useProjectArtifact>false</useProjectArtifact>
+         <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+      </dependencySet>
+      <dependencySet>
+         <includes>
+            <include>org.jboss.jsr299.tck:jsr299-tck-dist-porting-package</include>
+         </includes>
+         <useTransitiveDependencies>false</useTransitiveDependencies>
+         <outputDirectory>/weld</outputDirectory>
+         <useProjectArtifact>false</useProjectArtifact>
+         <unpack>true</unpack>
+      </dependencySet>
+      <dependencySet>
+         <includes>
+            <include>org.jboss.jsr299.tck:jsr299-tck-reference-guide</include>
+         </includes>
+         <unpack>true</unpack>
+         <outputDirectory>doc</outputDirectory>
+         <useProjectArtifact>false</useProjectArtifact>
+      </dependencySet>
+   </dependencySets>
+   
+   
+
+</assembly>

Modified: build/trunk/dist-tck/pom.xml
===================================================================
--- build/trunk/dist-tck/pom.xml	2009-11-10 13:45:40 UTC (rev 4956)
+++ build/trunk/dist-tck/pom.xml	2009-11-10 14:26:25 UTC (rev 4957)
@@ -114,7 +114,7 @@
             <artifactId>maven-assembly-plugin</artifactId>
             <configuration>
                <descriptors>
-                  <descriptor>src/main/assembly/assembly.xml</descriptor>
+                  <descriptor>assembly.xml</descriptor>
                </descriptors>
                <finalName>jsr299-tck-${cdi.tck.version}</finalName>
             </configuration>

Deleted: build/trunk/dist-tck/src/main/assembly/assembly.xml
===================================================================
--- build/trunk/dist-tck/src/main/assembly/assembly.xml	2009-11-10 13:45:40 UTC (rev 4956)
+++ build/trunk/dist-tck/src/main/assembly/assembly.xml	2009-11-10 14:26:25 UTC (rev 4957)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<assembly 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/assembly-1.1.1.xsd
-          ">
-   <id>dist</id>
-   <baseDirectory>jsr299-tck-${project.version}</baseDirectory>
-   <formats>
-      <format>zip</format>
-   </formats>
-   
-   <fileSets>
-      <fileSet>
-         <directory>${project.basedir}</directory>
-         <outputDirectory>/</outputDirectory>
-         <includes>
-            <include>readme.txt</include>
-            <include>apl.txt</include>
-            <include>release-notes.txt</include>
-         </includes>
-      </fileSet>
-   </fileSets>
-
-   <dependencySets>
-      <dependencySet>
-         <includes>
-            <include>org.jboss.jsr299.tck:jsr299-tck-impl</include>
-            <include>org.jboss.jsr299.tck:jsr299-tck-api</include>
-         </includes>
-         <useTransitiveDependencies>true</useTransitiveDependencies>
-         <outputDirectory>artifacts</outputDirectory>
-         <useProjectArtifact>false</useProjectArtifact>
-         <outputFileNameMapping>${artifact.artifactId}-${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-      </dependencySet>
-      <dependencySet>
-         <excludes>
-            <exclude>org.jboss.jsr299.tck:jsr299-tck-impl</exclude>
-            <exclude>org.jboss.jsr299.tck:jsr299-tck-api</exclude>
-            <exclude>org.jboss.jsr299.tck:jsr299-tck-reference-guide</exclude>
-            <exclude>org.jboss.jsr299.tck:jsr299-tck-dist-porting-package</exclude>
-         </excludes>
-         <useTransitiveDependencies>true</useTransitiveDependencies>
-         <outputDirectory>lib</outputDirectory>
-         <useProjectArtifact>false</useProjectArtifact>
-         <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-      </dependencySet>
-      <dependencySet>
-         <includes>
-            <include>org.jboss.jsr299.tck:jsr299-tck-dist-porting-package</include>
-         </includes>
-         <useTransitiveDependencies>false</useTransitiveDependencies>
-         <outputDirectory>/weld</outputDirectory>
-         <useProjectArtifact>false</useProjectArtifact>
-         <unpack>true</unpack>
-      </dependencySet>
-      <dependencySet>
-         <includes>
-            <include>org.jboss.jsr299.tck:jsr299-tck-reference-guide</include>
-         </includes>
-         <unpack>true</unpack>
-         <outputDirectory>doc</outputDirectory>
-         <useProjectArtifact>false</useProjectArtifact>
-      </dependencySet>
-   </dependencySets>
-   
-   
-
-</assembly>