You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by xi...@apache.org on 2017/04/13 05:53:02 UTC
[1/2] storm git commit: STORM-2469: fix integration-test dependencies
issue
Repository: storm
Updated Branches:
refs/heads/master 4df35c571 -> 6a09512cc
STORM-2469: fix integration-test dependencies issue
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a9dbe7ca
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a9dbe7ca
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a9dbe7ca
Branch: refs/heads/master
Commit: a9dbe7ca48d123c8d60394da89e8bae7524bf7e8
Parents: 1850dd5
Author: Xin Wang <be...@163.com>
Authored: Wed Apr 12 14:12:12 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Wed Apr 12 14:12:12 2017 +0800
----------------------------------------------------------------------
integration-test/pom.xml | 37 +++++++++----------------------------
1 file changed, 9 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a9dbe7ca/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 413eb3c..7ec9584 100755
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -27,7 +27,6 @@
</parent>
<name>Storm Integration Test</name>
- <groupId>org.apache.storm</groupId>
<artifactId>storm-integration-test</artifactId>
<packaging>jar</packaging>
@@ -65,37 +64,26 @@
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-firefox-driver</artifactId>
- <version>2.45.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-support</artifactId>
- <version>2.45.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.storm</groupId>
<artifactId>storm-client</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
+ <scope>${provided.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.storm</groupId>
- <artifactId>storm-solr</artifactId>
+ <artifactId>storm-server</artifactId>
<version>${project.version}</version>
+ <scope>${provided.scope}</scope>
</dependency>
<dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-starter</artifactId>
- <version>${project.version}</version>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-hdfs</artifactId>
- <version>${project.version}</version>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>3.0.2</version>
</dependency>
</dependencies>
@@ -151,7 +139,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
- <forkCount>1C</forkCount>
<argLine>-Xmx1024m</argLine>
<properties>
<property>
@@ -166,12 +153,6 @@
<!-- Hack to get the dir in CP through CLI and idea -->
<additionalClasspathElement>${storm.conf.dir}</additionalClasspathElement>
<additionalClasspathElement>${hadoop.conf.dir}</additionalClasspathElement>
- <additionalClasspathElement>${extra.classpath.1}</additionalClasspathElement>
- <additionalClasspathElement>${extra.classpath.2}</additionalClasspathElement>
- <additionalClasspathElement>${extra.classpath.3}</additionalClasspathElement>
- <additionalClasspathElement>${extra.classpath.4}</additionalClasspathElement>
- <additionalClasspathElement>${extra.classpath.5}</additionalClasspathElement>
- <additionalClasspathElement>${extra.classpath.6}</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
[2/2] storm git commit: Merge branch 'STORM-2469' of
https://github.com/vesense/storm
Posted by xi...@apache.org.
Merge branch 'STORM-2469' of https://github.com/vesense/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6a09512c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6a09512c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6a09512c
Branch: refs/heads/master
Commit: 6a09512cc481dd68a989a46ed959d69d8721b58b
Parents: 4df35c5 a9dbe7c
Author: vesense <be...@163.com>
Authored: Thu Apr 13 13:52:30 2017 +0800
Committer: vesense <be...@163.com>
Committed: Thu Apr 13 13:52:30 2017 +0800
----------------------------------------------------------------------
integration-test/pom.xml | 37 +++++++++----------------------------
1 file changed, 9 insertions(+), 28 deletions(-)
----------------------------------------------------------------------