Author: ctubbsii
Date: Sat May 11 02:08:39 2013
New Revision: 1481250
URL: http://svn.apache.org/r1481250
Log:
ACCUMULO-1404, ACCUMULO-1384 merge to trunk
Added:
accumulo/trunk/assemble/src/main/assemblies/binary-release.xml
- copied unchanged from r1481249,
accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml
Removed:
accumulo/trunk/assemble/src/main/assemblies/bin.xml
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/assemble/pom.xml
accumulo/trunk/bin/tool.sh
accumulo/trunk/pom.xml (contents, props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1480478-1480504,1480508-1480863,1480865-1481249
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/assemble:r1480478-1480504,1480508-1480863,1480865-1481249
Modified: accumulo/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1481250&r1=1481249&r2=1481250&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Sat May 11 02:08:39 2013
@@ -117,7 +117,7 @@
<phase>package</phase>
<configuration>
<descriptors>
- <descriptor>src/main/assemblies/bin.xml</descriptor>
+
<descriptor>src/main/assemblies/binary-release.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -169,14 +169,6 @@
<classifier>bin</classifier>
<provides>
<provide>accumulo</provide>
- <provide>accumulo-core</provide>
- <provide>accumulo-examples</provide>
- <provide>accumulo-fate</provide>
- <provide>accumulo-proxy</provide>
- <provide>accumulo-server</provide>
- <provide>accumulo-start</provide>
- <provide>accumulo-test</provide>
- <provide>accumulo-trace</provide>
</provides>
<requires>
<require>jre</require>
@@ -188,6 +180,9 @@
<directory>/opt/accumulo/accumulo-${project.version}</directory>
<sources>
<source>
+ <location>${accumulo-top}/CHANGES</location>
+ </source>
+ <source>
<location>${accumulo-top}/LICENSE</location>
</source>
<source>
@@ -210,25 +205,6 @@
</sources>
</mapping>
<mapping>
-
<directory>/opt/accumulo/accumulo-${project.version}/test</directory>
- <sources>
- <source>
- <location>${accumulo-top}/test</location>
- <excludes>
- <exclude>src/**</exclude>
- <exclude>target/**</exclude>
- <exclude>**/walkers.txt</exclude>
- <exclude>**/ingesters.txt</exclude>
- <exclude>**/continuous-env.sh</exclude>
- <exclude>.*/**</exclude>
- <exclude>**/*.pyc</exclude>
- <exclude>**/*.pyo</exclude>
- <exclude>pom.xml</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- <mapping>
<directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
</mapping>
<mapping>
@@ -245,25 +221,21 @@
</mapping>
<mapping>
<directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
+ <recurseDirectories>true</recurseDirectories>
<sources>
<source>
<location>${accumulo-top}/conf</location>
- <excludes>
-
<exclude>${accumulo-top}/**/accumulo-site.xml</exclude>
-
<exclude>${accumulo-top}/**/accumulo-env.sh</exclude>
-
<exclude>${accumulo-top}/**/accumulo-metrics.xml</exclude>
- <exclude>${accumulo-top}/**/test-*</exclude>
- <exclude>${accumulo-top}/**/slaves</exclude>
- <exclude>${accumulo-top}/**/masters</exclude>
- <exclude>${accumulo-top}/**/tracers</exclude>
- <exclude>${accumulo-top}/**/gc</exclude>
- <exclude>${accumulo-top}/**/monitor</exclude>
- </excludes>
+ <includes>
+ <include>accumulo.policy.example</include>
+ <include>examples/**/*</include>
+ <include>examples/**/*.*</include>
+ </includes>
</source>
</sources>
</mapping>
<mapping>
<directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
+ <recurseDirectories>true</recurseDirectories>
<sources>
<source>
<location>${accumulo-top}/lib</location>
@@ -293,7 +265,7 @@
<provide>accumulo-native</provide>
</provides>
<requires>
- <require>accumulo-server</require>
+ <require>accumulo</require>
</requires>
<mappings>
<mapping>
@@ -310,6 +282,45 @@
</mappings>
</configuration>
</execution>
+ <execution>
+ <id>build-tests-rpm</id>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <name>accumulo-test</name>
+ <classifier>test</classifier>
+ <provides>
+ <provide>accumulo-test</provide>
+ </provides>
+ <requires>
+ <require>accumulo</require>
+ <require>python</require>
+ </requires>
+ <mappings>
+ <mapping>
+
<directory>/opt/accumulo/accumulo-${project.version}/test</directory>
+ <sources>
+ <source>
+ <location>${accumulo-top}/test</location>
+ <excludes>
+ <exclude>src/**</exclude>
+ <exclude>target/**</exclude>
+ <exclude>**/walkers.txt</exclude>
+ <exclude>**/ingesters.txt</exclude>
+ <exclude>**/continuous-env.sh</exclude>
+ <exclude>.*/**</exclude>
+ <exclude>**/*.pyc</exclude>
+ <exclude>**/*.pyo</exclude>
+ <exclude>pom.xml</exclude>
+ </excludes>
+ </source>
+ </sources>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -344,7 +355,7 @@
<type>perm</type>
<prefix>/usr/lib/accumulo/lib</prefix>
</mapper>
- <excludes>**/.svn/**,**/lib/native/**</excludes>
+ <excludes>**/.svn/**,native/**</excludes>
</data>
<data>
<src>${accumulo-top}/NOTICE</src>
@@ -371,13 +382,21 @@
</mapper>
</data>
<data>
+ <src>${accumulo-top}/LICENSE</src>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/lib/accumulo</prefix>
+ </mapper>
+ </data>
+ <data>
<src>${accumulo-top}/docs</src>
<type>directory</type>
<mapper>
<type>perm</type>
<prefix>/usr/lib/accumulo/docs</prefix>
</mapper>
- <excludes>**/.svn/**</excludes>
+ <excludes>**/.svn/**,src/**</excludes>
</data>
<data>
<src>${accumulo-top}/bin</src>
@@ -396,15 +415,7 @@
<type>perm</type>
<prefix>/usr/lib/accumulo/conf</prefix>
</mapper>
-
<excludes>**/.svn/**,**/accumulo-site.xml,**/accumulo-env.sh,**/accumulo-metrics.xml,**/test-*,**/slaves,**/masters,**/tracers,**/gc,**/monitor</excludes>
- </data>
- <data>
- <src>${accumulo-top}/conf/examples</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/lib/accumulo/conf/examples</prefix>
- </mapper>
+ <includes>accumulo.policy.example,examples/**</includes>
<excludes>**/.svn/**</excludes>
</data>
</dataSet>
@@ -469,7 +480,7 @@
<type>perm</type>
<prefix>/usr/lib/accumulo/test</prefix>
</mapper>
- <excludes>**/.svn/**,**/*.pyc</excludes>
+
<excludes>**/.svn/**,**/*.pyc,src/**,target/**,**/walkers.txt,**/ingesters.txt,**/continuous-env.sh,.*/**,**/*.pyc,**/*.pyo,pom.xml</excludes>
</data>
</dataSet>
</configuration>
Modified: accumulo/trunk/bin/tool.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/bin/tool.sh?rev=1481250&r1=1481249&r2=1481250&view=diff
==============================================================================
--- accumulo/trunk/bin/tool.sh (original)
+++ accumulo/trunk/bin/tool.sh Sat May 11 02:08:39 2013
@@ -71,7 +71,7 @@ for arg in "$@"; do
done
LIB_JARS="$THRIFT_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$TRACE_LIB,$JCOMMANDER_LIB,$COMMONS_VFS_LIB"
-H_JARS="$THRIFT_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$TRACE_LIB:$JCOMMANDER_LIB,$COMMONS_VFS_LIB"
+H_JARS="$THRIFT_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$TRACE_LIB:$JCOMMANDER_LIB:$COMMONS_VFS_LIB"
for jar in $USERJARS; do
LIB_JARS="$LIB_JARS,$jar"
Modified: accumulo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1481250&r1=1481249&r2=1481250&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Sat May 11 02:08:39 2013
@@ -106,23 +106,14 @@
<properties>
<!-- used for filtering the java source with the current version -->
<accumulo.release.version>${project.version}</accumulo.release.version>
- <!-- arguments for the release plugin goals;
- these are in addition to apache-release defined in the parent POM -->
- <arguments>-P
seal-jars,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
- <!-- only prompt once for the next version -->
- <autoVersionSubmodules>true</autoVersionSubmodules>
<!-- the maven-release-plugin makes this recommendation, due to plugin
bugs -->
<maven.min-version>3.0.4</maven.min-version>
<powermock.version>1.5</powermock.version>
- <!-- for the release plugin -->
- <preparationGoals>clean compile javadoc:aggregate
install</preparationGoals>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sealJars>false</sealJars>
<!-- include the tarball, as well as the zip, for the Apache
source-release artifact -->
<sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor>
- <!-- stage the RC in the tags directory -->
- <tagNameFormat>@{project.version}-RC</tagNameFormat>
<!-- ZooKeeper 3.4.x works also, but we're not using new features yet;
this ensures 3.3.x compatibility. -->
<zookeeper.version>3.3.6</zookeeper.version>
</properties>
@@ -335,6 +326,7 @@
<configuration>
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
<lineSeparator>\n</lineSeparator>
+ <expandEmptyElements>false</expandEmptyElements>
<nrOfIndentSpace>2</nrOfIndentSpace>
<sortDependencies>scope,groupId,artifactId</sortDependencies>
<sortProperties>true</sortProperties>
@@ -429,6 +421,18 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-P
apache-release,seal-jars,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <goals>clean compile javadoc:aggregate deploy</goals>
+ <preparationGoals>clean compile javadoc:aggregate
verify</preparationGoals>
+ <tagNameFormat>@{project.version}-RC</tagNameFormat>
+ <useReleaseProfile>false</useReleaseProfile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skipDeploy>true</skipDeploy>
@@ -507,7 +511,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -520,7 +524,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -533,7 +537,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -546,7 +550,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -559,7 +563,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/pom.xml:r1480478-1480504,1480508-1480863,1480865-1481249
