Merge branch '1.7' into 1.8
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 9c1639a..022669a 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -26,10 +26,6 @@
<packaging>pom</packaging>
<name>Apache Accumulo</name>
<description>Apache Accumulo packages.</description>
- <properties>
- <DEV_ACCUMULO_HOME>${project.build.directory}</DEV_ACCUMULO_HOME>
- <accumulo-top>..</accumulo-top>
- </properties>
<dependencies>
<dependency>
<groupId>com.beust</groupId>
@@ -265,23 +261,6 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>directory-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
- <formats>
- <format>dir</format>
- </formats>
- <descriptors>
- <descriptor>src/main/assemblies/dev-directory.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
<id>binary-assembly</id>
<goals>
<goal>single</goal>
diff --git a/pom.xml b/pom.xml
index a09eb87..77e5597 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1282,6 +1282,10 @@
<skipITs>true</skipITs>
<skipTests>true</skipTests>
</properties>
+ </profile>
+ <profile>
+ <!-- set proper source assembly name with apache-release and don't attach here -->
+ <id>apache-release</id>
<build>
<pluginManagement>
<plugins>
diff --git a/server/native/pom.xml b/server/native/pom.xml
index 0c249fb..d0e5ee8 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -77,6 +77,21 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
+ <id>assemble-native-directory</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <attach>false</attach>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>${project.build.finalName}</finalName>
+ <descriptors>
+ <descriptor>src/main/assemblies/native-dir.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
<id>assemble-native-tarball</id>
<goals>
<goal>single</goal>
diff --git a/assemble/src/main/assemblies/dev-directory.xml b/server/native/src/main/assemblies/native-dir.xml
similarity index 98%
rename from assemble/src/main/assemblies/dev-directory.xml
rename to server/native/src/main/assemblies/native-dir.xml
index 1c1de08..52d3245 100644
--- a/assemble/src/main/assemblies/dev-directory.xml
+++ b/server/native/src/main/assemblies/native-dir.xml
@@ -17,7 +17,7 @@
-->
<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>dev</id>
+ <id>src</id>
<formats>
<format>dir</format>
</formats>
diff --git a/server/native/src/main/assemblies/native-tarball.xml b/server/native/src/main/assemblies/native-tarball.xml
index 1d1480b..7b3f5c4 100644
--- a/server/native/src/main/assemblies/native-tarball.xml
+++ b/server/native/src/main/assemblies/native-tarball.xml
@@ -19,7 +19,6 @@
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>src</id>
<formats>
- <format>dir</format>
<format>tar.gz</format>
</formats>
<componentDescriptors>
