storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ptgo...@apache.org
Subject [2/4] git commit: change kafka dependency scope to provided so users can choose whichever scala version they want
Date Tue, 10 Jun 2014 18:08:15 GMT
change kafka dependency scope to provided so users can choose whichever scala version they
want


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

Branch: refs/heads/master
Commit: 3bea3c4f55bfe69e1e82626f8f1d3ecc4012b29a
Parents: 029ef96
Author: P. Taylor Goetz <ptgoetz@gmail.com>
Authored: Tue Jun 10 13:34:36 2014 -0400
Committer: P. Taylor Goetz <ptgoetz@gmail.com>
Committed: Tue Jun 10 13:34:36 2014 -0400

----------------------------------------------------------------------
 external/storm-kafka/pom.xml | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/3bea3c4f/external/storm-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 1210dcd..ea6c02d 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -30,11 +30,6 @@
     <artifactId>storm-kafka</artifactId>
     <name>storm-kafka</name>
     <description>Storm Spouts for Apache Kafka</description>
-    <properties>
-        <scalaVersion>2.9.2</scalaVersion>
-        <kafkaArtifact>kafka_2.9.2</kafkaArtifact>
-        <envClassifier></envClassifier>
-    </properties>
     <build>
         <plugins>
 
@@ -50,11 +45,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>${scalaVersion}</version>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.11</version>
@@ -105,8 +95,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
-            <artifactId>${kafkaArtifact}</artifactId>
+            <artifactId>kafka_2.9.2</artifactId>
             <version>0.8.1.1</version>
+            <!-- use provided scope, so users can pull in whichever scala version they
choose -->
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.zookeeper</groupId>
@@ -125,14 +117,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>Scala-2.10</id>
-            <properties>
-                <scalaVersion>2.10.3</scalaVersion>
-                <kafkaArtifact>kafka_2.10</kafkaArtifact>
-                <envClassifier>scala_2.10</envClassifier>
-            </properties>
-        </profile>
-    </profiles>
 </project>


Mime
View raw message