Updated Branches: refs/heads/trunk 37e56e85b -> 088067cf4
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/088067cf Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/088067cf Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/088067cf Branch: refs/heads/trunk Commit: 088067cf41403978b262470a87b5dc094a568dd7 Parents: 37e56e8 Author: Hari Shreedharan <[email protected]> Authored: Wed Aug 21 23:52:15 2013 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Wed Aug 21 23:52:15 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/088067cf/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>
