apex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From david...@apache.org
Subject [2/2] incubator-apex-malhar git commit: Merge branch 'MLHR-1869' of github.com:tweise/incubator-apex-malhar into devel-3
Date Thu, 15 Oct 2015 00:52:06 GMT
Merge branch 'MLHR-1869' of github.com:tweise/incubator-apex-malhar into devel-3


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/e7892f35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/e7892f35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/e7892f35

Branch: refs/heads/devel-3
Commit: e7892f35c7001700bd645db5b6b4e66337ded26f
Parents: 893ac35 4a86ad0
Author: David Yan <david@datatorrent.com>
Authored: Wed Oct 14 17:00:22 2015 -0700
Committer: David Yan <david@datatorrent.com>
Committed: Wed Oct 14 17:00:22 2015 -0700

----------------------------------------------------------------------
 apps/logstream/pom.xml           | 10 ++++----
 apps/pom.xml                     |  8 +++----
 benchmark/pom.xml                | 45 ++++++++++-------------------------
 contrib/pom.xml                  | 12 +++++-----
 demos/distributedistinct/pom.xml |  6 ++---
 demos/echoserver/pom.xml         |  8 +++----
 demos/frauddetect/pom.xml        | 10 ++++----
 demos/machinedata/pom.xml        | 14 +++++------
 demos/mobile/pom.xml             | 10 ++++----
 demos/mrmonitor/pom.xml          | 10 ++++----
 demos/mroperator/pom.xml         | 10 ++++----
 demos/pi/pom.xml                 | 10 ++++----
 demos/pom.xml                    | 21 ++++++++--------
 demos/r/pom.xml                  | 14 +++++------
 demos/twitter/pom.xml            | 12 +++++-----
 demos/uniquecount/pom.xml        | 10 ++++----
 demos/wordcount/pom.xml          | 10 ++++----
 demos/yahoofinance/pom.xml       | 10 ++++----
 library/pom.xml                  | 12 +++++-----
 pom.xml                          | 43 +++++++++++----------------------
 samples/pom.xml                  | 10 ++++----
 21 files changed, 131 insertions(+), 164 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/e7892f35/contrib/pom.xml
----------------------------------------------------------------------
diff --cc contrib/pom.xml
index 91ef5c7,d345b24..b999cca
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@@ -601,22 -601,10 +601,22 @@@
        <optional>true</optional>
      </dependency>
      <dependency>
-       <groupId>com.datatorrent</groupId>
-       <artifactId>dt-common</artifactId>
-       <version>${dt.framework.version}</version>
+       <groupId>org.apache.apex</groupId>
+       <artifactId>apex-common</artifactId>
+       <version>${apex.core.version}</version>
        <type>jar</type>
      </dependency>
 +    <dependency>
 +      <!-- required by Xml parser and formatter -->
 +      <groupId>com.thoughtworks.xstream</groupId>
 +      <artifactId>xstream</artifactId>
 +      <version>1.4.8</version>
 +    </dependency>
 +    <dependency>
 +      <!-- required by Csv parser and formatter -->
 +      <groupId>net.sf.supercsv</groupId>
 +      <artifactId>super-csv-joda</artifactId>
 +      <version>2.3.1</version>
 +    </dependency>
    </dependencies>
  </project>


Mime
View raw message