beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject [1/2] beam git commit: [BEAM-2180] update Apex version to 3.6.0
Date Fri, 05 May 2017 19:36:29 GMT
Repository: beam
Updated Branches:
  refs/heads/master a99d43c75 -> a1425e1de


[BEAM-2180] update Apex version to 3.6.0


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/0066ca8d
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/0066ca8d
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/0066ca8d

Branch: refs/heads/master
Commit: 0066ca8d9bca3a5e2106548f2736351913c7f681
Parents: 7903e59
Author: Thomas Weise <thw@apache.org>
Authored: Tue May 2 08:21:45 2017 -0700
Committer: Thomas Weise <thw@apache.org>
Committed: Fri May 5 07:03:53 2017 -0700

----------------------------------------------------------------------
 runners/apex/pom.xml                                             | 4 ++--
 .../test/java/org/apache/beam/runners/apex/ApexRunnerTest.java   | 2 +-
 runners/apex/src/test/resources/beam-runners-apex.properties     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/0066ca8d/runners/apex/pom.xml
----------------------------------------------------------------------
diff --git a/runners/apex/pom.xml b/runners/apex/pom.xml
index aa4bddf..85b15fa 100644
--- a/runners/apex/pom.xml
+++ b/runners/apex/pom.xml
@@ -33,7 +33,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <apex.core.version>3.5.0</apex.core.version>
+    <apex.core.version>3.6.0</apex.core.version>
     <apex.malhar.version>3.4.0</apex.malhar.version>
     <skipIntegrationTests>true</skipIntegrationTests>
     <!-- memory limit for embedded cluster -->
@@ -243,7 +243,7 @@
             </goals>
             <configuration>
               <ignoredUsedUndeclaredDependencies>
-                <ignoredUsedUndeclaredDependency>org.apache.apex:apex-api:jar:3.5.0</ignoredUsedUndeclaredDependency>
+                <ignoredUsedUndeclaredDependency>org.apache.apex:apex-api:jar:${apex.core.version}</ignoredUsedUndeclaredDependency>
                 <ignoredUsedUndeclaredDependency>org.apache.commons:commons-lang3::3.1</ignoredUsedUndeclaredDependency>
                 <ignoredUsedUndeclaredDependency>commons-io:commons-io:jar:2.4</ignoredUsedUndeclaredDependency>
                 <ignoredUsedUndeclaredDependency>com.esotericsoftware.kryo:kryo::${apex.kryo.version}</ignoredUsedUndeclaredDependency>

http://git-wip-us.apache.org/repos/asf/beam/blob/0066ca8d/runners/apex/src/test/java/org/apache/beam/runners/apex/ApexRunnerTest.java
----------------------------------------------------------------------
diff --git a/runners/apex/src/test/java/org/apache/beam/runners/apex/ApexRunnerTest.java b/runners/apex/src/test/java/org/apache/beam/runners/apex/ApexRunnerTest.java
index 0fedc47..e9e9a5b 100644
--- a/runners/apex/src/test/java/org/apache/beam/runners/apex/ApexRunnerTest.java
+++ b/runners/apex/src/test/java/org/apache/beam/runners/apex/ApexRunnerTest.java
@@ -58,7 +58,7 @@ public class ApexRunnerTest {
     File tmp = File.createTempFile("beam-runners-apex-", ".properties");
     tmp.deleteOnExit();
     Properties props = new Properties();
-    props.setProperty("dt.operator." + operName + ".attr.MEMORY_MB", "64");
+    props.setProperty("apex.operator." + operName + ".attr.MEMORY_MB", "64");
     try (FileOutputStream fos = new FileOutputStream(tmp)) {
       props.store(fos, "");
     }

http://git-wip-us.apache.org/repos/asf/beam/blob/0066ca8d/runners/apex/src/test/resources/beam-runners-apex.properties
----------------------------------------------------------------------
diff --git a/runners/apex/src/test/resources/beam-runners-apex.properties b/runners/apex/src/test/resources/beam-runners-apex.properties
index 48f8b05..55cb397 100644
--- a/runners/apex/src/test/resources/beam-runners-apex.properties
+++ b/runners/apex/src/test/resources/beam-runners-apex.properties
@@ -17,4 +17,4 @@
 ################################################################################
 
 # properties for unit test
-dt.operator.testProperties.attr.MEMORY_MB=32
+apex.operator.testProperties.attr.MEMORY_MB=32


Mime
View raw message