beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesmal...@apache.org
Subject [11/50] [abbrv] incubator-beam git commit: Move some worker-and-example-only dependencies out of sdk
Date Fri, 26 Feb 2016 22:54:48 GMT
Move some worker-and-example-only dependencies out of sdk

Following the separation of the worker module, running

    $ mvn dependency:analyze -pl sdk

yields

    [WARNING] Used undeclared dependencies found:
    [WARNING]    com.google.code.findbugs:jsr305:jar:3.0.1:compile
    [WARNING]    javax.xml.stream:stax-api:jar:1.0-2:compile
    [WARNING]    com.google.http-client:google-http-client:jar:1.21.0:compile
    [WARNING] Unused declared dependencies found:
    [WARNING]    org.eclipse.jetty:jetty-servlet:jar:9.2.10.v20150310:compile
    [WARNING]    org.codehaus.woodstox:woodstox-core-asl:jar:4.1.2:compile
    [WARNING]    org.eclipse.jetty:jetty-server:jar:9.2.10.v20150310:compile
    [WARNING]    javax.servlet:javax.servlet-api:jar:3.1.0:compile
    [WARNING]    org.tukaani:xz:jar:1.5:compile

This change removes unused dependencies. The `xz` and `woodstox` dependencies
are for optional features of AvroSource and XmlSource.

----Release Notes----

[]
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=115300250


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

Branch: refs/heads/master
Commit: 24288e7ba5be86d927cffaccbd4c768797f4361d
Parents: 7871cbb
Author: klk <klk@google.com>
Authored: Mon Feb 22 20:25:49 2016 -0800
Committer: Davor Bonaci <davorbonaci@users.noreply.github.com>
Committed: Thu Feb 25 23:58:26 2016 -0800

----------------------------------------------------------------------
 examples/pom.xml                                  |  6 ++++++
 .../main/resources/archetype-resources/pom.xml    |  6 ++++++
 sdk/pom.xml                                       | 18 ------------------
 worker/pom.xml                                    | 18 ++++++++++++++++++
 4 files changed, 30 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/24288e7b/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index adea4b1..3900a23 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -484,6 +484,12 @@
       <scope>runtime</scope>
     </dependency>
 
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+    </dependency>
+
     <!-- Hamcrest and JUnit are required dependencies of DataflowAssert,
          which is used in the main code of DebuggingWordCount example. -->
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/24288e7b/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
index 8531087..bffa376 100644
--- a/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
@@ -166,6 +166,12 @@
       <version>18.0</version>
     </dependency>
 
+     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+    </dependency>
+
     <!-- Add slf4j API frontend binding with JUL backend -->
     <dependency>
       <groupId>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/24288e7b/sdk/pom.xml
----------------------------------------------------------------------
diff --git a/sdk/pom.xml b/sdk/pom.xml
index 1d74580..e3744fd 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -640,24 +640,6 @@
       <version>${joda.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>9.2.10.v20150310</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>9.2.10.v20150310</version>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-    </dependency>
-
     <!--
     To use com.google.cloud.dataflow.io.XmlSource, please explicitly declare
     the following two dependencies.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/24288e7b/worker/pom.xml
----------------------------------------------------------------------
diff --git a/worker/pom.xml b/worker/pom.xml
index 5c5dca1..e621ed4 100644
--- a/worker/pom.xml
+++ b/worker/pom.xml
@@ -245,6 +245,24 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>9.2.10.v20150310</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>9.2.10.v20150310</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>org.hamcrest</groupId>


Mime
View raw message