Author: ctubbsii
Date: Thu May 16 15:53:43 2013
New Revision: 1483421
URL: http://svn.apache.org/r1483421
Log:
ACCUMULO-1413 applied v2 patch, which renames the parent POM and assemble
module artifactIds, to provide artifacts with more suitable names (getting rid
of the unnecessary zip version of the source release assembly in the process),
and updating documentation to reflect tarball filenames
Modified:
accumulo/branches/1.5/README
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
accumulo/branches/1.5/examples/pom.xml
accumulo/branches/1.5/fate/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml
accumulo/branches/1.5/start/pom.xml
accumulo/branches/1.5/test/pom.xml
accumulo/branches/1.5/trace/pom.xml
Modified: accumulo/branches/1.5/README
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/README?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
--- accumulo/branches/1.5/README (original)
+++ accumulo/branches/1.5/README Thu May 16 15:53:43 2013
@@ -44,7 +44,7 @@ easier to install.
Copy the accumulo tar file produced by mvn package from the assemble/target/
directory to the desired destination, then untar it (e.g.
-tar xzf accumulo-assemble-1.5.0-bin.tar.gz).
+tar xzf accumulo-1.5.0-bin.tar.gz).
If you are using the RPM, install the RPM on every machine that will run
accumulo.
Modified: accumulo/branches/1.5/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Thu May 16 15:53:43 2013
@@ -19,12 +19,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <artifactId>accumulo-assemble</artifactId>
+ <artifactId>accumulo</artifactId>
<packaging>pom</packaging>
- <name>Assemble</name>
+ <name>Assemblies</name>
<properties>
<accumulo-top>..</accumulo-top>
</properties>
@@ -116,6 +116,7 @@
</goals>
<phase>package</phase>
<configuration>
+ <attach>true</attach>
<descriptors>
<descriptor>src/main/assemblies/binary-release.xml</descriptor>
</descriptors>
Modified: accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
--- accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml
(original)
+++ accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml Thu
May 16 15:53:43 2013
@@ -17,11 +17,10 @@
-->
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
- <id>binary-release</id>
+ <id>bin</id>
<formats>
<format>tar.gz</format>
</formats>
- <baseDirectory>accumulo-${project.version}</baseDirectory>
<fileSets>
<fileSet>
<directory>../bin</directory>
Modified: accumulo/branches/1.5/core/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Thu May 16 15:53:43 2013
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-core</artifactId>
Modified:
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
---
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
(original)
+++
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
Thu May 16 15:53:43 2013
@@ -45,7 +45,7 @@ by the environment variable \texttt{\$AC
\small
\begin{verbatim}
-$ tar xzf accumulo-assemble-1.5.0-bin.tar.gz # unpack to subdirectory
+$ tar xzf accumulo-1.5.0-bin.tar.gz # unpack to subdirectory
$ mv accumulo-1.5.0 $ACCUMULO_HOME # move to desired location
\end{verbatim}
\normalsize
Modified: accumulo/branches/1.5/examples/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/pom.xml?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
--- accumulo/branches/1.5/examples/pom.xml (original)
+++ accumulo/branches/1.5/examples/pom.xml Thu May 16 15:53:43 2013
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-examples</artifactId>
Modified: accumulo/branches/1.5/fate/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
--- accumulo/branches/1.5/fate/pom.xml (original)
+++ accumulo/branches/1.5/fate/pom.xml Thu May 16 15:53:43 2013
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-fate</artifactId>
Modified: accumulo/branches/1.5/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Thu May 16 15:53:43 2013
@@ -23,10 +23,10 @@
<version>13</version>
</parent>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
<version>1.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Accumulo</name>
+ <name>Apache Accumulo Project</name>
<description>Apache Accumulo is a sorted, distributed key/value store based
on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper,
and Thrift. It features a few novel improvements on the BigTable design in the
form of cell-level access labels and a server-side programming mechanism that
can modify key/value pairs at various points in the data management
process.</description>
<!-- this URL is where the site derived via the maven-site-plugin ends up,
not the generic site -->
<url>http://accumulo.apache.org/maven-site/</url>
@@ -337,6 +337,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
+ <attach>false</attach>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
@@ -741,6 +742,35 @@
</reporting>
<profiles>
<profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-source-release-assembly</id>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <artifacts>
+ <artifact>
+
<file>${project.build.directory}/${project.artifactId}-${project.version}-source-release.tar.gz</file>
+ <type>tar.gz</type>
+ <classifier>src</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<!-- 'mvn clean -P sortpom' sorts -->
<id>sortpom</id>
<build>
Modified: accumulo/branches/1.5/proxy/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/pom.xml?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
--- accumulo/branches/1.5/proxy/pom.xml (original)
+++ accumulo/branches/1.5/proxy/pom.xml Thu May 16 15:53:43 2013
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-proxy</artifactId>
Modified: accumulo/branches/1.5/server/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/pom.xml?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
--- accumulo/branches/1.5/server/pom.xml (original)
+++ accumulo/branches/1.5/server/pom.xml Thu May 16 15:53:43 2013
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-server</artifactId>
Modified: accumulo/branches/1.5/start/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/start/pom.xml?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
--- accumulo/branches/1.5/start/pom.xml (original)
+++ accumulo/branches/1.5/start/pom.xml Thu May 16 15:53:43 2013
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-start</artifactId>
Modified: accumulo/branches/1.5/test/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/pom.xml?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
--- accumulo/branches/1.5/test/pom.xml (original)
+++ accumulo/branches/1.5/test/pom.xml Thu May 16 15:53:43 2013
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-test</artifactId>
Modified: accumulo/branches/1.5/trace/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/trace/pom.xml?rev=1483421&r1=1483420&r2=1483421&view=diff
==============================================================================
--- accumulo/branches/1.5/trace/pom.xml (original)
+++ accumulo/branches/1.5/trace/pom.xml Thu May 16 15:53:43 2013
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-trace</artifactId>
