uima-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r824506 - in /incubator/uima: sandbox/trunk/SandboxDistr/annotator-package/pom.xml uima-as/trunk/uima-as-distr/pom.xml uimaj/trunk/uimaj-distr/pom.xml uimaj/trunk/uimaj/distr-superPom/ uimaj/trunk/uimaj/distr-superPom/pom.xml
Date Mon, 12 Oct 2009 21:30:02 GMT
Author: schor
Date: Mon Oct 12 21:30:01 2009
New Revision: 824506

URL: http://svn.apache.org/viewvc?rev=824506&view=rev
Log:
UIMA-1613 make assemblies consistent, add RAT checking on assemblies (for all assemblies except
CPP)

Added:
    incubator/uima/uimaj/trunk/uimaj/distr-superPom/
    incubator/uima/uimaj/trunk/uimaj/distr-superPom/pom.xml
Modified:
    incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml
    incubator/uima/uima-as/trunk/uima-as-distr/pom.xml
    incubator/uima/uimaj/trunk/uimaj-distr/pom.xml

Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml?rev=824506&r1=824505&r2=824506&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml Mon Oct 12 21:30:01
2009
@@ -32,25 +32,79 @@
   
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj</artifactId> <!-- don't need to build this project as
a sandbox proj -->
+    <artifactId>uima-common-distribution</artifactId> <!-- don't need to build
this project as a sandbox proj -->
     <!-- version cannot be a ${xxx} form -->
     <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag
for changeVersion -->
-    <relativePath>../../uimaj</relativePath>
+    <relativePath>../../uimaj/distr-superPom</relativePath>
   </parent>
+   
+  <properties>
+    <!-- property used in multiple places in distr-superPom -->
+    <assemblyFinalName>uimaj-annotator-addons-${uimaj-release-version}</assemblyFinalName>
+  </properties>
      
   <build>
     <plugins>
-  	  <plugin>
-		    <artifactId>maven-assembly-plugin</artifactId>
-     	  <configuration>
-			    <descriptors>
-				    <descriptor>assembly/bin.xml</descriptor>
-				    <descriptor>assembly/src.xml</descriptor>
-			    </descriptors>
-			    <finalName>uimaj-annotator-addons-${project.version}</finalName>
-	        <tarLongFileMode>gnu</tarLongFileMode>
-		    </configuration>
-	    </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
+      
+      <!-- run Release Audit Tool (RAT) on src and bin distrs -->       
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>rat-check-src</id>
+            <configuration>              
+              <excludes>
+                <exclude>apache-uima/addons/annotator/BSFAnnotator/src/main/java/org/apache/uima/annotator/bsf/types/*.java</exclude>
<!-- generated classes -->
+                <exclude>apache-uima/addons/annotator/BSFAnnotator/src/test/resources/*.txt</exclude>
<!-- test data -->
+                <exclude>apache-uima/addons/annotator/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/DictTerm*.java</exclude>
<!-- generated classes -->
+                <exclude>apache-uima/addons/annotator/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/TokenAnnotation*.java</exclude>
<!-- generated classes -->
+                <exclude>apache-uima/addons/annotator/ConceptMapper/src/main/java/uima/tt/TokenAnnotation*.java</exclude>
<!-- generated classes -->
+                <exclude>apache-uima/addons/annotator/ConfigurableFeatureExtractor/src/test/java/example/PersonTitle*.java</exclude>
<!-- generated classes -->
+                <exclude>apache-uima/addons/annotator/ConfigurableFeatureExtractor/src/test/java/org/apache/uima/examples/SourceDocumentInformation*.java</exclude>
<!-- generated classes -->
+                <exclude>apache-uima/addons/annotator/ConfigurableFeatureExtractor/src/test/resources/testData*txt*</exclude>
<!-- test data -->
+                <exclude>apache-uima/addons/annotator/DictionaryAnnotator/src/test/resources/DictionaryAnnotatorTestFilterFeaturePath/dictionaryAnnotFeaturePathTestRef.txt</exclude>
<!-- test data -->
+                <exclude>apache-uima/addons/annotator/DictionaryAnnotator/src/test/resources/Dictionary*Test*/*Ref.txt</exclude>
<!-- test data -->
+                <exclude>apache-uima/addons/annotator/DictionaryAnnotator/src/test/resources/Dictionary*Test*/*Ref.xml</exclude>
<!-- test data -->
+                <exclude>apache-uima/addons/annotator/DictionaryAnnotator/src/test/resources/DictionaryCreatorTest/dictInput.txt</exclude>
<!-- test data -->
+                <exclude>apache-uima/addons/annotator/DictionaryAnnotator/src/test/resources/DictionaryCreatorTest/WhitespaceTokenizer.pear</exclude>
<!-- test data -->                
+                <exclude>apache-uima/addons/annotator/Lucas/src/test/java/org/apache/uima/lucas/indexer/types/test/*.java</exclude>
<!-- generated classes -->
+                <exclude>apache-uima/addons/annotator/Lucas/src/test/resources/*.txt</exclude>
<!-- test data -->
+                <exclude>apache-uima/addons/annotator/RegularExpressionAnnotator/src/test/resources/*/*Ref*.txt</exclude>
<!-- test data -->
+                <exclude>apache-uima/addons/annotator/SnowballAnnotator/src/main/java/org/tartarus/snowball/**</exclude>
<!-- included under license -->
+                <exclude>apache-uima/addons/annotator/SnowballAnnotator/src/test/resources/englishRef.txt</exclude>
<!-- test data -->
+                <exclude>apache-uima/addons/annotator/Tagger/src/test/resources/moby-tag-list.txt</exclude>
<!-- test data -->
+                <exclude>apache-uima/addons/annotator/TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS*.java</exclude>
<!-- generated classes -->
+                <exclude>apache-uima/addons/annotator/TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue*.java</exclude>
<!-- generated classes -->
+                <exclude>apache-uima/addons/annotator/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation*.java</exclude>
<!-- generated classes -->
+                <exclude>apache-uima/addons/annotator/TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation*.java</exclude>
<!-- generated classes -->
+                <exclude>apache-uima/addons/annotator/WhitespaceTokenizer/src/test/resources/*.txt</exclude>
<!-- test data -->
+                <exclude>apache-uima/addons/SimpleServer/src/test/resources/expected/*.xml</exclude>
<!-- test data -->
+                <exclude>apache-uima/addons/SimpleServer/src/test/resources/test.txt</exclude>
<!-- test data -->
+                <exclude>RELEASE_NOTES.html</exclude> <!-- release notes -->
+                <exclude>SandboxDistr/annotator-package/readme/RELEASE_NOTES.html</exclude>
<!-- release notes -->
+                <exclude>SandboxDocs/src/olink/**</exclude> <!-- generated
cross-ref database for docbook -->
+                <exclude>SandboxDocs/src/styles/titlepage/titlepage-*.xsl</exclude>
<!-- generated file -->
+              </excludes>
+            </configuration>
+          </execution>
+          <execution>
+            <id>rat-check-bin</id>
+            <configuration>
+              <excludes>
+                <exclude>addons/annotator/*/docs/html/images/*.svg</exclude>
<!-- generated image files -->
+                <exclude>addons/*/docs/html/images/*.svg</exclude> <!-- generated
image files -->
+                <exclude>addons/annotator/*/*.pear</exclude> <!-- generated
binary file -->
+                <exclude>addons/RELEASE_NOTES.html</exclude> <!-- release
notes -->
+              </excludes>
+            </configuration>
+          </execution>  
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
      

Modified: incubator/uima/uima-as/trunk/uima-as-distr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/pom.xml?rev=824506&r1=824505&r2=824506&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/pom.xml (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/pom.xml Mon Oct 12 21:30:01 2009
@@ -28,11 +28,19 @@
 	<name>Apache UIMA Asynchronous Scaleout - Resources and Assembly Descriptor for building
the distribution</name>
 	<parent>
 		<groupId>org.apache.uima</groupId>
-		<artifactId>uimaj-as</artifactId>
+		<artifactId>uima-common-distribution</artifactId>
 		<version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag
for changeVersion -->
-      <relativePath>../uimaj-as</relativePath>
+      <relativePath>../uimaj/distr-superPom</relativePath>
 	</parent>
   
+  <properties>
+    <uimaj-as-release-version>2.3.0-incubating-SNAPSHOT</uimaj-as-release-version>
<!-- this comment is a flag for changeVersion -->
+    <uimaj-as-release-eclipse-version>2.3.0.incubating-SNAPSHOT</uimaj-as-release-eclipse-version>
<!-- this comment is a flag for changeVersion -->
+
+    <!-- property used in multiple places in distr-superPom -->
+    <assemblyFinalName>uima-as-${uimaj-release-version}</assemblyFinalName>
+  </properties>
+  
   <!-- dependencies used during assembly -->
 	<dependencies>
     <!-- uima base -->
@@ -206,115 +214,115 @@
       <version>1.2.2</version>
     </dependency>
 
-	<dependency>
-		<groupId>org.apache.activemq</groupId>
-		<artifactId>activemq-console</artifactId>
-		<version>4.1.1</version>
-	</dependency>
-
-	<dependency>
-		<groupId>org.apache.activemq</groupId>
-		<artifactId>activeio-core</artifactId>
-		<version>3.0.0-incubator</version>
-	</dependency>
-
-	<dependency>
-		<groupId>backport-util-concurrent</groupId>
-		<artifactId>backport-util-concurrent</artifactId>
-		<version>2.1</version>
-	</dependency>
-
-	<dependency>
-		<groupId>org.apache.activemq</groupId>
-		<artifactId>activemq-jaas</artifactId>
-		<version>4.1.1</version>
-	</dependency>
-
-	<dependency>
-		<groupId>org.apache.activemq</groupId>
-		<artifactId>activemq-web</artifactId>
-		<version>4.1.1</version>
-	</dependency>
-
-	<dependency>
-		<groupId>mx4j</groupId>
-		<artifactId>mx4j</artifactId>
-		<version>2.1.1</version>
-	</dependency>
-
-   <!-- lib/optional -->
-
-	<dependency>
-		<groupId>commons-beanutils</groupId>
-		<artifactId>commons-beanutils</artifactId>
-		<version>1.6.1</version>
-	</dependency>
-	
-	<dependency>
-		<groupId>commons-collections</groupId>
-		<artifactId>commons-collections</artifactId>
-		<version>2.1</version>
-	</dependency>
-
-	<dependency>
-		<groupId>commons-dbcp</groupId>
-		<artifactId>commons-dbcp</artifactId>
-		<version>1.2</version>
-	</dependency>
-
-	<dependency>
-		<groupId>commons-pool</groupId>
-		<artifactId>commons-pool</artifactId>
-		<version>1.2</version>
-	</dependency>
-
-	<dependency>
-		<groupId>org.apache.geronimo.specs</groupId>
-		<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-		<version>1.0</version>
-	</dependency>
-
-	<dependency>
-		<groupId>org.apache.geronimo.specs</groupId>
-		<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-		<version>1.0</version>
-	</dependency>
-
-	<dependency>
-		<groupId>activemq</groupId>
-		<artifactId>jmdns</artifactId>
-		<version>1.0-RC2</version>
-	</dependency>
-
-	<dependency>
-		<groupId>log4j</groupId>
-		<artifactId>log4j</artifactId>
-		<version>1.2.12</version>
-	</dependency>
-
-	<dependency>
-		<groupId>mx4j</groupId>
-		<artifactId>mx4j-remote</artifactId>
-		<version>2.1.1</version>
-	</dependency>
-
-	<dependency>
-		<groupId>mx4j</groupId>
-		<artifactId>mx4j-tools</artifactId>
-		<version>2.1.1</version>
-	</dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-console</artifactId>
+      <version>4.1.1</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activeio-core</artifactId>
+      <version>3.0.0-incubator</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>backport-util-concurrent</groupId>
+      <artifactId>backport-util-concurrent</artifactId>
+      <version>2.1</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-jaas</artifactId>
+      <version>4.1.1</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-web</artifactId>
+      <version>4.1.1</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j</artifactId>
+      <version>2.1.1</version>
+    </dependency>
 
-	<dependency>
-		<groupId>org.apache.derby</groupId>
-		<artifactId>derby</artifactId>
-		<version>10.1.1.0</version>
-	</dependency>
+    <!-- lib/optional -->
 
-	<dependency>
-		<groupId>org.apache.xbean</groupId>
-		<artifactId>xbean-spring</artifactId>
-		<version>2.8</version>
-	</dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>2.1</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>1.2</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>1.2</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+      <version>1.0</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+      <version>1.0</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>activemq</groupId>
+      <artifactId>jmdns</artifactId>
+      <version>1.0-RC2</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j-remote</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j-tools</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.1.1.0</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
+      <version>2.8</version>
+    </dependency>
     
     <!--dependency>
       <groupId>net.sf.saxon</groupId>
@@ -323,20 +331,10 @@
     </dependency-->
     
 	</dependencies>
+    
 	<build>
     <resources/>
 		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/bin.xml</descriptor>
-            <descriptor>src/main/assembly/src.xml</descriptor>
-					</descriptors>
-					<finalName>uima-as-${uimaj-release-version}</finalName>
-          <tarLongFileMode>gnu</tarLongFileMode>
-				</configuration>
-			</plugin>
       
       <!-- This java doc config is for building the ones distributed with the bin packaging,
and also 
            posted on our website.
@@ -400,74 +398,59 @@
 					</execution>
 				</executions>
 			</plugin>
+
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         
         <executions>
-          <!--execution>
-            <id>makeTarget</id>
-            <phase>validate</phase>
-            <configuration>
-              <tasks>
-                <mkdir dir="target"/>
-              </tasks>
-            </configuration>
-            <goals><goal>run</goal></goals>
-          </execution-->
           <execution>
+            <id>build uima-as docbooks</id>
             <phase>package</phase>
+            <goals><goal>run</goal></goals>
             <configuration>
               <tasks>
                 <!-- Build documentation -->
                 <ant dir="../uima-as-docbooks" inheritAll="false"/>
-                <!-- Build documentation for base UIMA tool book - 
-                     needed by CVD -->
-                <!--ant dir="../uima-docbooks" 
-                     antfile="../uima-docbooks/build_tools.xml" inheritAll="false"/-->
-                <!-- build eclipse update site 
-                     Deleted from here, moved to a "deploy" step -->
-                  
-                <!--ant dir="../uimaj-eclipse-update-site"-->
-                  <!-- property values from maven must be passed in 
-                       using what looks like a redundant <property> statement.
-                       See http://cwiki.apache.org/UIMA/maven-tips.html 
-                         section on passing parameters to ant scripts -->
-                  <!--property name="uima-maven-build-eclipse-home" value="${uima-maven-build-eclipse-home}"/>
                
-                  <property name="project.version" value="${uimaj-release-eclipse-version}"/>
-                </ant-->            
               </tasks>
+            </configuration>            
+          </execution>          
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
+      
+      <!-- run Release Audit Tool (RAT) on src and bin distrs -->       
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>rat-check-src</id>
+            <configuration>
+              <basedir>target/rat-src-dir/apache-uima-as</basedir>          
   
+              <excludes>
+                <exclude>uima-as-distr/src/test/resources/deploy/expected/*.*</exclude>
<!-- test data -->
+                <exclude>uima-as-distr/src/test/resources/deploy/expected/envVar/*.*</exclude>
<!-- test data -->
+                <exclude>uima-as-docbooks/src/olink/**</exclude> <!-- generated
cross ref database for Apache FOP -->
+                <exclude>uima-docbooks/src/olink/**</exclude> <!-- generated
cross ref database for Apache FOP -->
+                <exclude>uimaj-as-activemq/src/test/resources/data/DoubleByteText.txt</exclude>
<!-- test data -->
+              </excludes>
             </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
           </execution>
-          <!--execution>
-            <id>checksum</id>
-            <phase>package</phase>
+          <execution>
+            <id>rat-check-bin</id>
             <configuration>
-              <tasks>
-                <checksum algorithm="sha1">
-                  <fileset dir="target" includes="*.gz *.bz2 *.zip" />
-                  <fileset dir="../uimaj-eclipse-update-site/target/eclipse-update-site/features"
-                           includes="*.jar"/> 
-                  <fileset dir="../uimaj-eclipse-update-site/target/eclipse-update-site/plugins"
-                           includes="*.jar *.pack.gz"/>
-                </checksum>
-                <checksum algorithm="md5">
-                  <fileset dir="target" includes="*.gz *.bz2 *.zip" />
-                  <fileset dir="../uimaj-eclipse-update-site/target/eclipse-update-site/features"
-                           includes="*.jar"/>
-                  <fileset dir="../uimaj-eclipse-update-site/target/eclipse-update-site/plugins"
-                           includes="*.jar *.pack.gz"/>
-                </checksum>
-              </tasks>
+              <excludes>
+                <exclude>uima-as/docs/api/**</exclude> <!-- javadocs-->
+                <exclude>uima-as/docs/html/images/*.svg</exclude>  <!-- generated
.svg image files -->
+              </excludes>
             </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution-->
+          </execution>  
         </executions>
       </plugin>
+
 		</plugins>
 	</build>	
 </project>
\ No newline at end of file

Modified: incubator/uima/uimaj/trunk/uimaj-distr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/pom.xml?rev=824506&r1=824505&r2=824506&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/pom.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/pom.xml Mon Oct 12 21:30:01 2009
@@ -23,34 +23,21 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.uima</groupId>
   <artifactId>uimaj-distr</artifactId>
-  
-  <!-- packaging is set to jar even though it causes an extraneous jar to be built
-       and deployed to the maven repos.
-       This is because of some issue with getting the assembly to work; see
-       http://article.gmane.org/gmane.comp.apache.uima.devel/3228/match=should+uimaj+distr+packaging
-    -->
   <packaging>pom</packaging>
   <version>${uimaj-release-version}</version>
   <name>Apache UIMA Java SDK - Resources and Assembly Descriptor for building the distribution</name>
-  <url>http://incubator.apache.org/uima</url>
-  <organization><name>The Apache Software Foundation</name></organization>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <url>http://svn.apache.org/viewvc/incubator/uima</url>
-  </scm>    
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj</artifactId>
+    <artifactId>uima-common-distribution</artifactId>
     <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag
for changeVersion -->
-        <relativePath>../uimaj</relativePath>
+    <relativePath>../uimaj/distr-superPom</relativePath>
   </parent>
   
+  <properties>
+    <!-- property used in multiple places in distr-superPom -->
+    <assemblyFinalName>uima-as-${uimaj-release-version}</assemblyFinalName> 

+  </properties>  
+  
   <!-- dependencies that go into the various builds via dependency-sets -->
   <!-- version is picked up from parent -->
   <!-- default scope is compile -->
@@ -112,7 +99,7 @@
           <execution>
             <id>javadoc</id>
             <phase>package</phase>
-         <!--phase>deploy</phase--> <!-- comment above and uncomment to disable
javadocs, for testing/experimentation, with assembly:assembly-->
+            <!--phase>deploy</phase--> <!-- comment above and uncomment to
disable javadocs, for testing/experimentation, with assembly:assembly-->
             <goals>
               <goal>aggregate</goal>
             </goals>
@@ -144,20 +131,6 @@
         </executions>
       </plugin>
       
-      
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-4</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/bin.xml</descriptor>
-            <descriptor>src/main/assembly/src.xml</descriptor>
-          </descriptors>
-          <finalName>uimaj-${uimaj-release-version}</finalName>
-          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
-      </plugin>
-      
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
@@ -184,36 +157,52 @@
               <goal>run</goal>
             </goals>
           </execution>
-          <!-- 
+          
+        </executions>
+      </plugin>
+      
+      <!-- must follow other package goals, like the one above building the docbooks -->
+      <plugin> 
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
+  
+      <!-- Release Audit Tool checks -->
+      <!-- run Release Audit Tool (RAT) on src and bin distrs -->       
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <executions>
           <execution>
-            <id>checksum</id>
-            <phase>package</phase>
+            <id>rat-check-src</id>
             <configuration>
-              <tasks>
-                <checksum algorithm="sha1">
-                  <fileset dir="target" includes="*.gz *.bz2 *.zip" />
-                  <fileset dir="../uimaj-eclipse-update-site/target/eclipse-update-site/features"
-                           includes="*.jar"/> 
-                  <fileset dir="../uimaj-eclipse-update-site/target/eclipse-update-site/plugins"
-                           includes="*.jar *.pack.gz"/>
-                </checksum>
-                <checksum algorithm="md5">
-                  <fileset dir="target" includes="*.gz *.bz2 *.zip" />
-                  <fileset dir="../uimaj-eclipse-update-site/target/eclipse-update-site/features"
-                           includes="*.jar"/>
-                  <fileset dir="../uimaj-eclipse-update-site/target/eclipse-update-site/plugins"
-                           includes="*.jar *.pack.gz"/>
-                </checksum>
-              </tasks>
+              <excludes>
+                <exclude>uima-docbooks/README.USER.txt</exclude> <!-- readme
-->
+                <exclude>uima-docbooks/src/olink/**</exclude> <!-- generated
cross ref database for Apache FOP -->
+                <exclude>uimaj-core/src/test/resources/**</exclude> <!-- test
data -->
+                <exclude>uimaj-ep-cas-editor/src/test/resources/ManualTests/**</exclude>
<!-- test data -->
+                <exclude>uimaj-examples/src/main/data/**</exclude> <!-- sample
data -->
+                <exclude>uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt</exclude>
 <!-- readme -->
+                <exclude>uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt</exclude>
 <!-- sample data -->
+                <exclude>uimaj-tools/src/main/resources/org/apache/uima/tools/migration/*.txt</exclude>
<!-- system data file -->
+                <exclude>uimaj-tools/src/main/resources/org/apache/uima/tools/util/gui/about.txt</exclude>
<!-- about file -->
+                <exclude>uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.RoomNumber.pear</exclude>
<!-- test binary file -->
+              </excludes>
             </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
           </execution>
-           -->
+          <execution>
+            <id>default-cli</id>
+            <configuration>
+              <excludes>
+                <exclude>docs/api/**</exclude> <!-- javadocs-->
+                <exclude>docs/html/images/*.svg</exclude>  <!-- generated
.svg image files -->
+                <exclude>examples/data/**</exclude> <!-- sample data -->
+                <exclude>examples/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt</exclude>
<!--sample param file -->         
+              </excludes>
+            </configuration>
+          </execution>  
         </executions>
       </plugin>
-      
-  </plugins>
+
+    </plugins>
   </build>  
 </project>
\ No newline at end of file

Added: incubator/uima/uimaj/trunk/uimaj/distr-superPom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj/distr-superPom/pom.xml?rev=824506&view=auto
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj/distr-superPom/pom.xml (added)
+++ incubator/uima/uimaj/trunk/uimaj/distr-superPom/pom.xml Mon Oct 12 21:30:01 2009
@@ -0,0 +1,145 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+
+<!-- this POM holds common, factored-out settings for all 
+     distribution-building POMs.  
+     Those project's POMs refer to this as their "parent"
+     This POM refers to the uimaj pom as its parent
+  -->
+
+<project 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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <!-- thru testing, discovered that "inheriting" the groupId isn't done
+       when scanning for projects -->
+  <groupId>org.apache.uima</groupId>
+  <artifactId>uima-common-distribution</artifactId>
+  <packaging>pom</packaging>
+  <name>Apache UIMA common Distribution POM settings</name>
+  <description>Holds common, factored out settings for Distribution POMs</description>
+
+  <parent>
+    <groupId>org.apache.uima</groupId>
+    <artifactId>uimaj</artifactId>
+    <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag
for changeVersion -->
+    <relativePath>..</relativePath>
+  </parent>
+     
+  <build>
+    
+    <pluginManagement>
+      
+      <plugins>
+        <plugin> 
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.2-beta-4</version>
+          <configuration>
+            <descriptors>
+              <descriptor>src/main/assembly/bin.xml</descriptor>
+              <descriptor>src/main/assembly/src.xml</descriptor>
+            </descriptors>
+            <finalName>${assemblyFinalName}</finalName>
+            <tarLongFileMode>gnu</tarLongFileMode>
+            <attach>false</attach> <!-- assembly results not put into Maven
repos -->
+          </configuration>
+          <executions>
+            <execution>
+              <goals><goal>single</goal></goals>
+              <phase>package</phase>
+            </execution>
+            <execution>
+              <id>default-cli</id>
+              <configuration>
+                <descriptors>
+                  <descriptor>do-not-use--mvn-assembly-assembly--instead-use-mvn-install</descriptor>
+                </descriptors>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+  
+        <!-- Release Audit Tool checks -->
+        <!-- first unpack the assembly into a rat-src-dir and rat-bin-dir -->
+  
+        <plugin>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>unzip-for-RAT</id>
+              <!-- make sure this is before the Run RAT step below -->
+              <phase>verify</phase>
+              <goals><goal>run</goal></goals>
+              <configuration>
+                <tasks>
+                  <delete dir="target/rat-src-dir"/>
+                  <delete dir="target/rat-bin-dir"/>
+                  <unzip dest="target/rat-src-dir"
+                         src="target/${assemblyFinalName}-src.zip"/>
+                  <unzip dest="target/rat-bin-dir"
+                         src="target/${assemblyFinalName}-bin.zip"/>                 
   
+                </tasks>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        
+        <!-- Run RAT --> 
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>default-cli</id>
+              <!-- set the phase to some phase that never will be invoked 
+                   to disable this (an ugly hack, please fix to something better -->
+              <phase>site-deploy</phase>
+            </execution>
+            <execution>
+              <id>rat-check-src</id>
+              <phase>verify</phase>
+              <configuration>
+                <basedir>target/rat-src-dir/${assemblyFinalName}</basedir>
+              </configuration>
+              <goals><goal>check</goal></goals>
+            </execution>
+            <execution>
+              <id>rat-check-bin</id>
+              <phase>verify</phase>
+              <configuration>
+                <basedir>target/rat-bin-dir/apache-uima</basedir>
+              </configuration>
+              <goals><goal>check</goal></goals>
+            </execution>  
+          </executions>
+        </plugin>
+        
+      </plugins>
+    </pluginManagement>       
+  </build>
+
+  <!-- listing the modules here allows running mvn xxx on this pom
+    and having it recurse into all the children -->
+      
+  <modules>
+    <module>../../uimaj-distr</module>
+    <module>../../uima-as-distr</module>
+    <module>../../SandboxDistr</module>
+  </modules>
+</project>
\ No newline at end of file



Mime
View raw message