You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/05/04 00:47:35 UTC
svn commit: r1479000 - in /accumulo/branches/1.5: assemble/pom.xml pom.xml
proxy/pom.xml server/pom.xml
Author: ctubbsii
Date: Fri May 3 22:47:34 2013
New Revision: 1479000
URL: http://svn.apache.org/r1479000
Log:
ACCUMULO-1316 make separate RPM build of native libraries
Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml
Modified: accumulo/branches/1.5/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1479000&r1=1478999&r2=1479000&view=diff
==============================================================================
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Fri May 3 22:47:34 2013
@@ -110,7 +110,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>distro-assembly</id>
+ <id>binary-assembly</id>
<goals>
<goal>single</goal>
</goals>
@@ -145,124 +145,170 @@
<keyPassphrase>
<passphrase>dummy</passphrase>
</keyPassphrase>
- <classifier>bin</classifier>
<summary>Apache Accumulo BigTable clone</summary>
<description>Apache Accumulo is a large distributed structured store based on Google's BigTable design.</description>
<!-- This populates the license field of the RPM. -->
<copyright>Apache License, Version 2.0 and others (see included LICENSE file)</copyright>
<url>http://accumulo.apache.org</url>
<group>Utilities</group>
- <requires>
- <require>jdk</require>
- <require>hadoop</require>
- <require>zookeeper</require>
- </requires>
<prefix>/opt/accumulo</prefix>
<defaultDirmode>755</defaultDirmode>
<defaultFilemode>644</defaultFilemode>
<defaultUsername>root</defaultUsername>
<defaultGroupname>root</defaultGroupname>
- <mappings>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}</directory>
- <sources>
- <source>
- <location>${accumulo-top}/LICENSE</location>
- </source>
- <source>
- <location>${accumulo-top}/NOTICE</location>
- </source>
- <source>
- <location>${accumulo-top}/README</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
- <sources>
- <source>
- <location>${accumulo-top}/docs</location>
- <excludes>
- <exclude>src/**</exclude>
- </excludes>
- </source>
- </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>
- <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
- <directoryIncluded>false</directoryIncluded>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>${accumulo-top}/bin</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
- <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>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
- <sources>
- <source>
- <location>${accumulo-top}/lib</location>
- <includes>
- <include>*.jar</include>
- </includes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/lib/ext</directory>
- </mapping>
- </mappings>
</configuration>
<executions>
<execution>
+ <id>build-bin-rpm</id>
<goals>
<goal>attached-rpm</goal>
</goals>
<phase>package</phase>
+ <configuration>
+ <name>accumulo</name>
+ <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>jdk</require>
+ <require>hadoop</require>
+ <require>zookeeper</require>
+ </requires>
+ <mappings>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}</directory>
+ <sources>
+ <source>
+ <location>${accumulo-top}/LICENSE</location>
+ </source>
+ <source>
+ <location>${accumulo-top}/NOTICE</location>
+ </source>
+ <source>
+ <location>${accumulo-top}/README</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
+ <sources>
+ <source>
+ <location>${accumulo-top}/docs</location>
+ <excludes>
+ <exclude>src/**</exclude>
+ </excludes>
+ </source>
+ </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>
+ <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
+ <directoryIncluded>false</directoryIncluded>
+ <filemode>755</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>${accumulo-top}/bin</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
+ <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>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
+ <sources>
+ <source>
+ <location>${accumulo-top}/lib</location>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}/lib/ext</directory>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-native-libs-rpm</id>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <name>accumulo-native</name>
+ <classifier>native</classifier>
+ <needarch>x86_64</needarch>
+ <provides>
+ <provide>accumulo-native</provide>
+ </provides>
+ <requires>
+ <require>accumulo-server</require>
+ </requires>
+ <mappings>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}/lib/native/map</directory>
+ <sources>
+ <source>
+ <location>${accumulo-top}/lib/native/map</location>
+ <includes>
+ <include>libNativeMap-Linux-amd64-64.so</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ </mappings>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -286,6 +332,7 @@
</goals>
<phase>package</phase>
<configuration>
+ <deb>${project.build.directory}/accumulo-${version}.deb</deb>
<classifier>bin</classifier>
<controlDir>assemble/deb/accumulo</controlDir>
<installDir>/usr/lib/accumulo</installDir>
@@ -370,9 +417,10 @@
</goals>
<phase>package</phase>
<configuration>
+ <deb>${project.build.directory}/accumulo-native-${version}.deb</deb>
<controlDir>assemble/deb/accumulo-native</controlDir>
<installDir>/usr/lib/accumulo</installDir>
- <classifier>native-libs</classifier>
+ <classifier>native</classifier>
<dataSet>
<data>
<src>${accumulo-top}/server/src/main/c++</src>
@@ -409,9 +457,10 @@
</goals>
<phase>package</phase>
<configuration>
+ <deb>${project.build.directory}/accumulo-test-${version}.deb</deb>
<controlDir>assemble/deb/accumulo-test</controlDir>
<installDir>/usr/lib/accumulo</installDir>
- <classifier>tests</classifier>
+ <classifier>test</classifier>
<dataSet>
<data>
<src>${accumulo-top}/test</src>
Modified: accumulo/branches/1.5/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1479000&r1=1478999&r2=1479000&view=diff
==============================================================================
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Fri May 3 22:47:34 2013
@@ -108,7 +108,7 @@
<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,dist,assemble,docs,rpm,deb</arguments>
+ <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 -->
Modified: accumulo/branches/1.5/proxy/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/pom.xml?rev=1479000&r1=1478999&r2=1479000&view=diff
==============================================================================
--- accumulo/branches/1.5/proxy/pom.xml (original)
+++ accumulo/branches/1.5/proxy/pom.xml Fri May 3 22:47:34 2013
@@ -102,7 +102,7 @@
<artifactId>accumulo-examples-simple</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-test</artifactId>
<scope>test</scope>
Modified: accumulo/branches/1.5/server/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/pom.xml?rev=1479000&r1=1478999&r2=1479000&view=diff
==============================================================================
--- accumulo/branches/1.5/server/pom.xml (original)
+++ accumulo/branches/1.5/server/pom.xml Fri May 3 22:47:34 2013
@@ -110,7 +110,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -139,7 +139,7 @@
</build>
<profiles>
<profile>
- <id>dist</id>
+ <id>native</id>
<build>
<plugins>
<plugin>
@@ -151,7 +151,7 @@
<goals>
<goal>exec</goal>
</goals>
- <phase>package</phase>
+ <phase>compile</phase>
<configuration>
<executable>make</executable>
<workingDirectory>${basedir}/src/main/c++</workingDirectory>