You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2017/07/24 04:24:34 UTC
[1/3] beam git commit: update pom.xml
Repository: beam
Updated Branches:
refs/heads/DSL_SQL 0eb8e89ba -> d32aea969
update pom.xml
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/5dca20f8
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/5dca20f8
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/5dca20f8
Branch: refs/heads/DSL_SQL
Commit: 5dca20f88c1d78ebb65b75c9e777e7af5bcee587
Parents: 0eb8e89
Author: mingmxu <mi...@ebay.com>
Authored: Fri Jul 21 10:40:43 2017 -0700
Committer: mingmxu <mi...@ebay.com>
Committed: Fri Jul 21 10:40:43 2017 -0700
----------------------------------------------------------------------
dsls/pom.xml | 8 ----
dsls/sql/pom.xml | 81 +++++++++++++++++++++++------------------
pom.xml | 14 +++++++
sdks/java/io/kafka/pom.xml | 5 ---
4 files changed, 60 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/5dca20f8/dsls/pom.xml
----------------------------------------------------------------------
diff --git a/dsls/pom.xml b/dsls/pom.xml
index 1647114..dcc5d8c 100644
--- a/dsls/pom.xml
+++ b/dsls/pom.xml
@@ -55,14 +55,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/beam/blob/5dca20f8/dsls/sql/pom.xml
----------------------------------------------------------------------
diff --git a/dsls/sql/pom.xml b/dsls/sql/pom.xml
index 5e670a0..ac07489 100644
--- a/dsls/sql/pom.xml
+++ b/dsls/sql/pom.xml
@@ -37,8 +37,8 @@
<properties>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
- <calcite-version>1.13.0</calcite-version>
- <avatica-version>1.10.0</avatica-version>
+ <calcite.version>1.13.0</calcite.version>
+ <avatica.version>1.10.0</avatica.version>
</properties>
<profiles>
@@ -133,14 +133,23 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-core</artifactId>
+ <version>${calcite.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.calcite</groupId>
- <artifactId>calcite-core</artifactId>
- <version>${calcite-version}</version>
+ <artifactId>calcite-linq4j</artifactId>
+ <version>${calcite.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-core</artifactId>
+ <version>${avatica.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-sdks-java-core</artifactId>
@@ -151,65 +160,67 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.beam</groupId>
- <artifactId>beam-sdks-java-io-kafka</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>0.9.0.1</version>
- </dependency>
+
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-linq4j</artifactId>
- <version>${calcite-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-core</artifactId>
- <version>${avatica-version}</version>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
- <version>1.4</version>
</dependency>
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>beam-sdks-java-extensions-join-library</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
+ <!-- this is a hack to make it available at compile time but not bundled.-->
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.beam</groupId>
- <artifactId>beam-runners-direct-java</artifactId>
+ <artifactId>beam-sdks-java-io-kafka</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- for tests -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.beam</groupId>
- <artifactId>beam-sdks-java-extensions-join-library</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/beam/blob/5dca20f8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 52c1356..a86a680 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,6 +152,8 @@
<woodstox.version>4.4.1</woodstox.version>
<spring.version>4.3.5.RELEASE</spring.version>
<snappy-java.version>1.1.4-M3</snappy-java.version>
+ <kafka.clients.version>0.10.1.0</kafka.clients.version>
+ <commons.csv.version>1.4</commons.csv.version>
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
<groovy-maven-plugin.version>2.0</groovy-maven-plugin.version>
@@ -1136,6 +1138,18 @@
<version>${spark.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>${kafka.clients.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-csv</artifactId>
+ <version>${commons.csv.version}</version>
+ </dependency>
+
<!-- Testing -->
<dependency>
http://git-wip-us.apache.org/repos/asf/beam/blob/5dca20f8/sdks/java/io/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/kafka/pom.xml b/sdks/java/io/kafka/pom.xml
index 1256c46..0a8aa7f 100644
--- a/sdks/java/io/kafka/pom.xml
+++ b/sdks/java/io/kafka/pom.xml
@@ -29,10 +29,6 @@
<name>Apache Beam :: SDKs :: Java :: IO :: Kafka</name>
<description>Library to read Kafka topics.</description>
- <properties>
- <kafka.clients.version>0.10.1.0</kafka.clients.version>
- </properties>
-
<build>
<pluginManagement>
<plugins>
@@ -69,7 +65,6 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka.clients.version}</version>
</dependency>
<dependency>
[2/3] beam git commit: remove maven-jar-plugin
Posted by ke...@apache.org.
remove maven-jar-plugin
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/5e31d478
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/5e31d478
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/5e31d478
Branch: refs/heads/DSL_SQL
Commit: 5e31d4785806d6e2d198616728638e5fa8faa734
Parents: 5dca20f
Author: mingmxu <mi...@ebay.com>
Authored: Fri Jul 21 12:01:46 2017 -0700
Committer: mingmxu <mi...@ebay.com>
Committed: Fri Jul 21 12:01:46 2017 -0700
----------------------------------------------------------------------
dsls/pom.xml | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/5e31d478/dsls/pom.xml
----------------------------------------------------------------------
diff --git a/dsls/pom.xml b/dsls/pom.xml
index dcc5d8c..d0beca1 100644
--- a/dsls/pom.xml
+++ b/dsls/pom.xml
@@ -49,16 +49,6 @@
</profiles>
<build>
- <pluginManagement>
- <plugins>
- <!-- DSLs will generally offer test suites for runners, as sdks/java does. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[3/3] beam git commit: This closes #3614: [BEAM-2652] cleanup SQL
pom.xml
Posted by ke...@apache.org.
This closes #3614: [BEAM-2652] cleanup SQL pom.xml
remove maven-jar-plugin
update pom.xml
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/d32aea96
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/d32aea96
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/d32aea96
Branch: refs/heads/DSL_SQL
Commit: d32aea969d123229043c3be606f24f4666153fae
Parents: 0eb8e89 5e31d47
Author: Kenneth Knowles <kl...@google.com>
Authored: Sun Jul 23 21:21:30 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Sun Jul 23 21:21:30 2017 -0700
----------------------------------------------------------------------
dsls/pom.xml | 18 ---------
dsls/sql/pom.xml | 81 +++++++++++++++++++++++------------------
pom.xml | 14 +++++++
sdks/java/io/kafka/pom.xml | 5 ---
4 files changed, 60 insertions(+), 58 deletions(-)
----------------------------------------------------------------------