flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hshreedha...@apache.org
Subject git commit: FLUME-2174. Integration of morphline solr sink puts Lucene/Solr dependencies on the default classpath
Date Thu, 22 Aug 2013 06:54:05 GMT
Updated Branches:
  refs/heads/flume-1.5 0bcd27e42 -> f1af0e96b


FLUME-2174. Integration of morphline solr sink puts Lucene/Solr dependencies on the default
classpath

(Roman Shaposhnik via Hari Shreedharan)


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

Branch: refs/heads/flume-1.5
Commit: f1af0e96b525af5ce91bdcb8ad41da7da2ebba20
Parents: 0bcd27e
Author: Hari Shreedharan <hshreedharan@apache.org>
Authored: Wed Aug 21 23:52:15 2013 -0700
Committer: Hari Shreedharan <hshreedharan@apache.org>
Committed: Wed Aug 21 23:53:32 2013 -0700

----------------------------------------------------------------------
 .../flume-ng-morphline-solr-sink/pom.xml        | 65 +++++---------------
 1 file changed, 16 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/f1af0e96/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
index 7cbc9b9..fd6b4ea 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
@@ -34,7 +34,7 @@ limitations under the License.
     <solr.version>4.3.0</solr.version>
     <solr.expected.version>4.3.0</solr.expected.version> <!-- sanity check
to verify we actually run against the expected version rather than some outdated version -->
     <tika.version>1.3</tika.version>
-    <cdk.version>0.5.0</cdk.version>
+    <cdk.version>0.6.0</cdk.version>
     <slf4j.version>1.6.1</slf4j.version>
     <surefire.version>2.12.4</surefire.version>
   </properties>
@@ -75,6 +75,14 @@ limitations under the License.
     </dependency>
 
     <dependency>
+      <groupId>com.cloudera.cdk</groupId>
+      <artifactId>cdk-morphlines-all</artifactId>
+      <version>${cdk.version}</version>
+      <type>pom</type>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
       <version>${slf4j.version}</version> <!-- flume provides 1.7.2 and solr
depends on 1.6.4 -->
@@ -86,48 +94,19 @@ limitations under the License.
       <artifactId>solr-test-framework</artifactId>
       <version>${solr.version}</version>
       <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.cloudera.cdk</groupId>
-      <artifactId>cdk-morphlines-solr-cell</artifactId>
-      <version>${cdk.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.cloudera.cdk</groupId>
-      <artifactId>cdk-morphlines-avro</artifactId>
-      <version>${cdk.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.cloudera.cdk</groupId>
-      <artifactId>cdk-morphlines-json</artifactId>
-      <version>${cdk.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.cloudera.cdk</groupId>
-      <artifactId>cdk-morphlines-twitter</artifactId>
-      <version>${cdk.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.cloudera.cdk</groupId>
-      <artifactId>cdk-morphlines-tika-core</artifactId>
-      <version>${cdk.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.cloudera.cdk</groupId>
-      <artifactId>cdk-morphlines-tika-decompress</artifactId>
-      <version>${cdk.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-jdk14</artifactId> <!-- instead use slf4j on top
of log4j or logback  -->
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency> <!-- see http://tika.apache.org -->
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-xmp</artifactId>
       <version>${tika.version}</version>
+      <scope>test</scope>
       <exclusions>
         <exclusion>
           <groupId>org.apache.geronimo.specs</groupId>
@@ -148,18 +127,6 @@ limitations under the License.
       <scope>test</scope>
     </dependency>
 
-    <dependency> <!-- see http://lucene.apache.org/solr -->
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-core</artifactId>
-      <version>${solr.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-jdk14</artifactId> <!-- instead use slf4j on top
of log4j or logback  -->
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>


Mime
View raw message