You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by ct...@apache.org on 2016/07/27 20:03:20 UTC
[1/5] incubator-fluo git commit: Fixes #731 Make use of
auto-closeables
Repository: incubator-fluo
Updated Branches:
refs/heads/master 5ed9f2d86 -> cdbf2bbab
Fixes #731 Make use of auto-closeables
Make explicit use of AutoCloseable resources started in try-catch blocks
to prevent a compiler warning about their lack of use.
Remove unneeded MiniFluoImpl.main
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/eb8a1bcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/eb8a1bcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/eb8a1bcc
Branch: refs/heads/master
Commit: eb8a1bccd8ac2cf644c5326d5a8476d2af10e5d6
Parents: c9f41e2
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Jul 26 14:48:39 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jul 27 15:54:29 2016 -0400
----------------------------------------------------------------------
.../apache/fluo/core/client/FluoClientTest.java | 4 +--
.../java/org/apache/fluo/mini/MiniFluoImpl.java | 38 --------------------
2 files changed, 2 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/eb8a1bcc/modules/core/src/test/java/org/apache/fluo/core/client/FluoClientTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/fluo/core/client/FluoClientTest.java b/modules/core/src/test/java/org/apache/fluo/core/client/FluoClientTest.java
index ccb9cef..33d1291 100644
--- a/modules/core/src/test/java/org/apache/fluo/core/client/FluoClientTest.java
+++ b/modules/core/src/test/java/org/apache/fluo/core/client/FluoClientTest.java
@@ -42,7 +42,7 @@ public class FluoClientTest {
}
try (FluoClientImpl impl = new FluoClientImpl(config)) {
- Assert.fail();
+ Assert.fail("FluoClientImpl was " + impl);
} catch (IllegalArgumentException e) {
}
@@ -53,7 +53,7 @@ public class FluoClientTest {
config.setZookeeperTimeout(5);
try (FluoClientImpl impl = new FluoClientImpl(config)) {
- Assert.fail();
+ Assert.fail("FluoClientImpl was " + impl);
} catch (IllegalStateException e) {
}
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/eb8a1bcc/modules/mini/src/main/java/org/apache/fluo/mini/MiniFluoImpl.java
----------------------------------------------------------------------
diff --git a/modules/mini/src/main/java/org/apache/fluo/mini/MiniFluoImpl.java b/modules/mini/src/main/java/org/apache/fluo/mini/MiniFluoImpl.java
index 59f82c8..4e798ab 100644
--- a/modules/mini/src/main/java/org/apache/fluo/mini/MiniFluoImpl.java
+++ b/modules/mini/src/main/java/org/apache/fluo/mini/MiniFluoImpl.java
@@ -16,12 +16,10 @@
package org.apache.fluo.mini;
import java.io.File;
-import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.accumulo.core.client.Scanner;
@@ -38,7 +36,6 @@ import org.apache.fluo.core.impl.Environment;
import org.apache.fluo.core.impl.FluoConfigurationImpl;
import org.apache.fluo.core.impl.Notification;
import org.apache.fluo.core.oracle.OracleServer;
-import org.apache.fluo.core.util.UtilWaitThread;
import org.apache.fluo.core.worker.NotificationFinder;
import org.apache.fluo.core.worker.NotificationFinderFactory;
import org.apache.fluo.core.worker.NotificationProcessor;
@@ -191,39 +188,4 @@ public class MiniFluoImpl implements MiniFluo {
}
}
- public static void main(String[] args) {
-
- try {
- if (args.length != 1) {
- System.err.println("Usage: MiniFluoImpl <fluoPropsPath>");
- System.exit(-1);
- }
- String propsPath = args[0];
- Objects.requireNonNull(propsPath);
- File propsFile = new File(propsPath);
- if (!propsFile.exists()) {
- System.err.println("ERROR - Fluo properties file does not exist: " + propsPath);
- System.exit(-1);
- }
- Preconditions.checkArgument(propsFile.exists());
-
- FluoConfiguration config = new FluoConfiguration(propsFile);
- if (!config.hasRequiredMiniFluoProps()) {
- log.error("Failed to start MiniFluo - fluo.properties is missing required properties for "
- + "MiniFluo");
- System.exit(-1);
- }
- try (MiniFluo mini = new MiniFluoImpl(config)) {
- log.info("MiniFluo is running");
-
- while (true) {
- UtilWaitThread.sleep(1000);
- }
- }
- } catch (Exception e) {
- log.error("Exception running MiniFluo: ", e);
- }
-
- log.info("MiniFluo is exiting.");
- }
}
[2/5] incubator-fluo git commit: Fixes #729 Adds missing hashCode
implementations
Posted by ct...@apache.org.
Fixes #729 Adds missing hashCode implementations
Adds missing hashCode methods for classes which override equals.
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/c9f41e2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/c9f41e2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/c9f41e2e
Branch: refs/heads/master
Commit: c9f41e2ecb0b8b47d0d61487b409bb7f3e1e8c4e
Parents: 5ed9f2d
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Jul 26 14:40:13 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jul 27 15:54:29 2016 -0400
----------------------------------------------------------------------
.../test/java/org/apache/fluo/accumulo/iterators/TestData.java | 6 ++++++
modules/api/src/main/java/org/apache/fluo/api/data/Span.java | 5 +++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/c9f41e2e/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/TestData.java
----------------------------------------------------------------------
diff --git a/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/TestData.java b/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/TestData.java
index ae809c8..99b2b41 100644
--- a/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/TestData.java
+++ b/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/TestData.java
@@ -18,6 +18,7 @@ package org.apache.fluo.accumulo.iterators;
import java.io.IOException;
import java.util.HashSet;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
@@ -158,4 +159,9 @@ public class TestData {
sb.append("}");
return sb.toString();
}
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(data);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/c9f41e2e/modules/api/src/main/java/org/apache/fluo/api/data/Span.java
----------------------------------------------------------------------
diff --git a/modules/api/src/main/java/org/apache/fluo/api/data/Span.java b/modules/api/src/main/java/org/apache/fluo/api/data/Span.java
index 61f3178..6ac084b 100644
--- a/modules/api/src/main/java/org/apache/fluo/api/data/Span.java
+++ b/modules/api/src/main/java/org/apache/fluo/api/data/Span.java
@@ -194,6 +194,11 @@ public class Span implements Serializable {
+ ((endInclusive && !end.equals(RowColumn.EMPTY)) ? "]" : ")");
}
+ @Override
+ public int hashCode() {
+ return Objects.hash(start, end, startInclusive, endInclusive);
+ }
+
/**
* Creates a span that covers an exact row
*/
[5/5] incubator-fluo git commit: Fixes #734 Speed up release:perform
profile
Posted by ct...@apache.org.
Fixes #734 Speed up release:perform profile
Skips second execution of several test plugins during the
release:perform goal when releasing. This avoids running all the tests
which passed in the release:prepare phase all over again.
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/cdbf2bba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/cdbf2bba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/cdbf2bba
Branch: refs/heads/master
Commit: cdbf2bbab724a588b27cea5827093320b453685e
Parents: a1df4ae
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Jul 26 16:28:52 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jul 27 15:56:00 2016 -0400
----------------------------------------------------------------------
pom.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/cdbf2bba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f1ddd7a..f0ec122 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
<findbugs.maxRank>9</findbugs.maxRank>
<hadoop.version>2.6.3</hadoop.version>
<logback.version>1.1.3</logback.version>
+ <releaseProfiles>fluo-release</releaseProfiles>
<slf4j.version>1.7.12</slf4j.version>
<thrift.version>0.9.1</thrift.version>
<twill.version>0.6.0-incubating</twill.version>
@@ -356,6 +357,17 @@
</build>
<profiles>
<profile>
+ <id>fluo-release</id>
+ <!-- some properties to make the release build a bit faster -->
+ <properties>
+ <checkstyle.skip>true</checkstyle.skip>
+ <findbugs.skip>true</findbugs.skip>
+ <modernizer.skip>true</modernizer.skip>
+ <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>
[3/5] incubator-fluo git commit: Fixes #732 Remove declaration of
unthrown exceptions
Posted by ct...@apache.org.
Fixes #732 Remove declaration of unthrown exceptions
Remove declaration of "throws Exception" from AutoCloseable classes
whose close methods do not actually throw any checked exceptions. This
prevents propagating misinformation about what is possible to occur in
this method, and avoids a compiler warning about the possibility of
throwing InterruptedException.
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/302582b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/302582b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/302582b7
Branch: refs/heads/master
Commit: 302582b74cf967bc47a8262b1d1416e661a66aa4
Parents: eb8a1bc
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Jul 26 14:53:31 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jul 27 15:54:53 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/fluo/cluster/runner/YarnAppRunner.java | 2 +-
.../src/test/java/org/apache/fluo/integration/ITBaseImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/302582b7/modules/cluster/src/main/java/org/apache/fluo/cluster/runner/YarnAppRunner.java
----------------------------------------------------------------------
diff --git a/modules/cluster/src/main/java/org/apache/fluo/cluster/runner/YarnAppRunner.java b/modules/cluster/src/main/java/org/apache/fluo/cluster/runner/YarnAppRunner.java
index 6c52292..7894bce 100644
--- a/modules/cluster/src/main/java/org/apache/fluo/cluster/runner/YarnAppRunner.java
+++ b/modules/cluster/src/main/java/org/apache/fluo/cluster/runner/YarnAppRunner.java
@@ -434,7 +434,7 @@ public class YarnAppRunner extends ClusterAppRunner implements AutoCloseable {
}
@Override
- public void close() throws Exception {
+ public void close() {
for (TwillRunnerService twillRunner : twillRunners.values()) {
twillRunner.stop();
}
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/302582b7/modules/integration/src/test/java/org/apache/fluo/integration/ITBaseImpl.java
----------------------------------------------------------------------
diff --git a/modules/integration/src/test/java/org/apache/fluo/integration/ITBaseImpl.java b/modules/integration/src/test/java/org/apache/fluo/integration/ITBaseImpl.java
index 14d5efd..656a5d9 100644
--- a/modules/integration/src/test/java/org/apache/fluo/integration/ITBaseImpl.java
+++ b/modules/integration/src/test/java/org/apache/fluo/integration/ITBaseImpl.java
@@ -56,7 +56,7 @@ public class ITBaseImpl extends ITBase {
}
@Override
- public void close() throws Exception {
+ public void close() {
env.close();
}
}
[4/5] incubator-fluo git commit: Configure -source-release and -bin
tarballs
Posted by ct...@apache.org.
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 <ct...@apache.org>
Authored: Tue Jul 26 16:21:57 2016 -0400
Committer: Christopher Tubbs <ct...@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>