You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/12/05 20:10:37 UTC

svn commit: r1548246 - in /uima/sandbox/uima-ducc/trunk: src/main/assembly/bin.xml uima-ducc-parent/pom.xml

Author: cwiklik
Date: Thu Dec  5 19:10:37 2013
New Revision: 1548246

URL: http://svn.apache.org/r1548246
Log:
UIMA-2881 parameterized version number for DataTables

Modified:
    uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
    uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml

Modified: uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml?rev=1548246&r1=1548245&r2=1548246&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Thu Dec  5 19:10:37 2013
@@ -435,7 +435,7 @@ under the License.    
     
     <!--      JETTY  -->
     <fileSet>
-      <directory>target/jetty/jetty-distribution-7.4.4.v20110707/lib</directory>
+      <directory>target/jetty/jetty-distribution-${jetty.version}/lib</directory>
       <outputDirectory>webserver/lib</outputDirectory>
       <fileMode>755</fileMode>
       <directoryMode>755</directoryMode>        
@@ -561,8 +561,9 @@ under the License.    
       <directory>uima-ducc-web/src/main/webapp/root</directory>
       <outputDirectory>webserver/root</outputDirectory>
       <excludes>
-         <exclude>opensources/DataTables-1.9.1/media/original/**</exclude>
-         <exclude>opensources/DataTables-1.9.1/media/images/sort*</exclude>
+         <exclude>opensources/DataTables-${datatables.version}/media/original/**</exclude>
+         <exclude>opensources/DataTables-${datatables.version}/media/images/sort*</exclude>
+         <exclude>opensources/DataTables-${datatables.version}media/images/*.psd</exclude>
          <exclude>opensources/**/*.txt</exclude>
       </excludes>
       <fileMode>644</fileMode>
@@ -570,8 +571,8 @@ under the License.    
     </fileSet>
    
     <fileSet>
-      <directory>uima-ducc-web/src/main/webapp/root/opensources/DataTables-1.9.1/media/images/</directory>
-      <outputDirectory>webserver/root/opensources/DataTables-1.9.1/media/images/sort</outputDirectory>
+      <directory>uima-ducc-web/src/main/webapp/root/opensources/DataTables-${datatables.version}/media/images/</directory>
+      <outputDirectory>webserver/root/opensources/DataTables-${datatables.version}/media/images/sort</outputDirectory>
       <includes>
         <include>sort*</include>
       </includes>

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml?rev=1548246&r1=1548245&r2=1548246&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml Thu Dec  5 19:10:37 2013
@@ -162,7 +162,7 @@
 		<cglib.version>2.2.0</cglib.version>
 		<libpam.version>1.7</libpam.version>
 		<jna.version>4.0.0</jna.version>
-		
+		<datatables.version>1.9.1</datatables.version>
 	</properties>
 
 	<!-- dependencyManagement is a declaration section naming each artifact