You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2010/06/07 19:49:20 UTC

svn commit: r952351 - /uima/build/trunk/uima-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml

Author: schor
Date: Mon Jun  7 17:49:20 2010
New Revision: 952351

URL: http://svn.apache.org/viewvc?rev=952351&view=rev
Log:
[UIMA-1806] correct assembly descriptor to include filesets/fileset under moduleSet/sources.  Otherwise get dupl artifacts inside assemblies.

Modified:
    uima/build/trunk/uima-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml

Modified: uima/build/trunk/uima-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml?rev=952351&r1=952350&r2=952351&view=diff
==============================================================================
--- uima/build/trunk/uima-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml (original)
+++ uima/build/trunk/uima-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml Mon Jun  7 17:49:20 2010
@@ -29,43 +29,47 @@
   <moduleSets>
     <moduleSet>
       <sources>
-        <outputDirectory>/</outputDirectory>
-        <useDefaultExcludes>true</useDefaultExcludes>
-        <excludes>
-          <!-- build output -->
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
-  
-          <!-- NOTE: Most of the following excludes should not be required
-               if the standard release process is followed. This is because the
-               release plugin checks out project sources into a location like
-               target/checkout, then runs the build from there. The result is
-               a source-release archive that comes from a pretty clean directory
-               structure.
-  
-               HOWEVER, if the release plugin is configured to run extra goals
-               or generate a project website, it's definitely possible that some
-               of these files will be present. So, it's safer to exclude them.
-          -->
-  
-          <!-- IDEs -->
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
-  
-          <!-- misc -->
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
-  
-          <!-- release-plugin temp files -->
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
-          <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
-        </excludes>
+        <fileSets>
+          <fileSet>
+            <outputDirectory>/</outputDirectory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+            <excludes>
+              <!-- build output -->
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
+      
+              <!-- NOTE: Most of the following excludes should not be required
+                   if the standard release process is followed. This is because the
+                   release plugin checks out project sources into a location like
+                   target/checkout, then runs the build from there. The result is
+                   a source-release archive that comes from a pretty clean directory
+                   structure.
+      
+                   HOWEVER, if the release plugin is configured to run extra goals
+                   or generate a project website, it's definitely possible that some
+                   of these files will be present. So, it's safer to exclude them.
+              -->
+      
+              <!-- IDEs -->
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
+      
+              <!-- misc -->
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
+      
+              <!-- release-plugin temp files -->
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
+              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
+            </excludes>
+          </fileSet>
+        </fileSets>
       </sources>
     </moduleSet>
   </moduleSets>