You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by da...@apache.org on 2015/11/30 22:07:14 UTC

[68/98] [abbrv] incubator-apex-malhar git commit: Update Apex dependency to release 3.2.0 and fix stray version numbers.

Update Apex dependency to release 3.2.0 and fix stray version numbers.


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

Branch: refs/heads/master
Commit: 6b4305925dad231ef3585c566ccb54ce99bf309e
Parents: bbbb7f8
Author: Thomas Weise <th...@datatorrent.com>
Authored: Fri Oct 30 22:46:34 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Fri Oct 30 22:46:34 2015 -0700

----------------------------------------------------------------------
 benchmark/pom.xml         | 2 --
 demos/machinedata/pom.xml | 2 +-
 demos/pom.xml             | 1 -
 demos/r/pom.xml           | 2 +-
 pom.xml                   | 4 ++--
 5 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/6b430592/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index de6d986..5d47426 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -36,8 +36,6 @@
   <description>Benchmark applications package</description>
 
   <properties>
-    <!-- change this if you desire to use a different version of DataTorrent -->
-    <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>

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/6b430592/demos/machinedata/pom.xml
----------------------------------------------------------------------
diff --git a/demos/machinedata/pom.xml b/demos/machinedata/pom.xml
index a55f78a..d82c169 100644
--- a/demos/machinedata/pom.xml
+++ b/demos/machinedata/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.apex</groupId>
       <artifactId>malhar-contrib</artifactId>
-      <version>${apex.core.version}</version>
+      <version>${project.version}</version>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/6b430592/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index 97382ba..8f0e55f 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -33,7 +33,6 @@
   <name>Apache Apex Malhar Demos</name>
 
   <properties>
-    <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>

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/6b430592/demos/r/pom.xml
----------------------------------------------------------------------
diff --git a/demos/r/pom.xml b/demos/r/pom.xml
index 459cf2b..976135a 100644
--- a/demos/r/pom.xml
+++ b/demos/r/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.apex</groupId>
       <artifactId>malhar-contrib</artifactId>
-      <version>${apex.core.version}</version>
+      <version>${project.version}</version>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/6b430592/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 207304e..21bf77d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.apex</groupId>
     <artifactId>apex</artifactId>
-    <version>3.2.0-incubating-SNAPSHOT</version>
+    <version>3.2.0-incubating</version>
   </parent>
 
   <artifactId>malhar</artifactId>
@@ -48,7 +48,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.deploy.skip>false</maven.deploy.skip>
-    <apex.core.version>3.2.0-incubating-SNAPSHOT</apex.core.version>
+    <apex.core.version>3.2.0-incubating</apex.core.version>
     <semver.plugin.skip>false</semver.plugin.skip>
   </properties>