You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2016/05/12 21:41:20 UTC
[1/3] incubator-apex-malhar git commit: APEXMALHAR-2067 Necessary
changes to work with Apex Core 3.4.0 due to ning.com:async-http-client and
OperatorContext
Repository: incubator-apex-malhar
Updated Branches:
refs/heads/master 79c643b95 -> e38e144f2
APEXMALHAR-2067 Necessary changes to work with Apex Core 3.4.0 due to ning.com:async-http-client and OperatorContext
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/188afbe8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/188afbe8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/188afbe8
Branch: refs/heads/master
Commit: 188afbe84982fe91252d8af3e617686ab711ae30
Parents: 79c643b
Author: David Yan <da...@datatorrent.com>
Authored: Thu Mar 17 15:15:31 2016 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Tue May 10 10:58:10 2016 -0700
----------------------------------------------------------------------
.../HBaseTransactionalPutOperatorTest.java | 18 +++++
library/pom.xml | 5 ++
.../lib/io/PubSubWebSocketInputOperator.java | 3 +-
.../lib/io/PubSubWebSocketOutputOperator.java | 3 +-
.../lib/io/WebSocketInputOperator.java | 16 ++---
.../lib/io/WebSocketOutputOperator.java | 38 +++++------
.../lib/io/WidgetOutputOperator.java | 71 +++++++++++---------
.../lib/helper/OperatorContextTestHelper.java | 5 ++
pom.xml | 8 ++-
9 files changed, 96 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/188afbe8/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTransactionalPutOperatorTest.java
----------------------------------------------------------------------
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTransactionalPutOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTransactionalPutOperatorTest.java
index e34c482..eef69d4 100644
--- a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTransactionalPutOperatorTest.java
+++ b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTransactionalPutOperatorTest.java
@@ -86,6 +86,12 @@ public class HBaseTransactionalPutOperatorTest {
public void sendMetrics(Collection<String> collection)
{
}
+
+ @Override
+ public int getWindowsFromCheckpoint()
+ {
+ return 0;
+ }
});
thop.beginWindow(0);
thop.input.process(t1);
@@ -150,6 +156,12 @@ public class HBaseTransactionalPutOperatorTest {
public void sendMetrics(Collection<String> collection)
{
}
+
+ @Override
+ public int getWindowsFromCheckpoint()
+ {
+ return 0;
+ }
});
thop.beginWindow(0);
thop.input.process(t1);
@@ -218,6 +230,12 @@ public class HBaseTransactionalPutOperatorTest {
public void sendMetrics(Collection<String> collection)
{
}
+
+ @Override
+ public int getWindowsFromCheckpoint()
+ {
+ return 0;
+ }
});
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/188afbe8/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index d11d80c..cd4d2a4 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -334,6 +334,11 @@
<artifactId>fastutil</artifactId>
<version>7.0.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.apex</groupId>
+ <artifactId>apex-shaded-ning19</artifactId>
+ <version>1.0.0</version>
+ </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/188afbe8/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java
index cdf2ee5..0b56924 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java
@@ -28,7 +28,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.datatorrent.common.util.PubSubMessageCodec;
-import com.datatorrent.common.util.PubSubWebSocketClient;
/**
* This operator reads JSON objects from the given URL and converts them into maps.
@@ -82,7 +81,7 @@ public class PubSubWebSocketInputOperator<T> extends WebSocketInputOperator<T>
{
super.run();
try {
- connection.sendTextMessage(PubSubWebSocketClient.constructSubscribeMessage(topic, codec));
+ connection.sendMessage(PubSubMessageCodec.constructSubscribeMessage(topic, codec));
}
catch (IOException ex) {
LOG.error("Exception caught", ex);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/188afbe8/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java
index b704191..c51c0c9 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import javax.validation.constraints.NotNull;
import com.datatorrent.common.util.PubSubMessageCodec;
-import com.datatorrent.common.util.PubSubWebSocketClient;
/**
* This operator writes maps as JSON objects to the given URL.
@@ -63,7 +62,7 @@ public class PubSubWebSocketOutputOperator<T> extends WebSocketOutputOperator<T>
@Override
public String convertMapToMessage(T t) throws IOException
{
- return PubSubWebSocketClient.constructPublishMessage(topic, t, codec);
+ return PubSubMessageCodec.constructPublishMessage(topic, t, codec);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/188afbe8/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
index a2e7165..f805dcf 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
@@ -31,11 +31,11 @@ import org.slf4j.LoggerFactory;
import org.apache.commons.lang3.ClassUtils;
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.AsyncHttpClientConfigBean;
-import com.ning.http.client.websocket.WebSocket;
-import com.ning.http.client.websocket.WebSocketTextListener;
-import com.ning.http.client.websocket.WebSocketUpgradeHandler;
+import org.apache.apex.shaded.ning19.com.ning.http.client.AsyncHttpClient;
+import org.apache.apex.shaded.ning19.com.ning.http.client.AsyncHttpClientConfigBean;
+import org.apache.apex.shaded.ning19.com.ning.http.client.ws.WebSocket;
+import org.apache.apex.shaded.ning19.com.ning.http.client.ws.WebSocketTextListener;
+import org.apache.apex.shaded.ning19.com.ning.http.client.ws.WebSocketUpgradeHandler;
import com.datatorrent.api.Context.OperatorContext;
@@ -223,12 +223,6 @@ public class WebSocketInputOperator<T> extends SimpleSinglePortInputOperator<T>
}
@Override
- public void onFragment(String string, boolean bln)
- {
- LOG.debug("onFragment");
- }
-
- @Override
public void onOpen(WebSocket ws)
{
LOG.debug("Connection opened");
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/188afbe8/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
index 134c913..b793183 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
@@ -20,20 +20,24 @@ package com.datatorrent.lib.io;
import java.io.IOException;
import java.net.URI;
-import java.util.concurrent.*;
-
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.AsyncHttpClientConfigBean;
-import com.ning.http.client.websocket.WebSocket;
-import com.ning.http.client.websocket.WebSocketTextListener;
-import com.ning.http.client.websocket.WebSocketUpgradeHandler;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.apex.shaded.ning19.com.ning.http.client.AsyncHttpClient;
+import org.apache.apex.shaded.ning19.com.ning.http.client.AsyncHttpClientConfigBean;
+import org.apache.apex.shaded.ning19.com.ning.http.client.ws.WebSocket;
+import org.apache.apex.shaded.ning19.com.ning.http.client.ws.WebSocketTextListener;
+import org.apache.apex.shaded.ning19.com.ning.http.client.ws.WebSocketUpgradeHandler;
import org.apache.commons.lang3.ClassUtils;
+
import com.datatorrent.common.util.BaseOperator;
import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.api.DefaultInputPort;
@@ -159,10 +163,9 @@ public class WebSocketOutputOperator<T> extends BaseOperator
client.close();
openConnection();
}
- connection.sendTextMessage(convertMapToMessage(t));
+ connection.sendMessage(convertMapToMessage(t));
break;
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
if (++countTries < numRetries) {
LOG.debug("Caught exception", ex);
LOG.warn("Send message failed ({}). Retrying ({}).", ex.getMessage(), countTries);
@@ -172,12 +175,11 @@ public class WebSocketOutputOperator<T> extends BaseOperator
if (waitMillisRetry > 0) {
try {
Thread.sleep(waitMillisRetry);
- }
- catch (InterruptedException ex1) {
+ } catch (InterruptedException ex1) {
+ // continue
}
}
- }
- else {
+ } else {
throw new RuntimeException(ex);
}
}
@@ -212,11 +214,6 @@ public class WebSocketOutputOperator<T> extends BaseOperator
}
@Override
- public void onFragment(String string, boolean bln)
- {
- }
-
- @Override
public void onOpen(WebSocket ws)
{
LOG.debug("Connection opened");
@@ -242,8 +239,7 @@ public class WebSocketOutputOperator<T> extends BaseOperator
{
try {
openConnection();
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
LOG.warn("Cannot establish connection:", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/188afbe8/library/src/main/java/com/datatorrent/lib/io/WidgetOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WidgetOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WidgetOutputOperator.java
index df8b5af..5b6259c 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WidgetOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WidgetOutputOperator.java
@@ -38,7 +38,6 @@ import com.datatorrent.api.annotation.InputPortFieldAnnotation;
import com.datatorrent.common.util.BaseOperator;
import com.datatorrent.common.util.PubSubMessageCodec;
-import com.datatorrent.common.util.PubSubWebSocketClient;
/**
* This operator outputs data in a format that can be displayed in DT UI widgets.
@@ -63,12 +62,13 @@ public class WidgetOutputOperator extends BaseOperator
{
protected transient WebSocketOutputOperator<Pair<String, Object>> wsoo = new WebSocketOutputOperator<Pair<String,Object>>(){
- private transient PubSubMessageCodec<Object> codec = new PubSubMessageCodec<Object>(mapper);
+ private transient PubSubMessageCodec<Object> codec = new PubSubMessageCodec<>(mapper);
@Override
- public String convertMapToMessage(Pair<String,Object> t) throws IOException {
- return PubSubWebSocketClient.constructPublishMessage(t.getLeft(), t.getRight(), codec);
- };
+ public String convertMapToMessage(Pair<String,Object> t) throws IOException
+ {
+ return PubSubMessageCodec.constructPublishMessage(t.getLeft(), t.getRight(), codec);
+ }
};
@@ -144,15 +144,14 @@ public class WidgetOutputOperator extends BaseOperator
}
- public static class TimeSeriesData{
-
+ public static class TimeSeriesData
+ {
public Long time;
-
public Number data;
-
}
- public static class TimeseriesInputPort extends DefaultInputPort<TimeSeriesData[]> {
+ public static class TimeseriesInputPort extends DefaultInputPort<TimeSeriesData[]>
+ {
private final WidgetOutputOperator operator;
@@ -174,8 +173,8 @@ public class WidgetOutputOperator extends BaseOperator
timeseriesMapData[i++] = timeseriesMap;
}
- if(operator.isWebSocketConnected){
- HashMap<String, Object> schemaObj = new HashMap<String, Object>();
+ if (operator.isWebSocketConnected) {
+ HashMap<String, Object> schemaObj = new HashMap<>();
schemaObj.put("type", "timeseries");
schemaObj.put("minValue", operator.timeSeriesMin);
schemaObj.put("maxValue", operator.timeSeriesMax);
@@ -185,18 +184,21 @@ public class WidgetOutputOperator extends BaseOperator
}
}
- public TimeseriesInputPort setMax(Number max){
+ public TimeseriesInputPort setMax(Number max)
+ {
operator.timeSeriesMax = max;
return this;
}
- public TimeseriesInputPort setMin(Number min){
+ public TimeseriesInputPort setMin(Number min)
+ {
operator.timeSeriesMin = min;
return this;
}
- public TimeseriesInputPort setTopic(String topic){
+ public TimeseriesInputPort setTopic(String topic)
+ {
operator.timeSeriesTopic = topic;
return this;
}
@@ -219,12 +221,12 @@ public class WidgetOutputOperator extends BaseOperator
HashMap<String, Object>[] result = new HashMap[topNMap.size()];
int j = 0;
for (Entry<String, Number> e : topNMap.entrySet()) {
- result[j] = new HashMap<String, Object>();
+ result[j] = new HashMap<>();
result[j].put("name", e.getKey());
result[j++].put("value", e.getValue());
}
- if(operator.isWebSocketConnected){
- HashMap<String, Object> schemaObj = new HashMap<String, Object>();
+ if (operator.isWebSocketConnected) {
+ HashMap<String, Object> schemaObj = new HashMap<>();
schemaObj.put("type", "topN");
schemaObj.put("n", operator.nInTopN);
operator.wsoo.input.process(new MutablePair<String, Object>(operator.getFullTopic(operator.topNTopic, schemaObj), result));
@@ -233,7 +235,8 @@ public class WidgetOutputOperator extends BaseOperator
}
}
- public TopNInputPort setN(int n){
+ public TopNInputPort setN(int n)
+ {
operator.nInTopN = n;
return this;
}
@@ -246,7 +249,8 @@ public class WidgetOutputOperator extends BaseOperator
}
- public static class SimpleInputPort extends DefaultInputPort<Object>{
+ public static class SimpleInputPort extends DefaultInputPort<Object>
+ {
private final WidgetOutputOperator operator;
@@ -258,7 +262,6 @@ public class WidgetOutputOperator extends BaseOperator
@Override
public void process(Object tuple)
{
-
if (operator.isWebSocketConnected) {
HashMap<String, Object> schemaObj = new HashMap<String, Object>();
schemaObj.put("type", "simple");
@@ -268,7 +271,8 @@ public class WidgetOutputOperator extends BaseOperator
}
}
- public SimpleInputPort setTopic(String topic) {
+ public SimpleInputPort setTopic(String topic)
+ {
operator.simpleTopic = topic;
return this;
}
@@ -286,8 +290,8 @@ public class WidgetOutputOperator extends BaseOperator
@Override
public void process(Integer tuple)
{
- if(operator.isWebSocketConnected){
- HashMap<String, Object> schemaObj = new HashMap<String, Object>();
+ if (operator.isWebSocketConnected) {
+ HashMap<String, Object> schemaObj = new HashMap<>();
schemaObj.put("type", "percentage");
operator.wsoo.input.process(new MutablePair<String, Object>(operator.getFullTopic(operator.percentageTopic, schemaObj), tuple));
} else {
@@ -302,7 +306,8 @@ public class WidgetOutputOperator extends BaseOperator
}
}
-public static class PiechartInputPort extends DefaultInputPort<HashMap<String, Number>>{
+ public static class PiechartInputPort extends DefaultInputPort<HashMap<String, Number>>
+ {
private final WidgetOutputOperator operator;
@@ -319,12 +324,12 @@ public static class PiechartInputPort extends DefaultInputPort<HashMap<String, N
int j = 0;
for (Entry<String, Number> e : pieNumbers.entrySet()) {
- result[j] = new HashMap<String, Object>();
+ result[j] = new HashMap<>();
result[j].put("label", e.getKey());
result[j++].put("value", e.getValue());
}
- if(operator.isWebSocketConnected){
- HashMap<String, Object> schemaObj = new HashMap<String, Object>();
+ if (operator.isWebSocketConnected) {
+ HashMap<String, Object> schemaObj = new HashMap<>();
schemaObj.put("type", "piechart");
schemaObj.put("n", operator.nInPie);
operator.wsoo.input.process(new MutablePair<String, Object>(operator.getFullTopic(operator.pieChartTopic, schemaObj), result));
@@ -333,7 +338,8 @@ public static class PiechartInputPort extends DefaultInputPort<HashMap<String, N
}
}
- public PiechartInputPort setN(int n){
+ public PiechartInputPort setN(int n)
+ {
operator.nInPie = n;
return this;
}
@@ -346,8 +352,9 @@ public static class PiechartInputPort extends DefaultInputPort<HashMap<String, N
}
- protected String getFullTopic(String topic, Map<String, Object> schema){
- HashMap<String, Object> topicObj = new HashMap<String, Object>();
+ protected String getFullTopic(String topic, Map<String, Object> schema)
+ {
+ HashMap<String, Object> topicObj = new HashMap<>();
topicObj.put("appId", appId);
topicObj.put("opId", operId);
topicObj.put("topicName", topic);
@@ -362,7 +369,7 @@ public static class PiechartInputPort extends DefaultInputPort<HashMap<String, N
@Override
public void teardown()
{
- if(isWebSocketConnected){
+ if (isWebSocketConnected) {
wsoo.teardown();
} else {
coo.teardown();
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/188afbe8/library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java b/library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java
index 3b36cb7..d8138d5 100644
--- a/library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java
+++ b/library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java
@@ -89,6 +89,11 @@ public class OperatorContextTestHelper
/* intentionally no-op */
}
+ @Override
+ public int getWindowsFromCheckpoint()
+ {
+ return 0;
+ }
}
private static class TestContext implements Context
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/188afbe8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d219d75..8a7416b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>apex</artifactId>
- <version>3.3.0-incubating</version>
+ <version>3.4.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.apex</groupId>
@@ -49,7 +49,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.deploy.skip>false</maven.deploy.skip>
- <apex.core.version>3.3.0-incubating</apex.core.version>
+ <apex.core.version>3.4.0-incubating-SNAPSHOT</apex.core.version>
<semver.plugin.skip>false</semver.plugin.skip>
<surefire.args>-Xmx2048m</surefire.args>
</properties>
@@ -110,7 +110,7 @@
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
- <version>0.7.0</version>
+ <version>0.7.1</version>
<configuration>
<oldVersion>
<dependency>
@@ -134,6 +134,8 @@
<excludes>
<exclude>@org.apache.hadoop.classification.InterfaceStability$Evolving</exclude>
<exclude>@org.apache.hadoop.classification.InterfaceStability$Unstable</exclude>
+ <exclude>com.datatorrent.lib.io.WebSocketInputOperator</exclude>
+ <exclude>com.datatorrent.lib.io.WebSocketOutputOperator</exclude>
</excludes>
</parameter>
<skip>${semver.plugin.skip}</skip>
[3/3] incubator-apex-malhar git commit: Fixed maven warning and
removed duplicate dependency
Posted by th...@apache.org.
Fixed maven warning and removed duplicate dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/e38e144f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/e38e144f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/e38e144f
Branch: refs/heads/master
Commit: e38e144f2b3d25289c1aef128eb0c24b63362647
Parents: 1711e9c
Author: David Yan <da...@datatorrent.com>
Authored: Wed May 4 14:07:46 2016 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Tue May 10 11:19:11 2016 -0700
----------------------------------------------------------------------
demos/pom.xml | 2 +-
library/pom.xml | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/e38e144f/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index d6e8c0f..fc4c070 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -33,7 +33,7 @@
<name>Apache Apex Malhar Demos</name>
<properties>
- <apex.apppackage.groupid>${groupId}</apex.apppackage.groupid>
+ <apex.apppackage.groupid>${project.groupId}</apex.apppackage.groupid>
<apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
<semver.plugin.skip>true</semver.plugin.skip>
<maven.deploy.skip>true</maven.deploy.skip>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/e38e144f/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index 8db9bfd..cb59ed3 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -291,11 +291,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil</artifactId>
- <version>6.6.4</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>commons-compiler</artifactId>
<version>2.7.8</version>
[2/3] incubator-apex-malhar git commit: APEXCORE-442 Removed
incubating
Posted by th...@apache.org.
APEXCORE-442 Removed incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/1711e9c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/1711e9c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/1711e9c4
Branch: refs/heads/master
Commit: 1711e9c47880a5bfe1f99b719111d271eea647cd
Parents: 188afbe
Author: David Yan <da...@datatorrent.com>
Authored: Mon Apr 25 13:03:34 2016 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Tue May 10 11:19:11 2016 -0700
----------------------------------------------------------------------
DISCLAIMER | 11 -----------
NOTICE | 2 +-
README.md | 10 +++++-----
apps/filecopy/pom.xml | 6 +++---
apps/logstream/pom.xml | 4 ++--
apps/pom.xml | 4 ++--
benchmark/pom.xml | 4 ++--
contrib/pom.xml | 4 ++--
demos/distributedistinct/pom.xml | 4 ++--
demos/echoserver/pom.xml | 4 ++--
demos/frauddetect/pom.xml | 4 ++--
demos/iteration/pom.xml | 4 ++--
demos/machinedata/pom.xml | 4 ++--
demos/mobile/pom.xml | 4 ++--
demos/mrmonitor/pom.xml | 4 ++--
demos/mroperator/pom.xml | 4 ++--
demos/pi/pom.xml | 4 ++--
demos/pom.xml | 4 ++--
demos/r/pom.xml | 4 ++--
demos/twitter/pom.xml | 4 ++--
demos/uniquecount/pom.xml | 4 ++--
demos/wordcount/pom.xml | 4 ++--
demos/yahoofinance/pom.xml | 4 ++--
docs/README.md | 2 +-
docs/operators/block_reader.md | 2 +-
docs/operators/file_output.md | 2 +-
kafka/pom.xml | 4 ++--
library/pom.xml | 4 ++--
pom.xml | 8 ++++----
samples/pom.xml | 4 ++--
30 files changed, 60 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index e0b6752..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,11 +0,0 @@
-Apache Apex is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
-
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 5a39f8e..1630469 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Apex Malhar (incubating)
+Apache Apex Malhar
Copyright (c) 2015-2016 The Apache Software Foundation
This product includes software developed at
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index c5b47d0..e42c032 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,26 @@
-Apache Apex Malhar (incubating)
+Apache Apex Malhar
===============================
-Malhar repository contains open source operator and codec library that can be used with the Apache Apex (incubating) platform to build Realtime streaming applications. In addition to the library there are benchmark, contrib, demos, webdemos and samples folders available. Demos contain demo applications built using the library operators. Webdemos contain webpages for the demos. Benchmark contains performance testing applications. Contrib contains additional operators that interface with third party softwares. Samples contain some sample code that shows how to use the library operators.
+Malhar repository contains open source operator and codec library that can be used with the Apache Apex platform to build Realtime streaming applications. In addition to the library there are benchmark, contrib, demos, webdemos and samples folders available. Demos contain demo applications built using the library operators. Webdemos contain webpages for the demos. Benchmark contains performance testing applications. Contrib contains additional operators that interface with third party softwares. Samples contain some sample code that shows how to use the library operators.
Contributing
------------
-This project welcomes new contributors. If you would like to help make Malhar better by adding new features, enhancing existing features, or fixing bugs, check out the [contributing guidelines](http://apex.incubator.apache.org/contributing.html).
+This project welcomes new contributors. If you would like to help make Malhar better by adding new features, enhancing existing features, or fixing bugs, check out the [contributing guidelines](http://apex.apache.org/contributing.html).
You acknowledge that your submissions to this repository are made pursuant the terms of the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.html) and constitute "Contributions," as defined therein, and you represent and warrant that you have the right and authority to do so.
Documentation
-------------
-Please visit the [documentation section](http://apex.incubator.apache.org/docs.html).
+Please visit the [documentation section](http://apex.apache.org/docs.html).
Documentation build and hosting process is explained in [docs README](docs/README.md).
Discussion group
--------------------
-Please visit http://apex.incubator.apache.org and [subscribe](http://apex.incubator.apache.org/community.html) to the mailing lists.
+Please visit http://apex.apache.org and [subscribe](http://apex.apache.org/community.html) to the mailing lists.
Building the project
--------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/apps/filecopy/pom.xml
----------------------------------------------------------------------
diff --git a/apps/filecopy/pom.xml b/apps/filecopy/pom.xml
index 04c6522..4daf7b2 100644
--- a/apps/filecopy/pom.xml
+++ b/apps/filecopy/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>malhar-apps</artifactId>
<groupId>org.apache.apex</groupId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<artifactId>filecopy</artifactId>
@@ -36,7 +36,7 @@
<semver.plugin.skip>true</semver.plugin.skip>
</properties>
- <name>Apache Apex Malhar (incubating) File copy Application</name>
+ <name>Apache Apex Malhar File copy Application</name>
<build>
<plugins>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-library</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/apps/logstream/pom.xml
----------------------------------------------------------------------
diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml
index 6020c30..3bfa825 100644
--- a/apps/logstream/pom.xml
+++ b/apps/logstream/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>malhar-apps</artifactId>
<groupId>org.apache.apex</groupId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.apex</groupId>
@@ -38,7 +38,7 @@
<checkstyle.console>false</checkstyle.console>
</properties>
- <name>Apache Apex Malhar (incubating) Logstream Application</name>
+ <name>Apache Apex Malhar Logstream Application</name>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index f552033..32f4160 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -25,11 +25,11 @@
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<artifactId>malhar-apps</artifactId>
- <name>Apache Apex Malhar (incubating) Apps</name>
+ <name>Apache Apex Malhar Apps</name>
<packaging>pom</packaging>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index f94f258..408ec0e 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>malhar</artifactId>
<groupId>org.apache.apex</groupId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.apex</groupId>
@@ -32,7 +32,7 @@
<packaging>jar</packaging>
<!-- change these to the appropriate values -->
- <name>Apache Apex Malhar (incubating) Benchmark</name>
+ <name>Apache Apex Malhar Benchmark</name>
<description>Benchmark applications package</description>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 460f5a5..cfc55db 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -25,11 +25,11 @@
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<artifactId>malhar-contrib</artifactId>
- <name>Apache Apex Malhar (incubating) Contrib Library</name>
+ <name>Apache Apex Malhar Contrib Library</name>
<packaging>jar</packaging>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/distributedistinct/pom.xml
----------------------------------------------------------------------
diff --git a/demos/distributedistinct/pom.xml b/demos/distributedistinct/pom.xml
index 2f0d4b1..4c3a01c 100644
--- a/demos/distributedistinct/pom.xml
+++ b/demos/distributedistinct/pom.xml
@@ -25,13 +25,13 @@
<artifactId>distributedistinct</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) Distributed Distinct Demo</name>
+ <name>Apache Apex Malhar Distributed Distinct Demo</name>
<description></description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/echoserver/pom.xml
----------------------------------------------------------------------
diff --git a/demos/echoserver/pom.xml b/demos/echoserver/pom.xml
index 8406c89..63dc20c 100644
--- a/demos/echoserver/pom.xml
+++ b/demos/echoserver/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>malhar-demos</artifactId>
<groupId>org.apache.apex</groupId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.apex</groupId>
@@ -32,7 +32,7 @@
<packaging>jar</packaging>
<!-- change these to the appropriate values -->
- <name>Apache Apex Malhar (incubating) EchoServer Demo</name>
+ <name>Apache Apex Malhar EchoServer Demo</name>
<description>A demo server that echos data sent by a network client back to it</description>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/frauddetect/pom.xml
----------------------------------------------------------------------
diff --git a/demos/frauddetect/pom.xml b/demos/frauddetect/pom.xml
index 09a2261..f2db28b 100644
--- a/demos/frauddetect/pom.xml
+++ b/demos/frauddetect/pom.xml
@@ -25,13 +25,13 @@
<artifactId>frauddetect-demo</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) Fraud Detect Demo</name>
+ <name>Apache Apex Malhar Fraud Detect Demo</name>
<description>Apex demo application that demonstrates real-time pattern detection in the incoming data and alerting. The demo processes streaming credit card transactions and looks for fraudulent transactions.</description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/iteration/pom.xml
----------------------------------------------------------------------
diff --git a/demos/iteration/pom.xml b/demos/iteration/pom.xml
index 5891f42..b4a9890 100644
--- a/demos/iteration/pom.xml
+++ b/demos/iteration/pom.xml
@@ -25,13 +25,13 @@
<artifactId>iteration-demo</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) Iteration Demo</name>
+ <name>Apache Apex Malhar Iteration Demo</name>
<description>DataTorrent demo applications that demonstrates the iteration feature.</description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/machinedata/pom.xml
----------------------------------------------------------------------
diff --git a/demos/machinedata/pom.xml b/demos/machinedata/pom.xml
index dc40536..9bba3b8 100644
--- a/demos/machinedata/pom.xml
+++ b/demos/machinedata/pom.xml
@@ -25,13 +25,13 @@
<artifactId>machinedata-demo</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) MachineData Demo</name>
+ <name>Apache Apex Malhar MachineData Demo</name>
<description></description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/mobile/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mobile/pom.xml b/demos/mobile/pom.xml
index d73e480..6cb84c2 100644
--- a/demos/mobile/pom.xml
+++ b/demos/mobile/pom.xml
@@ -25,13 +25,13 @@
<artifactId>mobile-demo</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) Mobile Demo</name>
+ <name>Apache Apex Malhar Mobile Demo</name>
<description></description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/mrmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mrmonitor/pom.xml b/demos/mrmonitor/pom.xml
index d0b25fc..5eaca53 100644
--- a/demos/mrmonitor/pom.xml
+++ b/demos/mrmonitor/pom.xml
@@ -25,13 +25,13 @@
<artifactId>mrmonitor</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) MR Monitoring Demo</name>
+ <name>Apache Apex Malhar MR Monitoring Demo</name>
<description></description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/mroperator/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mroperator/pom.xml b/demos/mroperator/pom.xml
index bb18864..3812874 100644
--- a/demos/mroperator/pom.xml
+++ b/demos/mroperator/pom.xml
@@ -25,13 +25,13 @@
<artifactId>mroperator</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) MR Operator Demo</name>
+ <name>Apache Apex Malhar MR Operator Demo</name>
<description></description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/pi/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pi/pom.xml b/demos/pi/pom.xml
index 1db069f..016a6cd 100644
--- a/demos/pi/pom.xml
+++ b/demos/pi/pom.xml
@@ -25,13 +25,13 @@
<artifactId>pi-demo</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) Pi Demo</name>
+ <name>Apache Apex Malhar Pi Demo</name>
<description>Apex demo applications that calculate the value of Pi. This is a starting point to understand how Apex works.</description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index 35fc442..d6e8c0f 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<artifactId>malhar-demos</artifactId>
<packaging>pom</packaging>
- <name>Apache Apex Malhar (incubating) Demos</name>
+ <name>Apache Apex Malhar Demos</name>
<properties>
<apex.apppackage.groupid>${groupId}</apex.apppackage.groupid>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/r/pom.xml
----------------------------------------------------------------------
diff --git a/demos/r/pom.xml b/demos/r/pom.xml
index c28db06..fd81dbe 100644
--- a/demos/r/pom.xml
+++ b/demos/r/pom.xml
@@ -25,13 +25,13 @@
<artifactId>r-demo</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) R Demo</name>
+ <name>Apache Apex Malhar R Demo</name>
<description>Apex demo applications for using R.</description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml
index 9dc4140..87192e1 100644
--- a/demos/twitter/pom.xml
+++ b/demos/twitter/pom.xml
@@ -25,13 +25,13 @@
<artifactId>twitter-demo</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) Twitter Demo</name>
+ <name>Apache Apex Malhar Twitter Demo</name>
<description>Twitter Rolling Top Words application demonstrates real-time computations over a sliding window.</description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/uniquecount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/uniquecount/pom.xml b/demos/uniquecount/pom.xml
index 81d3a5e..2accd90 100644
--- a/demos/uniquecount/pom.xml
+++ b/demos/uniquecount/pom.xml
@@ -25,13 +25,13 @@
<artifactId>uniquecount</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) Unique Count Demo</name>
+ <name>Apache Apex Malhar Unique Count Demo</name>
<description></description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/wordcount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/wordcount/pom.xml b/demos/wordcount/pom.xml
index 88f4fb7..a605cd2 100644
--- a/demos/wordcount/pom.xml
+++ b/demos/wordcount/pom.xml
@@ -25,13 +25,13 @@
<artifactId>wordcount-demo</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) Wordcount Demo</name>
+ <name>Apache Apex Malhar Wordcount Demo</name>
<description>A very simple application that demonstrates Apex Platform\u2019s streaming window feature.</description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/demos/yahoofinance/pom.xml
----------------------------------------------------------------------
diff --git a/demos/yahoofinance/pom.xml b/demos/yahoofinance/pom.xml
index 75eae5c..34a9635 100644
--- a/demos/yahoofinance/pom.xml
+++ b/demos/yahoofinance/pom.xml
@@ -25,13 +25,13 @@
<artifactId>yahoo-finance-demo</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) Yahoo! Finance Demo</name>
+ <name>Apache Apex Malhar Yahoo! Finance Demo</name>
<description>Apex demo applications that get Yahoo finance feed and calculate minute price range, minute volume and simple moving average.</description>
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/docs/README.md
----------------------------------------------------------------------
diff --git a/docs/README.md b/docs/README.md
index 3eea1ed..a001a1d 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
# Apex Malhar Documentation
-Repository for Malhar docs available on http://apex.incubator.apache.org/docs.html
+Repository for Malhar docs available on http://apex.apache.org/docs.html
Documentation is written in [Markdown](https://guides.github.com/features/mastering-markdown/) format and statically generated into HTML using [MkDocs](http://www.mkdocs.org/). All documentation is located in the [docs](docs) directory, and [mkdocs.yml](mkdocs.yml) file describes the navigation structure of the published documentation.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/docs/operators/block_reader.md
----------------------------------------------------------------------
diff --git a/docs/operators/block_reader.md b/docs/operators/block_reader.md
index 9b7628a..1946382 100644
--- a/docs/operators/block_reader.md
+++ b/docs/operators/block_reader.md
@@ -5,7 +5,7 @@ This is a scalable operator that reads and parses blocks of data sources into re
## Why is it needed?
-A Block Reader is needed to parallelize reading and parsing of a single data source, for example a file. Simple parallelism of reading data sources can be achieved by multiple partitions reading different source of same type (for files see [AbstractFileInputOperator](https://github.com/apache/incubator-apex-malhar/blob/devel-3/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileInputOperator.java)) but Block Reader partitions can read blocks of same source in parallel and parse them for records ensuring that no record is duplicated or missed.
+A Block Reader is needed to parallelize reading and parsing of a single data source, for example a file. Simple parallelism of reading data sources can be achieved by multiple partitions reading different source of same type (for files see [AbstractFileInputOperator](https://github.com/apache/incubator-apex-malhar/blob/master/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileInputOperator.java)) but Block Reader partitions can read blocks of same source in parallel and parse them for records ensuring that no record is duplicated or missed.
## Class Diagram
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/docs/operators/file_output.md
----------------------------------------------------------------------
diff --git a/docs/operators/file_output.md b/docs/operators/file_output.md
index 81f9482..f5e82d9 100644
--- a/docs/operators/file_output.md
+++ b/docs/operators/file_output.md
@@ -1,7 +1,7 @@
AbstractFileOutputOperator
===========================
-The abstract file output operator in Apache Apex Malhar library — [`AbstractFileOutputOperator`](https://github.com/apache/incubator-apex-malhar/blob/devel-3/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperator.java) writes streaming data to files. The main features of this operator are:
+The abstract file output operator in Apache Apex Malhar library — [`AbstractFileOutputOperator`](https://github.com/apache/incubator-apex-malhar/blob/master/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperator.java) writes streaming data to files. The main features of this operator are:
1. Persisting data to files.
2. Automatic rotation of files based on:
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/kafka/pom.xml b/kafka/pom.xml
index d9d5bc9..a8a3cea 100755
--- a/kafka/pom.xml
+++ b/kafka/pom.xml
@@ -25,11 +25,11 @@
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<artifactId>malhar-kafka</artifactId>
- <name>Apache Apex Malhar (incubating) Kafka Support</name>
+ <name>Apache Apex Malhar Kafka Support</name>
<packaging>jar</packaging>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index cd4d2a4..8db9bfd 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -26,13 +26,13 @@
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<artifactId>malhar-library</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) Library</name>
+ <name>Apache Apex Malhar Library</name>
<properties>
<checkstyle.console>false</checkstyle.console>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8a7416b..c0e98a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,14 +25,14 @@
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>apex</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0</version>
</parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Apex Malhar (incubating)</name>
+ <name>Apache Apex Malhar</name>
<url>http://apex.apache.org</url>
<licenses>
@@ -49,7 +49,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.deploy.skip>false</maven.deploy.skip>
- <apex.core.version>3.4.0-incubating-SNAPSHOT</apex.core.version>
+ <apex.core.version>3.4.0</apex.core.version>
<semver.plugin.skip>false</semver.plugin.skip>
<surefire.args>-Xmx2048m</surefire.args>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/1711e9c4/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 714c0cf..67df7b5 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -26,13 +26,13 @@
<parent>
<groupId>org.apache.apex</groupId>
<artifactId>malhar</artifactId>
- <version>3.4.0-incubating-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<artifactId>malhar-samples</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Malhar (incubating) Samples</name>
+ <name>Apache Apex Malhar Samples</name>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<checkstyle.skip>true</checkstyle.skip>