You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by jb...@apache.org on 2017/07/27 13:46:07 UTC
[1/2] beam git commit: [BEAM-1984] Fix scope for dependencies needed
only for test purposes
Repository: beam
Updated Branches:
refs/heads/master e206b1a41 -> 892a2cf5b
[BEAM-1984] Fix scope for dependencies needed only for test purposes
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/86e33559
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/86e33559
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/86e33559
Branch: refs/heads/master
Commit: 86e335595f1274248835e5715229bc67d4233fb3
Parents: e206b1a
Author: Ismaël Mejía <ie...@gmail.com>
Authored: Thu Jul 27 10:57:15 2017 +0200
Committer: Ismaël Mejía <ie...@gmail.com>
Committed: Thu Jul 27 10:57:15 2017 +0200
----------------------------------------------------------------------
runners/spark/pom.xml | 1 +
sdks/java/io/amqp/pom.xml | 1 +
sdks/java/io/elasticsearch/pom.xml | 16 ++++++----------
.../io/elasticsearch/ElasticsearchTestDataSet.java | 2 +-
sdks/java/io/hcatalog/pom.xml | 13 +++++++------
sdks/java/io/jdbc/pom.xml | 10 +++++-----
6 files changed, 21 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/86e33559/runners/spark/pom.xml
----------------------------------------------------------------------
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index 35e933b..e823060 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -200,6 +200,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/beam/blob/86e33559/sdks/java/io/amqp/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/amqp/pom.xml b/sdks/java/io/amqp/pom.xml
index 8da9448..4369bb8 100644
--- a/sdks/java/io/amqp/pom.xml
+++ b/sdks/java/io/amqp/pom.xml
@@ -39,6 +39,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/beam/blob/86e33559/sdks/java/io/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/elasticsearch/pom.xml b/sdks/java/io/elasticsearch/pom.xml
index e0a7f21..a021420 100644
--- a/sdks/java/io/elasticsearch/pom.xml
+++ b/sdks/java/io/elasticsearch/pom.xml
@@ -37,11 +37,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -86,11 +81,6 @@
<version>4.5.2</version>
</dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </dependency>
-
<!-- compile dependencies -->
<dependency>
<groupId>com.google.auto.value</groupId>
@@ -133,6 +123,12 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/beam/blob/86e33559/sdks/java/io/elasticsearch/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchTestDataSet.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/elasticsearch/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchTestDataSet.java b/sdks/java/io/elasticsearch/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchTestDataSet.java
index 2a2dbe9..e2c291b 100644
--- a/sdks/java/io/elasticsearch/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchTestDataSet.java
+++ b/sdks/java/io/elasticsearch/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchTestDataSet.java
@@ -37,7 +37,7 @@ public class ElasticsearchTestDataSet {
public static final long NUM_DOCS = 60000;
public static final int AVERAGE_DOC_SIZE = 25;
public static final int MAX_DOC_SIZE = 35;
- private static String writeIndex = ES_INDEX + org.joda.time.Instant.now().getMillis();
+ private static String writeIndex = ES_INDEX + System.currentTimeMillis();
/**
* Use this to create the index for reading before IT read tests.
http://git-wip-us.apache.org/repos/asf/beam/blob/86e33559/sdks/java/io/hcatalog/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/hcatalog/pom.xml b/sdks/java/io/hcatalog/pom.xml
index 2aa661e..52eae34 100644
--- a/sdks/java/io/hcatalog/pom.xml
+++ b/sdks/java/io/hcatalog/pom.xml
@@ -71,12 +71,6 @@
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${apache.commons.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -133,6 +127,13 @@
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${apache.commons.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/beam/blob/86e33559/sdks/java/io/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/jdbc/pom.xml b/sdks/java/io/jdbc/pom.xml
index 357ddc0..c559ad4 100644
--- a/sdks/java/io/jdbc/pom.xml
+++ b/sdks/java/io/jdbc/pom.xml
@@ -257,11 +257,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -320,6 +315,11 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
</dependency>
[2/2] beam git commit: [BEAM-1984] This closes #3652
Posted by jb...@apache.org.
[BEAM-1984] This closes #3652
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/892a2cf5
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/892a2cf5
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/892a2cf5
Branch: refs/heads/master
Commit: 892a2cf5b0f83fcc4cdc2ae75131350735749309
Parents: e206b1a 86e3355
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Jul 27 15:22:59 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Jul 27 15:22:59 2017 +0200
----------------------------------------------------------------------
runners/spark/pom.xml | 1 +
sdks/java/io/amqp/pom.xml | 1 +
sdks/java/io/elasticsearch/pom.xml | 16 ++++++----------
.../io/elasticsearch/ElasticsearchTestDataSet.java | 2 +-
sdks/java/io/hcatalog/pom.xml | 13 +++++++------
sdks/java/io/jdbc/pom.xml | 10 +++++-----
6 files changed, 21 insertions(+), 22 deletions(-)
----------------------------------------------------------------------