You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2014/02/18 21:59:40 UTC
git commit: CAMEL-7222: Upgrade to SolrJ 4.6.0
Repository: camel
Updated Branches:
refs/heads/master 16762eaa5 -> e532b283d
CAMEL-7222: Upgrade to SolrJ 4.6.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e532b283
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e532b283
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e532b283
Branch: refs/heads/master
Commit: e532b283d21cf6a9c37cfcc5d449a63f14ab2a43
Parents: 16762ea
Author: Babak Vahdat <bv...@apache.org>
Authored: Tue Feb 18 21:59:23 2014 +0100
Committer: Babak Vahdat <bv...@apache.org>
Committed: Tue Feb 18 21:59:23 2014 +0100
----------------------------------------------------------------------
components/camel-solr/pom.xml | 62 ++++++++++----------------------------
parent/pom.xml | 4 +--
2 files changed, 18 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e532b283/components/camel-solr/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index 53f839f..910d985 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -43,41 +43,31 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <version>${solr-version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${solr-version}</version>
- <exclusions>
- <!-- exclude rome 0.9 which is not a valid Maven artifact -->
- <!-- rome is not a needed dependency -->
- <exclusion>
- <groupId>rome</groupId>
- <artifactId>rome</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient4-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>${httpclient4-version}</version>
</dependency>
+ <!-- test dependencies -->
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- <version>${solr-version}</version>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
- <exclusions>
- <!-- exclude jdk14 as we want to use log4j -->
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
@@ -85,35 +75,15 @@
<version>${solr-version}</version>
<scope>test</scope>
<exclusions>
- <!-- exclude netcdf as it has a slf4j binding -->
- <exclusion>
- <groupId>edu.ucar</groupId>
- <artifactId>netcdf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
+ <!-- exclude rome 0.9 which is not a valid Maven artifact -->
<!-- rome is not a needed dependency -->
<exclusion>
<groupId>rome</groupId>
<artifactId>rome</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient4-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>${httpclient4-version}</version>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty-version}</version>
http://git-wip-us.apache.org/repos/asf/camel/blob/e532b283/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3dc9a01..fbc59e3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -368,8 +368,8 @@
<smack-version>3.2.1</smack-version>
<snappy-version>1.1.0.1</snappy-version>
<snmp4j-version>2.2.3_1</snmp4j-version>
- <solr-bundle-version>4.5.1_1</solr-bundle-version>
- <solr-version>4.5.1</solr-version>
+ <solr-bundle-version>4.6.0_1</solr-bundle-version>
+ <solr-version>4.6.0</solr-version>
<solr-version-range>[4.5,5)</solr-version-range>
<splunk-version>1.2.0_1</splunk-version>
<spring-batch-version>2.2.3.RELEASE</spring-batch-version>