GORA-509: Upgrade solr library to 6.5.1
Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/47d6d678 Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/47d6d678 Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/47d6d678 Branch: refs/heads/master Commit: 47d6d678e4ad80aae798060495b0ea9f5a7f05fb Parents: 25188aa Author: madhawa <madhaw...@gmail.com> Authored: Sun May 28 12:04:40 2017 +0530 Committer: madhawa-gunasekara <madha...@wso2.com> Committed: Sun Jun 4 20:13:10 2017 +0530 ---------------------------------------------------------------------- gora-solr-5/pom.xml | 47 ++++++++++++++++++++++++++++++++++++++- pom.xml | 57 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 97 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/47d6d678/gora-solr-5/pom.xml ---------------------------------------------------------------------- diff --git a/gora-solr-5/pom.xml b/gora-solr-5/pom.xml index 4009ffb..816d04a 100644 --- a/gora-solr-5/pom.xml +++ b/gora-solr-5/pom.xml @@ -34,7 +34,7 @@ <properties> <osgi.import>*</osgi.import> <osgi.export>org.apache.gora.solr*;version="${project.version}";-noimport:=true</osgi.export> - <jetty.version>9.2.13.v20150730</jetty.version> + <jetty.version>9.3.14.v20161028</jetty.version> </properties> <build> @@ -220,6 +220,51 @@ <artifactId>jetty-webapp</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-deploy</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-rewrite</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-xml</artifactId> + <scope>runtime</scope> + </dependency> <!-- ADDED TO AVOID PROBLEMS WITH JAVAX --> <dependency> http://git-wip-us.apache.org/repos/asf/gora/blob/47d6d678/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f3f3058..c48d33b 100644 --- a/pom.xml +++ b/pom.xml @@ -755,12 +755,12 @@ <!-- Solr Dependencies --> <lucene-solr.version>4.10.3</lucene-solr.version> <solr-solrj.version>4.10.3</solr-solrj.version> - <lucene-solr-5.version>5.5.1</lucene-solr-5.version> - <solr-solrj-5.version>5.5.1</solr-solrj-5.version> - <jetty.version>8.1.8.v20121106</jetty.version> + <lucene-solr-5.version>6.5.1</lucene-solr-5.version> + <solr-solrj-5.version>6.5.1</solr-solrj-5.version> + <jetty.version>9.3.14.v20161028</jetty.version> <tika.version>1.7</tika.version> - <httpcomponents.version>4.3.1</httpcomponents.version> - <commons-io.version>2.4</commons-io.version> + <httpcomponents.version>4.4.1</httpcomponents.version> + <commons-io.version>2.5</commons-io.version> <restlet.version>2.3.1</restlet.version> <spark.version>1.4.1</spark.version> @@ -1283,7 +1283,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.5</version> + <version>3.4.6</version> </dependency> <dependency> <groupId>org.carrot2</groupId> @@ -1313,6 +1313,51 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-deploy</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-rewrite</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-xml</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> <version>${jetty.version}</version> </dependency>
