Repository: incubator-apex-malhar Updated Branches: refs/heads/devel-3 893ac3505 -> e7892f35c
MLHR-1869 Update Maven coordinates for ASF release. 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/4a86ad0b Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/4a86ad0b Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/4a86ad0b Branch: refs/heads/devel-3 Commit: 4a86ad0bd8c7618ceca1591ead2f97a2d36092bd Parents: e1a4550 Author: Thomas Weise <[email protected]> Authored: Wed Oct 14 16:19:27 2015 -0700 Committer: Thomas Weise <[email protected]> Committed: Wed Oct 14 16:19:27 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/4a86ad0b/apps/logstream/pom.xml ---------------------------------------------------------------------- diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml index 84d4cc8..d390b07 100644 --- a/apps/logstream/pom.xml +++ b/apps/logstream/pom.xml @@ -23,11 +23,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>malhar-apps</artifactId> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>logstream</artifactId> <packaging>jar</packaging> @@ -37,7 +37,7 @@ <semver.plugin.skip>true</semver.plugin.skip> </properties> - <name>Logstream Application</name> + <name>Apache Apex Malhar Logstream Application</name> <build> <plugins> @@ -71,7 +71,7 @@ <dependencies> <dependency> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-contrib</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/apps/pom.xml ---------------------------------------------------------------------- diff --git a/apps/pom.xml b/apps/pom.xml index be6f595..1b1f67c 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -23,13 +23,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <artifactId>malhar-apps</artifactId> - <name>Apps</name> + <name>Apache Apex Malhar Apps</name> <packaging>pom</packaging> <modules> @@ -105,7 +105,7 @@ <archive> <manifestEntries> <Class-Path>${datatorrent.apppackage.classpath}</Class-Path> - <DT-Engine-Version>${datatorrent.version}</DT-Engine-Version> + <DT-Engine-Version>${apex.core.version}</DT-Engine-Version> <DT-App-Package-Name>${project.artifactId}</DT-App-Package-Name> <DT-App-Package-Version>${project.version}</DT-App-Package-Version> <DT-App-Package-Display-Name>${project.name}</DT-App-Package-Display-Name> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/benchmark/pom.xml ---------------------------------------------------------------------- diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 33287b4..de6d986 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -23,46 +23,27 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>malhar</artifactId> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-benchmark</artifactId> <packaging>jar</packaging> <!-- change these to the appropriate values --> - <name>Benchmark</name> + <name>Apache Apex Malhar Benchmark</name> <description>Benchmark applications package</description> <properties> <!-- change this if you desire to use a different version of DataTorrent --> - <datatorrent.version>${project.version}</datatorrent.version> + <apex.core.version>${project.version}</apex.core.version> <datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath> <maven.deploy.skip>false</maven.deploy.skip> <skipTests>true</skipTests> + <semver.plugin.skip>true</semver.plugin.skip> </properties> - <!-- repository to provide the DataTorrent artifacts --> - <repositories> - <repository> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>Datatorrent-Releases</id> - <name>DataTorrent Release Repository</name> - <url>https://www.datatorrent.com/maven/content/repositories/releases/</url> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <id>DataTorrent-Snapshots</id> - <name>DataTorrent Early Access Program Snapshot Repository</name> - <url>https://www.datatorrent.com/maven/content/repositories/snapshots/</url> - </repository> - </repositories> - <build> <plugins> <plugin> @@ -125,7 +106,7 @@ <archive> <manifestEntries> <Class-Path>${datatorrent.apppackage.classpath}</Class-Path> - <DT-Engine-Version>${datatorrent.version}</DT-Engine-Version> + <DT-Engine-Version>${apex.core.version}</DT-Engine-Version> <DT-App-Package-Name>${project.artifactId}</DT-App-Package-Name> <DT-App-Package-Version>${project.version}</DT-App-Package-Version> <DT-App-Package-Display-Name>${project.name}</DT-App-Package-Display-Name> @@ -519,15 +500,15 @@ </exclusions> </dependency> <dependency> - <groupId>com.datatorrent</groupId> - <artifactId>dt-engine</artifactId> - <version>3.0.0</version> + <groupId>org.apache.apex</groupId> + <artifactId>apex-engine</artifactId> + <version>${apex.core.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>com.datatorrent</groupId> - <artifactId>dt-api</artifactId> - <version>3.0.0</version> + <groupId>org.apache.apex</groupId> + <artifactId>apex-api</artifactId> + <version>${apex.core.version}</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/contrib/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/pom.xml b/contrib/pom.xml index abed040..d345b24 100755 --- a/contrib/pom.xml +++ b/contrib/pom.xml @@ -23,13 +23,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <artifactId>malhar-contrib</artifactId> - <name>Contrib Library</name> + <name>Apache Apex Malhar Contrib Library</name> <packaging>jar</packaging> <properties> @@ -601,9 +601,9 @@ <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> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/distributedistinct/pom.xml ---------------------------------------------------------------------- diff --git a/demos/distributedistinct/pom.xml b/demos/distributedistinct/pom.xml index 2f6e973..5f608a7 100644 --- a/demos/distributedistinct/pom.xml +++ b/demos/distributedistinct/pom.xml @@ -22,16 +22,16 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <version>3.0.0</version> <artifactId>distributedistinct</artifactId> <packaging>jar</packaging> - <name>DataTorrent Distributed Distinct Demo</name> + <name>Apache Apex Malhar Distributed Distinct Demo</name> <description></description> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-demos</artifactId> <version>3.0.0</version> </parent> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/echoserver/pom.xml ---------------------------------------------------------------------- diff --git a/demos/echoserver/pom.xml b/demos/echoserver/pom.xml index afddddf..fb22441 100644 --- a/demos/echoserver/pom.xml +++ b/demos/echoserver/pom.xml @@ -23,16 +23,16 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>malhar-demos</artifactId> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>echoserver</artifactId> <packaging>jar</packaging> <!-- change these to the appropriate values --> - <name>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/4a86ad0b/demos/frauddetect/pom.xml ---------------------------------------------------------------------- diff --git a/demos/frauddetect/pom.xml b/demos/frauddetect/pom.xml index 993faca..3d5109b 100644 --- a/demos/frauddetect/pom.xml +++ b/demos/frauddetect/pom.xml @@ -22,18 +22,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> <artifactId>frauddetect-demo</artifactId> <packaging>jar</packaging> - <name>DataTorrent Fraud Detect Demo</name> + <name>Apache Apex Malhar Fraud Detect Demo</name> <description>DataTorrent demo applications 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>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-demos</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <properties> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/machinedata/pom.xml ---------------------------------------------------------------------- diff --git a/demos/machinedata/pom.xml b/demos/machinedata/pom.xml index 9bd276a..73d5c14 100644 --- a/demos/machinedata/pom.xml +++ b/demos/machinedata/pom.xml @@ -22,25 +22,25 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> <artifactId>machinedata-demo</artifactId> <packaging>jar</packaging> - <name>Datatorrent MachineData Demo</name> + <name>Apache Apex Malhar MachineData Demo</name> <description></description> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-demos</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <dependencies> <dependency> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-contrib</artifactId> - <version>${datatorrent.version}</version> + <version>${apex.core.version}</version> <exclusions> <exclusion> <groupId>*</groupId> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/mobile/pom.xml ---------------------------------------------------------------------- diff --git a/demos/mobile/pom.xml b/demos/mobile/pom.xml index 1887314..ccc9a66 100644 --- a/demos/mobile/pom.xml +++ b/demos/mobile/pom.xml @@ -22,18 +22,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> <artifactId>mobile-demo</artifactId> <packaging>jar</packaging> - <name>Datatorrent Mobile Demo</name> + <name>Apache Apex Malhar Mobile Demo</name> <description></description> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-demos</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <properties> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/mrmonitor/pom.xml ---------------------------------------------------------------------- diff --git a/demos/mrmonitor/pom.xml b/demos/mrmonitor/pom.xml index 33ec26f..b087fa1 100644 --- a/demos/mrmonitor/pom.xml +++ b/demos/mrmonitor/pom.xml @@ -22,18 +22,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> <artifactId>mrmonitor</artifactId> <packaging>jar</packaging> - <name>DataTorrent MR Monitoring Demo</name> + <name>Apache Apex Malhar MR Monitoring Demo</name> <description></description> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-demos</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <properties> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/mroperator/pom.xml ---------------------------------------------------------------------- diff --git a/demos/mroperator/pom.xml b/demos/mroperator/pom.xml index 324514d..0e598b7 100644 --- a/demos/mroperator/pom.xml +++ b/demos/mroperator/pom.xml @@ -22,18 +22,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> <artifactId>mroperator</artifactId> <packaging>jar</packaging> - <name>DataTorrent MR Operator Demo</name> + <name>Apache Apex Malhar MR Operator Demo</name> <description></description> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-demos</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <properties> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/pi/pom.xml ---------------------------------------------------------------------- diff --git a/demos/pi/pom.xml b/demos/pi/pom.xml index 6fab637..7cc4119 100644 --- a/demos/pi/pom.xml +++ b/demos/pi/pom.xml @@ -22,18 +22,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> <artifactId>pi-demo</artifactId> <packaging>jar</packaging> - <name>DataTorrent Pi Demo</name> + <name>Apache Apex Malhar Pi Demo</name> <description>DataTorrent demo applications that calculate the value of Pi. This is a starting point to understand how DataTorrent works.</description> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-demos</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/pom.xml ---------------------------------------------------------------------- diff --git a/demos/pom.xml b/demos/pom.xml index 6069633..123591f 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -23,14 +23,14 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <artifactId>malhar-demos</artifactId> <packaging>pom</packaging> - <name>Demos</name> + <name>Apache Apex Malhar Demos</name> <modules> <module>machinedata</module> @@ -48,9 +48,10 @@ </modules> <properties> - <datatorrent.version>3.2.0-SNAPSHOT</datatorrent.version> + <apex.core.version>3.2.0-incubating-SNAPSHOT</apex.core.version> <datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath> <semver.plugin.skip>true</semver.plugin.skip> + <maven.deploy.skip>true</maven.deploy.skip> </properties> <profiles> @@ -121,7 +122,7 @@ <archive> <manifestEntries> <Class-Path>${datatorrent.apppackage.classpath}</Class-Path> - <DT-Engine-Version>${datatorrent.version}</DT-Engine-Version> + <DT-Engine-Version>${apex.core.version}</DT-Engine-Version> <DT-App-Package-Name>${project.artifactId}</DT-App-Package-Name> <DT-App-Package-Version>${project.version}</DT-App-Package-Version> <DT-App-Package-Display-Name>${project.name}</DT-App-Package-Display-Name> @@ -180,9 +181,9 @@ <dependencies> <dependency> - <groupId>com.datatorrent</groupId> - <artifactId>dt-common</artifactId> - <version>${datatorrent.version}</version> + <groupId>org.apache.apex</groupId> + <artifactId>apex-common</artifactId> + <version>${apex.core.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -192,7 +193,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-library</artifactId> <version>${project.version}</version> <exclusions> @@ -203,7 +204,7 @@ </exclusions> </dependency> <dependency> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-library</artifactId> <version>${project.version}</version> <classifier>tests</classifier> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/r/pom.xml ---------------------------------------------------------------------- diff --git a/demos/r/pom.xml b/demos/r/pom.xml index 40910d1..1c94631 100644 --- a/demos/r/pom.xml +++ b/demos/r/pom.xml @@ -22,18 +22,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> <artifactId>r-demo</artifactId> <packaging>jar</packaging> - <name>DataTorrent R Demo</name> + <name>Apache Apex Malhar R Demo</name> <description>DataTorrent demo applications for using R.</description> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-demos</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <properties> @@ -71,9 +71,9 @@ <version>1.0</version> </dependency> <dependency> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-contrib</artifactId> - <version>${datatorrent.version}</version> + <version>${apex.core.version}</version> <exclusions> <exclusion> <groupId>*</groupId> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/twitter/pom.xml ---------------------------------------------------------------------- diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml index 76cfe82..1ccc37a 100644 --- a/demos/twitter/pom.xml +++ b/demos/twitter/pom.xml @@ -22,18 +22,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> <artifactId>twitter-demo</artifactId> <packaging>jar</packaging> - <name>DataTorrent 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>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-demos</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <properties> @@ -72,7 +72,7 @@ <version>5.1.22</version> </dependency> <dependency> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-contrib</artifactId> <version>${project.version}</version> <exclusions> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/uniquecount/pom.xml ---------------------------------------------------------------------- diff --git a/demos/uniquecount/pom.xml b/demos/uniquecount/pom.xml index 66a42b3..3a66aa6 100644 --- a/demos/uniquecount/pom.xml +++ b/demos/uniquecount/pom.xml @@ -22,18 +22,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> <artifactId>uniquecount</artifactId> <packaging>jar</packaging> - <name>DataTorrent Unique Count Demo</name> + <name>Apache Apex Malhar Unique Count Demo</name> <description></description> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-demos</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <properties> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/wordcount/pom.xml ---------------------------------------------------------------------- diff --git a/demos/wordcount/pom.xml b/demos/wordcount/pom.xml index 47ef5eb..78732b8 100644 --- a/demos/wordcount/pom.xml +++ b/demos/wordcount/pom.xml @@ -23,18 +23,18 @@ <modelVersion>4.0.0</modelVersion> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> <artifactId>wordcount-demo</artifactId> <packaging>jar</packaging> - <name>Datatorrent Wordcount Demo</name> + <name>Apache Apex Malhar Wordcount Demo</name> <description>A very simple application that demonstrates DataTorrent Platformâs streaming window feature.</description> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-demos</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <properties> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/demos/yahoofinance/pom.xml ---------------------------------------------------------------------- diff --git a/demos/yahoofinance/pom.xml b/demos/yahoofinance/pom.xml index c777017..cdb8c7b 100644 --- a/demos/yahoofinance/pom.xml +++ b/demos/yahoofinance/pom.xml @@ -22,18 +22,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>com.datatorrent</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <version>3.2.0-incubating-SNAPSHOT</version> <artifactId>yahoo-finance-demo</artifactId> <packaging>jar</packaging> - <name>DataTorrent Yahoo! Finance Demo</name> + <name>Apache Apex Malhar Yahoo! Finance Demo</name> <description>DataTorrent demo applications that get Yahoo finance feed and calculate minute price range, minute volume and simple moving average.</description> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar-demos</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <properties> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/library/pom.xml ---------------------------------------------------------------------- diff --git a/library/pom.xml b/library/pom.xml index 3541804..fb28d52 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -24,15 +24,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <artifactId>malhar-library</artifactId> <packaging>jar</packaging> - <name>Operator and Codec Library</name> + <name>Apache Apex Malhar Library</name> <properties> <maven.deploy.skip>false</maven.deploy.skip> @@ -184,9 +184,9 @@ <dependencies> <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> </dependency> <dependency> <groupId>com.icegreen</groupId> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9fb61f6..e9cea2f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,13 +23,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.datatorrent</groupId> - <artifactId>dt-framework</artifactId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.apache.apex</groupId> + <artifactId>apex</artifactId> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <artifactId>malhar</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Apex Malhar</name> <url>http://apex.apache.org</url> @@ -41,15 +41,6 @@ </license> </licenses> - <!-- repository to provide the DataTorrent artifacts --> - <repositories> - <repository> - <id>datatorrent</id> - <name>DataTorrent Release Repository</name> - <url>https://www.datatorrent.com/maven/content/repositories/releases/</url> - </repository> - </repositories> - <prerequisites> <maven>3.0.5</maven> </prerequisites> @@ -57,11 +48,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.deploy.skip>false</maven.deploy.skip> - <dt.framework.version>3.2.0-SNAPSHOT</dt.framework.version> - <!-- the following properties match the properties defined in core/pom.xml --> - <jackson.version>1.9.2</jackson.version> - <jersey.version>1.9</jersey.version> - <jetty.version>8.1.10.v20130312</jetty.version> + <apex.core.version>3.2.0-incubating-SNAPSHOT</apex.core.version> <semver.plugin.skip>false</semver.plugin.skip> </properties> @@ -72,11 +59,6 @@ <artifactId>license-maven-plugin</artifactId> <configuration> <excludes combine.children="append"> - <exclude>DISCLAIMER</exclude> - <exclude>LICENSE</exclude> - <exclude>NOTICE</exclude> - <exclude>**/node_modules/**</exclude> - <exclude>**/web/**/.*</exclude> <exclude>src/test/resources/**/sample_logs/**</exclude> <exclude>src/test/resources/*.csv</exclude> <exclude>src/main/resources/com/datatorrent/apps/logstream/**</exclude> @@ -93,8 +75,6 @@ <artifactId>apache-rat-plugin</artifactId> <configuration> <excludes combine.children="append"> - <exclude>**/node_modules/**</exclude> - <exclude>**/web/**/.*</exclude> <exclude>src/test/resources/**/sample_logs/**</exclude> <exclude>src/test/resources/*.csv</exclude> <exclude>src/main/resources/com/datatorrent/apps/logstream/**</exclude> @@ -102,7 +82,6 @@ <exclude>src/test/resources/com/datatorrent/contrib/romesyndication/*.rss</exclude> <exclude>src/main/resources/**/*.txt</exclude> <exclude>**/*.json</exclude> - <exclude>web/**/robots.txt</exclude> <exclude>**/*.md</exclude> </excludes> </configuration> @@ -162,6 +141,12 @@ </plugins> </build> </profile> + <profile> + <id>all-modules</id> + <modules> + <module>benchmark</module> + </modules> + </profile> </profiles> <modules> @@ -174,9 +159,9 @@ <dependencies> <dependency> - <groupId>com.datatorrent</groupId> - <artifactId>dt-engine</artifactId> - <version>${dt.framework.version}</version> + <groupId>org.apache.apex</groupId> + <artifactId>apex-engine</artifactId> + <version>${apex.core.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4a86ad0b/samples/pom.xml ---------------------------------------------------------------------- diff --git a/samples/pom.xml b/samples/pom.xml index 05ba2cd..c67f308 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -24,15 +24,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.datatorrent</groupId> + <groupId>org.apache.apex</groupId> <artifactId>malhar</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.2.0-incubating-SNAPSHOT</version> </parent> <artifactId>malhar-samples</artifactId> <packaging>jar</packaging> - <name>Samples</name> + <name>Apache Apex Malhar Samples</name> <dependencies> <dependency> @@ -42,8 +42,8 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>dt-engine</artifactId> - <version>${dt.framework.version}</version> + <artifactId>apex-engine</artifactId> + <version>${apex.core.version}</version> <scope>test</scope> </dependency> </dependencies>
