Skip to content

Update tika version to 1.15 #25003

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Nov 9, 2017
Merged

Update tika version to 1.15 #25003

merged 5 commits into from
Nov 9, 2017

Conversation

@glefloch
Copy link
Contributor

@glefloch glefloch commented Jun 1, 2017

Close #24969

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 1, 2017

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

jasontedor
jasontedor requested changes Jun 1, 2017
View reviewed changes
Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

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

I don't think this will pass gradle precommit, let alone gradle check.

plugins/ingest-attachment/build.gradle Outdated
Copy link
Member

@jasontedor jasontedor Jun 1, 2017

Choose a reason for hiding this comment

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

There's more that will be needed than this, for example, updating the SHAs. Did you run gradle check?

@glefloch
Copy link
Contributor Author

glefloch commented Jun 7, 2017

You were right, I ran checks, everything looks good.
In this updates, for the issue 2212 they removed the mediatype x-tika-ooxml in order to be more specific and add some new media type. I excluded media type in reference with visio in order to keeps things working as before ( #22077). But there still is new Mej uded into x-tika-ooxml before like:

  • model/vnd.dwfx+xps
  • application/vnd.ms-powerpoint.slide.macroenabled.12
  • application/vnd.ms-powerpoint.template.macroenabled.12
  • application/vnd.openxmlformats-officedocument.presentationml.slide

Should I exclude them as well?

dadoonet
dadoonet approved these changes Jun 30, 2017
View reviewed changes
Copy link
Contributor

@dadoonet dadoonet left a comment

Choose a reason for hiding this comment

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

The change looks OK. That said I know 1.15.1 will be released soonish as per https://twitter.com/_tallison/status/880140793553596418. Should we wait a bit? @jasontedor WDYT?

@jasontedor
Copy link
Member

jasontedor commented Jul 1, 2017

@dadoonet I think if this build is green we should get this in as-is. I know how release processes go, we could be waiting some uncertain period. A bird in the hand is worth two in the bush.

@jasontedor
Copy link
Member

jasontedor commented Jul 1, 2017

test this please

@jasontedor
Copy link
Member

jasontedor commented Jul 1, 2017

retest this please

@glefloch
Copy link
Contributor Author

glefloch commented Jul 1, 2017

@jasontedor, would you like me to merge master in my branch to fix the build issue?

@jasontedor
Copy link
Member

jasontedor commented Jul 1, 2017

Yes, please do.

@dakrone
Copy link
Member

dakrone commented Aug 15, 2017

@jasontedor I think since this has had master merged it's ready to be merged, is there any other review you want? (you're still marked as requesting changes which is why I pinged you)

@jasontedor
Copy link
Member

jasontedor commented Aug 15, 2017

test this please

@jasontedor
Merge branch 'master' into fix/24969
e1bc2ef 
* master: (458 commits)
  Prevent cluster internal `ClusterState.Custom` impls to leak to a client (elastic#26232)
  Add packaging test for systemd runtime directive
  [TEST] Reenable RareClusterStateIt#testDeleteCreateInOneBulk
  Serialize and expose timeout of acknowledged requests in REST layer (elastic#26189)
  (refactor) some opportunities to use diamond operator (elastic#25585)
  [DOCS] Clarified readme for testing a single page
  Settings: Add keystore.seed auto generated secure setting (elastic#26149)
  Update version information (elastic#25226)
  "result" : created -> "result" : "created" (elastic#25446)
  Set RuntimeDirectory (elastic#23526)
  Drop upgrade from full cluster restart tests (elastic#26224)
  Further improve docs for requests_per_second
  Docs disambiguate reindex's requests_per_second (elastic#26185)
  [DOCS] Cleanup link for ec2 discovery (elastic#26222)
  Fix document field equals and hash code test
  Use holder pattern for lazy deprecation loggers
  Settings: Add keystore creation to add commands (elastic#26126)
  Docs: Cleanup docs for ec2 discovery (elastic#26065)
  Fix NPE when `values` is omitted on percentile_ranks agg (elastic#26046)
  Several internal improvements to internal test cluster infra (elastic#26214)
  ...
@jasontedor
Copy link
Member

jasontedor commented Aug 16, 2017

retest this please

dadoonet
dadoonet reviewed Aug 16, 2017
View reviewed changes
Copy link
Contributor

@dadoonet dadoonet left a comment

Choose a reason for hiding this comment

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

I wonder if this is working when Tesseract is installed on the same platform. I read somewhere that Tika now runs OCR by default from 1.15 and I'm pretty sure we need to disable it.
I can't check now as I'm on holidays and AFK. :)

But I prefer saying now if anyone would like to check before I'm back.

@rjernst
Copy link
Member

rjernst commented Oct 10, 2017

@elasticmachine test this please

@dadoonet
Copy link
Contributor

dadoonet commented Nov 3, 2017

I ran a manual test with Tesseract installed locally and the current patch passed the integration tests.

@dadoonet
Copy link
Contributor

dadoonet commented Nov 3, 2017

@jasontedor WDYT?

Should we merge it as is or update this branch to 1.16 first?

@dadoonet dadoonet changed the title Update tika version Update tika version to 1.15 Nov 3, 2017
@jasontedor
Copy link
Member

jasontedor commented Nov 9, 2017 •
edited
Loading

We should merge this as-is (assuming CI is green).

@jasontedor
Copy link
Member

jasontedor commented Nov 9, 2017

retest this please

@jasontedor
Merge branch 'master' into pr/25003
2d36d41 
* master: (556 commits)
  Fix find remote when building BWC
  Remove colons from task and configuration names
  Add unreleased 5.6.5 version number
  testCreateSplitIndexToN: do not set `routing_partition_size` to >= `number_of_routing_shards`
  Snapshot/Restore: better handle incorrect chunk_size settings in FS repo (elastic#26844)
  Add limits for ngram and shingle settings (elastic#27211) (elastic#27318)
  Correct comment in index shard test
  Roll translog generation on primary promotion
  ObjectParser: Replace IllegalStateException with ParsingException (elastic#27302)
  scripted_metric _agg parameter disappears if params are provided (elastic#27159)
  Update discovery-ec2.asciidoc
  Update shrink's bwc version to 6.1.0 and enabled bwc tests
  Add limits for ngram and shingle settings (elastic#27211)
  Disable bwc tests in preparation of backporting elastic#26931
  TemplateUpgradeService should only run on the master (elastic#27294)
  Die with dignity while merging
  Fix profiling naming issues (elastic#27133)
  Correctly encode warning headers
  Fixed references to Multi Index Syntax (elastic#27283)
  Add an active Elasticsearch WordPress plugin link (elastic#27279)
  ...
@jasontedor
Copy link
Member

jasontedor commented Nov 9, 2017

retest this please

jasontedor
jasontedor approved these changes Nov 9, 2017
View reviewed changes
Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

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

LGTM.

@jasontedor jasontedor merged commit ac5fd6a into elastic:master Nov 9, 2017
jasontedor pushed a commit that referenced this pull request Nov 9, 2017
@glefloch @jasontedor
Update Tika version to 1.15
0a50fca 
This commit upgrades the Tika dependency to version 1.15.

Relates #25003
jasontedor pushed a commit that referenced this pull request Nov 9, 2017
@glefloch @jasontedor
Update Tika version to 1.15
563a6c8 
This commit upgrades the Tika dependency to version 1.15.

Relates #25003
@jasontedor
Copy link
Member

jasontedor commented Nov 9, 2017

I have integrated this into 5.6, 6.x, and master. This still needs to be merged into 6.0 after GA.

@ywelsch ywelsch mentioned this pull request Nov 10, 2017
Closed
tlrx added a commit that referenced this pull request Nov 13, 2017
@tlrx
[Test] Fix POI version in packaging tests
91a23de 
POI version has not been updated in packaging tests in #25003.

Closes #27340
tlrx added a commit that referenced this pull request Nov 13, 2017
@tlrx
[Test] Fix POI version in packaging tests
d4b7f7a 
POI version has not been updated in packaging tests in #25003.

Closes #27340
tlrx added a commit that referenced this pull request Nov 13, 2017
@tlrx
[Test] Fix POI version in packaging tests
eb7b2b6 
POI version has not been updated in packaging tests in #25003.

Closes #27340
@tlrx
Copy link
Member

tlrx commented Nov 13, 2017

@jasontedor I pushed 91a23de to fix a version number issue in the packaging tests. Please don't forget to backport this commit when backporting your change in 6.0.

jasontedor pushed a commit that referenced this pull request Nov 14, 2017
@glefloch @jasontedor
Update Tika version to 1.15
1c6976b 
This commit upgrades the Tika dependency to version 1.15.

Relates #25003
jasontedor pushed a commit that referenced this pull request Nov 14, 2017
@tlrx @jasontedor
[Test] Fix POI version in packaging tests
4edab93 
POI version has not been updated in packaging tests in #25003.

Closes #27340
@DaveCTurner DaveCTurner mentioned this pull request Nov 14, 2017
Closed
@glefloch glefloch deleted the fix/24969 branch November 18, 2017 15:17
@clintongormley clintongormley added :Data Management/Ingest Node Execution or management of Ingest Pipelines including GeoIP and removed :Plugin Ingest Attachment labels Feb 13, 2018
@jimczi jimczi added v7.0.0-beta1 and removed v7.0.0 labels Feb 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dadoonet dadoonet dadoonet approved these changes

@jasontedor jasontedor jasontedor approved these changes

Assignees

No one assigned

Labels

:Data Management/Ingest Node Execution or management of Ingest Pipelines including GeoIP >non-issue v5.6.5 v6.0.1 v6.1.0 v7.0.0-beta1

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@glefloch @elasticmachine @jasontedor @dakrone @rjernst @dadoonet @tlrx @clintongormley @jimczi