Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GORA-509: Upgrade solr library to 6.5.1 #104

Merged
merged 5 commits into from Jun 4, 2017

Conversation

madhawa-gunasekara
Copy link
Member

No description provided.

Copy link
Member

@lewismc lewismc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @madhawa-gunasekara this is looking good.
Can you also please just remove the existing gora-solr module and rename gora-solr-5 to gora-solr?

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add license header

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack

@@ -0,0 +1,14 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this file required if there is nothing in it?

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add license header please

@@ -0,0 +1,14 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this if there is nothing in it?

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

License header please.

/**
* Created by madhawa on 5/28/17.
*/
public class GoraSolr6TestDriver extends GoraSolrTestDriver {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please can you make sure your code is formatted using 2 space indents?

+ "not only removes the data but also the data structure.", 0, page.getOutlinks().size());
assertEquals(0, page.getParsedContent().size());
if (page.getContent() != null) {
LOG.info("url:" + page.getUrl().toString());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use parameterized logging as follows

LOG.info("url: {}", page.getUrl().toString());

pom.xml Outdated
@@ -739,12 +739,12 @@
<!-- Solr Dependencies -->
<lucene-solr.version>4.10.3</lucene-solr.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the old lucene-solr.version

pom.xml Outdated
<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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rename this to lucene-solr.version

pom.xml Outdated
<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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If Tika is a transient dependency made available through Solr (which I think it most definitely is), please make sure to make the update here as well.

@madhawa-gunasekara
Copy link
Member Author

@lewismc
I have done the suggested changes. Let me know if you have any concerns.

Thanks,
Madhawa

@djkevincr
Copy link
Member

@madhawa-gunasekara great work :) Thanks for the PR.

@djkevincr
Copy link
Member

@lewismc Are you done reviewing the PR? Shall I proceed merging this to master?

@lewismc
Copy link
Member

lewismc commented Jun 1, 2017

+1

@djkevincr
Copy link
Member

@madhawa-gunasekara I am getting following error when I build the PR changes locally can you please check?

[INFO] ------------------------------------------------------------------------
[INFO] Building Apache Gora :: Tutorial 0.8-SNAPSHOT
[INFO] ------------------------------------------------------------------------
Downloading: http://repo.maven.apache.org/maven2/org/apache/solr/solr-core/${lucene-solr-5.version}/solr-core-${lucene-solr-5.version}.pom
Downloading: http://maven.restlet.org/org/apache/solr/solr-core/${lucene-solr-5.version}/solr-core-${lucene-solr-5.version}.pom
Downloading: http://repo.maven.apache.org/maven2/org/apache/solr/solr-solrj/${solr-solrj-5.version}/solr-solrj-${solr-solrj-5.version}.pom
Downloading: http://maven.restlet.org/org/apache/solr/solr-solrj/${solr-solrj-5.version}/solr-solrj-${solr-solrj-5.version}.pom
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] Apache Gora :: Tutorial ........................... FAILURE [3.183s]
[INFO] Apache Gora :: Sources-Dist ....................... SKIPPED
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 5.005s
[INFO] Finished at: Sun Jun 04 21:44:49 IST 2017
[INFO] Final Memory: 25M/334M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal on project gora-tutorial: Could not resolve dependencies for project org.apache.gora:gora-tutorial:bundle:0.8-SNAPSHOT: Failed to collect dependencies for [org.apache.gora:gora-core:jar:0.8-SNAPSHOT (compile), org.apache.gora:gora-hbase:jar:0.8-SNAPSHOT (compile), org.apache.gora:gora-jcache:jar:0.8-SNAPSHOT (compile), org.apache.gora:gora-couchdb:jar:0.8-SNAPSHOT (compile), org.apache.gora:gora-cassandra:jar:0.8-SNAPSHOT (compile), org.apache.gora:gora-solr-5:jar:0.8-SNAPSHOT (compile), org.apache.hadoop:hadoop-client:jar:2.5.2 (compile), org.apache.avro:avro:jar:1.8.1 (compile), org.apache.spark:spark-core_2.10:jar:1.4.1 (provided), org.jdom:jdom:jar:1.1.3 (compile), org.slf4j:slf4j-log4j12:jar:1.6.6 (compile), log4j:log4j:jar:1.2.16 (compile), org.ektorp:org.ektorp:jar:1.4.2 (compile)]: Failed to read artifact descriptor for org.apache.solr:solr-core:jar:${lucene-solr-5.version}: Could not transfer artifact org.apache.solr:solr-core:pom:${lucene-solr-5.version} from/to central (http://repo.maven.apache.org/maven2): Illegal character in path at index 63: http://repo.maven.apache.org/maven2/org/apache/solr/solr-core/${lucene-solr-5.version}/solr-core-${lucene-solr-5.version}.pom -> [Help 1]

@madhawa-gunasekara
Copy link
Member Author

@djkevincr I have fixed it :)

@asfgit asfgit merged commit 9e95efe into apache:master Jun 4, 2017
Copy link
Member

@djkevincr djkevincr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged the PR. Thank you very much @madhawa-gunasekara :)

@madhawa-gunasekara
Copy link
Member Author

@djkevincr Thanks a lot 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants