accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [5/7] accumulo git commit: ACCUMULO-2712 Use tarball-only assembly
Date Fri, 08 May 2015 00:03:11 GMT
ACCUMULO-2712 Use tarball-only assembly

* Added previously omitted use of tarball-only assembly descriptor
  to avoid creating an unused zip.
* Cleaned up release profiles, since we no longer have to override
  the one in the parent POM.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61eea424
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61eea424
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/61eea424

Branch: refs/heads/master
Commit: 61eea4243f202e7747c92452d642855870b500a0
Parents: 6d8f47c
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu May 7 19:23:21 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu May 7 19:23:21 2015 -0400

----------------------------------------------------------------------
 assemble/pom.xml      |  1 +
 pom.xml               | 39 ++++++++-------------------------------
 server/native/pom.xml |  1 +
 3 files changed, 10 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/61eea424/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index f15c5f4..e88cd81 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -298,6 +298,7 @@
                 </goals>
                 <phase>package</phase>
                 <configuration>
+                  <finalName>${project.build.finalName}</finalName>
                   <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
                   <formats>
                     <format>dir</format>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/61eea424/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3aaff0f..9ab40e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,7 @@
     <sealJars>false</sealJars>
     <!-- overwritten in hadoop profiles -->
     <slf4j.version>1.7.5</slf4j.version>
+    <sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
     <!-- Thrift version -->
     <thrift.version>0.9.1</thrift.version>
     <!-- ZooKeeper version -->
@@ -574,6 +575,8 @@
           <artifactId>maven-assembly-plugin</artifactId>
           <configuration>
             <attach>false</attach>
+            <!-- this is for releases; override for other assembly executions -->
+            <finalName>accumulo-${project.version}</finalName>
             <tarLongFileMode>gnu</tarLongFileMode>
           </configuration>
         </plugin>
@@ -646,12 +649,12 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
           <configuration>
-            <arguments>-P !autoformat,apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
+            <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
             <autoVersionSubmodules>true</autoVersionSubmodules>
             <goals>clean deploy</goals>
             <preparationGoals>clean verify</preparationGoals>
             <tagNameFormat>@{project.version}</tagNameFormat>
-            <releaseProfiles>seal-jars,skip-findbugs</releaseProfiles>
+            <releaseProfiles>apache-release,move-source-tarball,seal-jars,skip-findbugs</releaseProfiles>
             <useReleaseProfile>false</useReleaseProfile>
             <pushChanges>false</pushChanges>
             <localCheckout>true</localCheckout>
@@ -1250,46 +1253,20 @@
   </reporting>
   <profiles>
     <profile>
-      <id>apache-release</id>
+      <id>move-source-tarball</id>
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <dependencies>
-              <dependency>
-                <groupId>org.apache.apache.resources</groupId>
-                <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                <version>1.0.4</version>
-              </dependency>
-            </dependencies>
-            <executions>
-              <execution>
-                <id>source-release-assembly</id>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <phase>validate</phase>
-                <configuration>
-                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                  <finalName>accumulo-${project.version}</finalName>
-                  <descriptorRefs>
-                    <descriptorRef>source-release-zip-tar</descriptorRef>
-                  </descriptorRefs>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
+            <inherited>false</inherited>
             <executions>
               <execution>
                 <id>rename-source-release-assembly</id>
                 <goals>
                   <goal>exec</goal>
                 </goals>
-                <phase>validate</phase>
+                <phase>package</phase>
                 <configuration>
                   <executable>mv</executable>
                   <workingDirectory>${project.build.directory}</workingDirectory>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/61eea424/server/native/pom.xml
----------------------------------------------------------------------
diff --git a/server/native/pom.xml b/server/native/pom.xml
index d175093..5a18728 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -81,6 +81,7 @@
             <configuration>
               <attach>true</attach>
               <appendAssemblyId>false</appendAssemblyId>
+              <finalName>${project.build.finalName}</finalName>
               <descriptors>
                 <descriptor>src/main/assemblies/native-tarball.xml</descriptor>
               </descriptors>


Mime
View raw message