storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [01/11] storm git commit: STORM-541:Clean duplicate dependences in poms
Date Tue, 17 Mar 2015 15:41:51 GMT
Repository: storm
Updated Branches:
  refs/heads/master e85d01f7c -> 201920985


STORM-541:Clean duplicate dependences in poms


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/91fefef4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/91fefef4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/91fefef4

Branch: refs/heads/master
Commit: 91fefef439388bb3f6f144f6eecd24213ad1cc62
Parents: d8c98cb
Author: caofangkun <caofangkun@gmail.com>
Authored: Mon Feb 9 14:14:06 2015 +0800
Committer: caofangkun <caofangkun@gmail.com>
Committed: Mon Feb 9 14:14:06 2015 +0800

----------------------------------------------------------------------
 pom.xml            | 6 ------
 storm-core/pom.xml | 8 ++------
 2 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/91fefef4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index af86bd0..d23108c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -521,12 +521,6 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.clojars.runa</groupId>
-                <artifactId>conjure</artifactId>
-                <version>${conjure.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
                 <groupId>org.apache.thrift</groupId>
                 <artifactId>libthrift</artifactId>
                 <version>0.7.0</version>

http://git-wip-us.apache.org/repos/asf/storm/blob/91fefef4/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 9f3ed49..3c7389e 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -21,6 +21,7 @@
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
         <version>0.10.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
     <groupId>org.apache.storm</groupId>
     <artifactId>storm-core</artifactId>
@@ -205,18 +206,12 @@
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.clojars.runa</groupId>
-            <artifactId>conjure</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
 	  <groupId>org.apache.hadoop</groupId>
 	  <artifactId>hadoop-auth</artifactId>
 	  <version>2.4.0</version>
@@ -479,6 +474,7 @@
             <plugin>
                <groupId>org.apache.storm</groupId>
                <artifactId>storm-maven-plugins</artifactId>
+               <version>${project.version}</version>
                <executions>
                  <execution>
                    <id>version-info</id>


Mime
View raw message