fluo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [4/5] incubator-fluo git commit: Configure -source-release and -bin tarballs
Date Wed, 27 Jul 2016 20:03:23 GMT
Configure -source-release and -bin tarballs

Ensure -source-release tarball is properly named when built with the
'apache-release' profile, and is consistent with the naming conventions
for the -bin tarball.

Fixes #733 warnings, and cleans up the assembly descriptor.


Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/a1df4ae5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/a1df4ae5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/a1df4ae5

Branch: refs/heads/master
Commit: a1df4ae56a1222f7130921fee6dcf2bae7943d86
Parents: 302582b
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Jul 26 16:21:57 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Jul 27 15:54:53 2016 -0400

----------------------------------------------------------------------
 modules/accumulo/pom.xml                       |  2 +-
 modules/api/pom.xml                            |  2 +-
 modules/cluster/pom.xml                        |  2 +-
 modules/core/pom.xml                           |  2 +-
 modules/distribution/pom.xml                   | 18 +++++++++-----
 modules/distribution/src/main/assembly/bin.xml | 21 ++++++-----------
 modules/integration/pom.xml                    |  2 +-
 modules/mapreduce/pom.xml                      |  2 +-
 modules/mini/pom.xml                           |  2 +-
 pom.xml                                        | 26 +++++++++++++++++++--
 10 files changed, 50 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/a1df4ae5/modules/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/modules/accumulo/pom.xml b/modules/accumulo/pom.xml
index e480c98..2e91bd0 100644
--- a/modules/accumulo/pom.xml
+++ b/modules/accumulo/pom.xml
@@ -17,7 +17,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.fluo</groupId>
-    <artifactId>fluo</artifactId>
+    <artifactId>fluo-project</artifactId>
     <version>1.0.0-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/a1df4ae5/modules/api/pom.xml
----------------------------------------------------------------------
diff --git a/modules/api/pom.xml b/modules/api/pom.xml
index 58b2e37..491dcca 100644
--- a/modules/api/pom.xml
+++ b/modules/api/pom.xml
@@ -17,7 +17,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.fluo</groupId>
-    <artifactId>fluo</artifactId>
+    <artifactId>fluo-project</artifactId>
     <version>1.0.0-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/a1df4ae5/modules/cluster/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cluster/pom.xml b/modules/cluster/pom.xml
index 6892856..8d37fe3 100644
--- a/modules/cluster/pom.xml
+++ b/modules/cluster/pom.xml
@@ -17,7 +17,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.fluo</groupId>
-    <artifactId>fluo</artifactId>
+    <artifactId>fluo-project</artifactId>
     <version>1.0.0-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/a1df4ae5/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index fda008d..91a40cd 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -17,7 +17,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.fluo</groupId>
-    <artifactId>fluo</artifactId>
+    <artifactId>fluo-project</artifactId>
     <version>1.0.0-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/a1df4ae5/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index bf95251..90b0e7c 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -17,11 +17,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.fluo</groupId>
-    <artifactId>fluo</artifactId>
+    <artifactId>fluo-project</artifactId>
     <version>1.0.0-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
-  <artifactId>fluo-distribution</artifactId>
+  <artifactId>fluo</artifactId>
   <packaging>pom</packaging>
   <name>Fluo Distribution</name>
   <description>This module produces a tarball distribution of Fluo.  It contains all
of the default configuration
@@ -31,26 +31,32 @@
     <dependency>
       <groupId>org.apache.fluo</groupId>
       <artifactId>fluo-accumulo</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.fluo</groupId>
       <artifactId>fluo-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.fluo</groupId>
       <artifactId>fluo-cluster</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.fluo</groupId>
       <artifactId>fluo-core</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.fluo</groupId>
       <artifactId>fluo-mapreduce</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.fluo</groupId>
       <artifactId>fluo-mini</artifactId>
+      <optional>true</optional>
     </dependency>
   </dependencies>
   <build>
@@ -65,7 +71,6 @@
             </goals>
             <phase>package</phase>
             <configuration>
-              <finalName>fluo-${project.version}</finalName>
               <descriptors>
                 <descriptor>src/main/assembly/bin.xml</descriptor>
               </descriptors>
@@ -77,7 +82,8 @@
   </build>
   <profiles>
     <profile>
-      <id>full</id>
+      <!-- attach source release when it is created by the apache-release profile -->
+      <id>apache-release</id>
       <build>
         <plugins>
           <plugin>
@@ -92,9 +98,9 @@
                 <configuration>
                   <artifacts>
                     <artifact>
-                      <file>${project.parent.build.directory}/fluo-${project.version}-source-release.tar.gz</file>
+                      <file>${project.parent.build.directory}/${project.artifactId}-${project.version}-source-release.tar.gz</file>
                       <type>tar.gz</type>
-                      <classifier>src</classifier>
+                      <classifier>source-release</classifier>
                     </artifact>
                   </artifacts>
                 </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/a1df4ae5/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/src/main/assembly/bin.xml b/modules/distribution/src/main/assembly/bin.xml
index aca8c63..2e9fac6 100644
--- a/modules/distribution/src/main/assembly/bin.xml
+++ b/modules/distribution/src/main/assembly/bin.xml
@@ -23,25 +23,18 @@
       <outputDirectory>lib</outputDirectory>
       <directoryMode>0755</directoryMode>
       <fileMode>0644</fileMode>
-      <useProjectArtifact>true</useProjectArtifact>
-      <scope>runtime</scope>
-      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
+      <useProjectArtifact>false</useProjectArtifact>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <includes>
-        <include>org.apache.fluo:fluo-api</include>
-        <include>org.apache.fluo:fluo-accumulo</include>
-        <include>org.apache.fluo:fluo-core</include>
-        <include>org.apache.fluo:fluo-mini</include>
-        <include>org.apache.fluo:fluo-mapreduce</include>
-        <include>org.apache.fluo:fluo-cluster</include>
+        <include>${groupId}:fluo-*</include>
       </includes>
     </dependencySet>
   </dependencySets>
 
   <fileSets>
     <fileSet>
-      <directory>${project.basedir}/../../</directory>
-      <outputDirectory>/</outputDirectory>
+      <directory>../../</directory>
+      <outputDirectory>.</outputDirectory>
       <includes>
         <include>DISCLAIMER</include>
         <include>LICENSE</include>
@@ -80,21 +73,21 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${project.basedir}/../../docs</directory>
+      <directory>../../docs</directory>
       <outputDirectory>docs</outputDirectory>
       <includes>
         <include>*</include>
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${project.basedir}/../../contrib/grafana</directory>
+      <directory>../../contrib/grafana</directory>
       <outputDirectory>contrib/grafana</outputDirectory>
       <includes>
         <include>*</include>
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${project.basedir}/../../contrib/influxdb</directory>
+      <directory>../../contrib/influxdb</directory>
       <outputDirectory>contrib/influxdb</outputDirectory>
       <includes>
         <include>*</include>

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/a1df4ae5/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index a723838..35a28f0 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -17,7 +17,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.fluo</groupId>
-    <artifactId>fluo</artifactId>
+    <artifactId>fluo-project</artifactId>
     <version>1.0.0-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/a1df4ae5/modules/mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mapreduce/pom.xml b/modules/mapreduce/pom.xml
index 22deb22..0491238 100644
--- a/modules/mapreduce/pom.xml
+++ b/modules/mapreduce/pom.xml
@@ -17,7 +17,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.fluo</groupId>
-    <artifactId>fluo</artifactId>
+    <artifactId>fluo-project</artifactId>
     <version>1.0.0-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/a1df4ae5/modules/mini/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mini/pom.xml b/modules/mini/pom.xml
index e585e8d..38a8f42 100644
--- a/modules/mini/pom.xml
+++ b/modules/mini/pom.xml
@@ -17,7 +17,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.fluo</groupId>
-    <artifactId>fluo</artifactId>
+    <artifactId>fluo-project</artifactId>
     <version>1.0.0-incubating-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/a1df4ae5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b5d388a..f1ddd7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,10 +20,10 @@
     <artifactId>fluo-parent</artifactId>
     <version>1-SNAPSHOT</version>
   </parent>
-  <artifactId>fluo</artifactId>
+  <artifactId>fluo-project</artifactId>
   <version>1.0.0-incubating-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>Fluo Parent</name>
+  <name>Fluo Project</name>
   <description>An implementation of Percolator for Apache Accumulo</description>
   <licenses>
     <license>
@@ -354,4 +354,26 @@
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <!-- set proper source assembly name with apache-release and don't attach here -->
+      <id>apache-release</id>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-assembly-plugin</artifactId>
+              <inherited>false</inherited>
+              <configuration>
+                <!-- source assembly gets attached in the assemble module -->
+                <attach>false</attach>
+                <finalName>fluo-${project.version}</finalName>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+  </profiles>
 </project>


Mime
View raw message