incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1229539 - in /incubator/accumulo/trunk: ./ src/assemble/dist.xml src/assemble/pom.xml src/core/ src/server/
Date Tue, 10 Jan 2012 13:53:10 GMT
Author: ecn
Date: Tue Jan 10 13:53:10 2012
New Revision: 1229539

URL: http://svn.apache.org/viewvc?rev=1229539&view=rev
Log:
ACCUMULO-269 merge to trunk (not really necessary) and set the output filename using the parent
module artifactId

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/src/assemble/dist.xml
    incubator/accumulo/trunk/src/assemble/pom.xml
    incubator/accumulo/trunk/src/core/   (props changed)
    incubator/accumulo/trunk/src/server/   (props changed)

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 10 13:53:10 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1228245,1228308
+/incubator/accumulo/branches/1.4:1201902-1228245,1228308,1229357

Modified: incubator/accumulo/trunk/src/assemble/dist.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/assemble/dist.xml?rev=1229539&r1=1229538&r2=1229539&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/assemble/dist.xml (original)
+++ incubator/accumulo/trunk/src/assemble/dist.xml Tue Jan 10 13:53:10 2012
@@ -24,48 +24,49 @@
 		<fileSet>
 			<directory>../../logs</directory>
 			<directoryMode>0700</directoryMode>
-      <excludes>
-        <exclude>*</exclude>
-      </excludes>
+			<excludes>
+				<exclude>*</exclude>
+			</excludes>
 		</fileSet>
 		<fileSet>
 			<directory>../../walogs</directory>
 			<directoryMode>0700</directoryMode>
-      <excludes>
-        <exclude>*</exclude>
-      </excludes>
+			<excludes>
+				<exclude>*</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>../../</directory>
+			<includes>
+				<include>**/*.py</include>
+				<include>**/*.pl</include>
+				<include>**/*.sh</include>
+			</includes>
+			<excludes>
+				<exclude>**/target</exclude>
+				<exclude>**/accumulo-env.sh</exclude>
+				<exclude>**/continuous-env.sh</exclude>
+				<exclude>**bin/**</exclude>
+				<exclude>logs/**</exclude>
+				<exclude>walogs/**</exclude>
+				<exclude>**.*</exclude>
+			</excludes>
 		</fileSet>
-    <fileSet>
-      <directory>../../</directory>
-      <includes>
-        <include>**/*.py</include>
-        <include>**/*.pl</include>
-        <include>**/*.sh</include>
-      </includes>
-      <excludes>
-        <exclude>**/target</exclude>
-        <exclude>**/accumulo-env.sh</exclude>
-        <exclude>**/continuous-env.sh</exclude>
-        <exclude>**bin/**</exclude>
-        <exclude>logs/**</exclude>
-        <exclude>walogs/**</exclude>
-        <exclude>**.*</exclude>
-      </excludes>
-    </fileSet>
 		<fileSet>
 			<directory>../../</directory>
 			<excludes>
 				<!-- the following ignored because they were included above -->
-        <exclude>**/*.py</exclude>
-        <exclude>**/*.pl</exclude>
-        <exclude>**/*.sh</exclude>
-        <exclude>walogs/**</exclude>
-        <exclude>logs/**</exclude>
-        <exclude>bin/**</exclude>
+				<exclude>**/*.py</exclude>
+				<exclude>**/*.pl</exclude>
+				<exclude>**/*.sh</exclude>
+				<exclude>walogs/**</exclude>
+				<exclude>logs/**</exclude>
+				<exclude>bin/**</exclude>
 
-        <!-- the following directories ignored because they should not be in the tarball
-->
+				<!-- the following directories ignored because they should not be in 
+					the tarball -->
 				<exclude>**/.*/**</exclude>
-        <exclude>**/target/**</exclude>
+				<exclude>**/target/**</exclude>
 
 				<!-- the following files ignored because they should not be in the tarball -->
 				<exclude>**/.*</exclude>
@@ -83,8 +84,8 @@
 				<exclude>**/randomwalk/conf/logger.xml</exclude>
 				<exclude>**/randomwalk/conf/randomwalk.conf</exclude>
 				<exclude>**/randomwalk/conf/walkers</exclude>
-        <exclude>${so}</exclude>
-        <exclude>${jnilib}</exclude>
+				<exclude>${so}</exclude>
+				<exclude>${jnilib}</exclude>
 			</excludes>
 			<fileMode>0644</fileMode>
 			<directoryMode>0755</directoryMode>

Modified: incubator/accumulo/trunk/src/assemble/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/assemble/pom.xml?rev=1229539&r1=1229538&r2=1229539&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/assemble/pom.xml (original)
+++ incubator/accumulo/trunk/src/assemble/pom.xml Tue Jan 10 13:53:10 2012
@@ -87,6 +87,7 @@
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
+          <finalName>${parent.artifactId}-${version}</finalName>
           <descriptors>
             <descriptor>src/assemble/dist.xml</descriptor>
           </descriptors>

Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 10 13:53:10 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
 /incubator/accumulo/branches/1.3.5rc/src/core:1209938
-/incubator/accumulo/branches/1.4/src/core:1201902-1228245,1228308
+/incubator/accumulo/branches/1.4/src/core:1201902-1228245,1228308,1229357

Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 10 13:53:10 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3/src/server:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611
 /incubator/accumulo/branches/1.3.5rc/src/server:1209938
-/incubator/accumulo/branches/1.4/src/server:1201902-1228245,1228308
+/incubator/accumulo/branches/1.4/src/server:1201902-1228245,1228308,1229357



Mime
View raw message