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

update ingest-attachment to use Tika 1.17 and newer deps #27824

Merged
merged 4 commits into from Dec 15, 2017

Conversation

@talevy
Copy link
Contributor

commented Dec 14, 2017

  • this pr updates tika and its dependencies
  • updates the SHAs
  • updates the class excludes
- this pr updates tika and its dependencies
- updates the SHAs
- updates the class excludes
Copy link
Member

left a comment

LGTM. If it's green, ship it.

@clintongormley clintongormley added >upgrade and removed >non-issue labels Dec 14, 2017
@dadoonet

This comment has been minimized.

Copy link
Member

commented Dec 14, 2017

1.17 has been released. Should we keep us up to date ?

@talevy

This comment has been minimized.

Copy link
Contributor Author

commented Dec 14, 2017

@dadoonet woops. I saw it was released on their website, but then used mvnrepository.com to let me know if the sources were actually released, and they weren't there. I didn't dive deeper, that was my mistake. You're right. I will update to 1.17

as a side note... is there a sane way to manage the excluded classes list? I am using editor-magic to merge the exception list thrown by thirdPartyAudit and the existing list, then sorting them. Feels odd.

@dadoonet

This comment has been minimized.

Copy link
Member

commented Dec 14, 2017

About thirdPartyAudit, yeah this a lot of manual work. Didn’t find an easy way for doing it.

@talevy talevy changed the title update ingest-attachment to use Tika 1.16 and newer deps update ingest-attachment to use Tika 1.17 and newer deps Dec 14, 2017
@talevy

This comment has been minimized.

Copy link
Contributor Author

commented Dec 14, 2017

@dadoonet luckily 1.17 doesn't change much between 1.16... updated to latest

Copy link
Member

left a comment

Still LGTM.

@talevy

This comment has been minimized.

Copy link
Contributor Author

commented Dec 15, 2017

apologies for the extra back-and-forth @jasontedor. I thought I ran check, but I only ran precommit. 1.17 did actually change behavior. It throws an exception when reading empty files. It did not do this before 😄. I've modified the processor to preserve old behavior... tests were failing. go tests!

@jasontedor

This comment has been minimized.

Copy link
Member

commented Dec 15, 2017

Okay, I'll review this change.

Copy link
Member

left a comment

Any chance of a test for the zero-byte situation?

@talevy

This comment has been minimized.

Copy link
Contributor Author

commented Dec 15, 2017

there is a test, that is what caught the change. it was failing.

@jasontedor

This comment has been minimized.

Copy link
Member

commented Dec 15, 2017

Sorry @talevy, I misunderstood. I found what you're referring to:

20:45:34 [jason:~/src/elastic/elasticsearch/plugins/ingest-attachment/src/test] master+ ± find . -size 0
./resources/org/elasticsearch/ingest/attachment/test/sample-files/text-empty.txt

I am good with this. Thanks.

Copy link
Member

left a comment

LGTM. Third time is a charm!

@talevy talevy merged commit 43ff38c into elastic:master Dec 15, 2017
1 of 2 checks passed
1 of 2 checks passed
elasticsearch-ci Build finished.
Details
CLA Commit author is a member of Elasticsearch
Details
@talevy talevy deleted the talevy:update-tika branch Dec 15, 2017
talevy added a commit that referenced this pull request Dec 15, 2017
- this pr updates tika and its dependencies
- updates the SHAs
- updates the class excludes
@talevy talevy added the v6.1.1 label Dec 15, 2017
talevy added a commit that referenced this pull request Dec 15, 2017
- this pr updates tika and its dependencies
- updates the SHAs
- updates the class excludes
spinscale added a commit to spinscale/elasticsearch that referenced this pull request Dec 22, 2017
The tests explicitely check for the version of some java dependencies
and thus needed to be fixed.

Relates elastic#27824
spinscale added a commit that referenced this pull request Dec 22, 2017
The tests explicitely check for the version of some java dependencies
and thus needed to be fixed.

Relates #27824

Closes #27916
spinscale added a commit that referenced this pull request Dec 22, 2017
The tests explicitely check for the version of some java dependencies
and thus needed to be fixed.

Relates #27824

Closes #27916
spinscale added a commit that referenced this pull request Dec 22, 2017
The tests explicitely check for the version of some java dependencies
and thus needed to be fixed.

Relates #27824

Closes #27916
spinscale added a commit that referenced this pull request Dec 22, 2017
The tests explicitely check for the version of some java dependencies
and thus needed to be fixed.

Relates #27824

Closes #27916
spinscale added a commit that referenced this pull request Dec 22, 2017
The tests explicitely check for the version of some java dependencies
and thus needed to be fixed.

Relates #27824

Closes #27916
tlrx added a commit that referenced this pull request Jan 2, 2018
- this pr updates tika and its dependencies
- updates the SHAs
- updates the class excludes
@tlrx tlrx added the v6.2.0 label Jan 2, 2018
@tlrx

This comment has been minimized.

Copy link
Member

commented Jan 2, 2018

I just backported this to 6.x in 4a8f887

@talevy

This comment has been minimized.

Copy link
Contributor Author

commented Jan 3, 2018

thanks @tlrx!

martijnvg added a commit that referenced this pull request Jan 4, 2018
* es/6.x: (48 commits)
  Bump compat version for local depdendent test to 6.2.0
  Pass `java.locale.providers=COMPAT` to Java 9 onwards (#28080)
  Allow shrinking of indices from a previous major (#28076)
  Add Writeable.Reader support to TransportResponseHandler (#28010)
  Fix cluster.routing.allocation.enable and cluster.routing.rebalance.enable casing (#28037)
  [Test] Fix scores for dcg in RankEvalRequestIT and RankEvalYamlIT
  [Docs] Add note on limitation for significant_text with nested objects (#28052)
  [Test] Fix allowed delta for calculated scores in DiscountedCumulativeGainTests
  Enable convert processor to support Long and Double. (#27957)
  Enable Wildfly tests on JDK 9 and JDK 10
  update ingest-attachment to use Tika 1.17 and newer deps (#27824)
  Only bind loopback addresses when binding to local
  Fix assertion in Wildfly build
  Fix typo in comment in Wildfly build
  Use ephemeral ports in Wildfly tests
  Update fuzzy-query.asciidoc (#28032)
  Add node id to shard failure message (#28024)
  Introduce limit to the number of terms in Terms Query (#27968)
  Upgrade Gradle Shadow plugin to 2.0.2
  Upgrade to JMH 1.19
  ...
@colings86 colings86 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
Projects
None yet
6 participants
You can’t perform that action at this time.