2d604eaef6
Update to elasticsearch 2.0.0.beta2
...
Closes #161 .
Closes #162 .
(cherry picked from commit 8583ce9)
2015-10-01 00:11:32 +02:00
f2eb0a3b2b
Latest version is 3.0.0
2015-09-30 17:26:56 +02:00
f18f1550fa
update documentation with release 2.7.1
2015-09-30 12:18:01 +02:00
3af481ee65
Remove all netcdf dependencies: update licenses
...
Closes #157
2015-09-30 10:29:21 +02:00
b2e0f90bbe
Remove all netcdf dependencies
...
Follow up for #84 .
Sounds like that httpcore is pulled by netcdf libs. Note that we wrote in #84 that we were removing support for netcdf file types.
```xml
<!-- Not Apache2 License compatible -->
<exclusion>
<groupId>edu.ucar</groupId>
<artifactId>netcdf</artifactId>
</exclusion>
```
Apparently the removal was not entirely done.
Adding exclusion the following exclusions will fix that:
```xml
<!-- Not Apache2 License compatible -->
<exclusion>
<groupId>edu.ucar</groupId>
<artifactId>cdm</artifactId>
</exclusion>
<!-- Not Apache2 License compatible -->
<exclusion>
<groupId>edu.ucar</groupId>
<artifactId>httpservices</artifactId>
</exclusion>
<!-- Not Apache2 License compatible -->
<exclusion>
<groupId>edu.ucar</groupId>
<artifactId>grib</artifactId>
</exclusion>
<!-- Not Apache2 License compatible -->
<exclusion>
<groupId>edu.ucar</groupId>
<artifactId>netcdf4</artifactId>
</exclusion>
```
With that, we don't pull anymore http* client/core/component libs:
```
[INFO] org.elasticsearch:elasticsearch-mapper-attachments:jar:2.7.1-SNAPSHOT
...
[INFO] +- org.apache.tika:tika-parsers:jar:1.10:compile
[INFO] | +- org.apache.tika:tika-core:jar:1.10:compile
[INFO] | +- org.gagravarr:vorbis-java-tika:jar:0.6:compile
[INFO] | +- com.healthmarketscience.jackcess:jackcess:jar:2.1.2:compile
[INFO] | | +- commons-lang:commons-lang:jar:2.6:compile
[INFO] | | \- commons-logging:commons-logging:jar:1.1.3:compile
[INFO] | +- com.healthmarketscience.jackcess:jackcess-encrypt:jar:2.1.0:compile
[INFO] | +- net.sourceforge.jmatio:jmatio:jar:1.0:compile
[INFO] | +- org.apache.james:apache-mime4j-core:jar:0.7.2:compile
[INFO] | +- org.apache.james:apache-mime4j-dom:jar:0.7.2:compile
[INFO] | +- org.apache.commons:commons-compress:jar:1.9:compile
[INFO] | +- org.tukaani:xz:jar:1.5:compile
[INFO] | +- commons-codec:commons-codec:jar:1.9:compile
[INFO] | +- org.apache.pdfbox:pdfbox:jar:1.8.10:compile
[INFO] | | +- org.apache.pdfbox:fontbox:jar:1.8.10:compile
[INFO] | | \- org.apache.pdfbox:jempbox:jar:1.8.10:compile
[INFO] | +- org.bouncycastle:bcmail-jdk15on:jar:1.52:compile
[INFO] | | \- org.bouncycastle:bcpkix-jdk15on:jar:1.52:compile
[INFO] | +- org.bouncycastle:bcprov-jdk15on:jar:1.52:compile
[INFO] | +- org.apache.poi:poi:jar:3.13-beta1:compile
[INFO] | +- org.apache.poi:poi-scratchpad:jar:3.13-beta1:compile
[INFO] | +- org.apache.poi:poi-ooxml:jar:3.13-beta1:compile
[INFO] | | \- org.apache.poi:poi-ooxml-schemas:jar:3.13-beta1:compile
[INFO] | | \- org.apache.xmlbeans:xmlbeans:jar:2.6.0:compile
[INFO] | +- org.ccil.cowan.tagsoup:tagsoup:jar:1.2.1:compile
[INFO] | +- com.googlecode.mp4parser:isoparser:jar:1.0.2:compile
[INFO] | | \- org.aspectj:aspectjrt:jar:1.8.0:compile
[INFO] | +- com.drewnoakes:metadata-extractor:jar:2.8.0:compile
[INFO] | | \- com.adobe.xmp:xmpcore:jar:5.1.2:compile
[INFO] | +- de.l3s.boilerpipe:boilerpipe:jar:1.1.0:compile
[INFO] | +- rome:rome:jar:1.0:compile
[INFO] | | \- jdom:jdom:jar:1.0:compile
[INFO] | +- org.gagravarr:vorbis-java-core:jar:0.6:compile
[INFO] | +- com.googlecode.juniversalchardet:juniversalchardet:jar:1.0.3:compile
[INFO] | +- org.codelibs:jhighlight:jar:1.0.2:compile
[INFO] | +- com.pff:java-libpst:jar:0.8.1:compile
[INFO] | +- com.github.junrar:junrar:jar:0.7:compile
[INFO] | | \- org.apache.commons:commons-vfs2:jar:2.0:compile
[INFO] | | +- org.apache.maven.scm:maven-scm-api:jar:1.4:compile
[INFO] | | | \- org.codehaus.plexus:plexus-utils:jar:1.5.6:compile
[INFO] | | \- org.apache.maven.scm:maven-scm-provider-svnexe:jar:1.4:compile
[INFO] | | +- org.apache.maven.scm:maven-scm-provider-svn-commons:jar:1.4:compile
[INFO] | | \- regexp:regexp:jar:1.3:compile
[INFO] | +- org.apache.opennlp:opennlp-tools:jar:1.5.3:compile
[INFO] | | +- org.apache.opennlp:opennlp-maxent:jar:3.0.3:compile
[INFO] | | \- net.sf.jwordnet:jwnl:jar:1.3.3:compile
[INFO] | +- commons-io:commons-io:jar:2.4:compile
[INFO] | +- org.apache.commons:commons-exec:jar:1.3:compile
[INFO] | +- com.googlecode.json-simple:json-simple:jar:1.1.1:compile
[INFO] | +- com.google.guava:guava:jar:18.0:compile
[INFO] | +- org.apache.commons:commons-csv:jar:1.0:compile
[INFO] | +- org.apache.sis.core:sis-utility:jar:0.5:compile
[INFO] | +- org.apache.sis.storage:sis-netcdf:jar:0.5:compile
[INFO] | | +- org.apache.sis.storage:sis-storage:jar:0.5:compile
[INFO] | | \- org.apache.sis.core:sis-referencing:jar:0.5:compile
[INFO] | +- org.apache.sis.core:sis-metadata:jar:0.5:compile
[INFO] | \- org.opengis:geoapi:jar:3.0.0:compile
[INFO] | \- javax.measure:jsr-275:jar:0.9.3:compile
[INFO] +- log4j:log4j:jar:1.2.17:compile
[INFO] \- org.elasticsearch:elasticsearch:test-jar:tests:1.7.0:test
```
Closes #157
(cherry picked from commit 3eac5e6)
2015-09-30 10:13:44 +02:00
7ce41e13f5
update documentation with release 3.0.0
2015-08-27 14:40:43 +02:00
554e2121e9
[build] update to elasticsearch 2.1.0
...
Closes #151 .
2015-08-25 13:51:05 +02:00
f31d37b6bb
Update README for 3.0.0-SNAPSHOT
...
Related to #151
2015-08-25 13:48:37 +02:00
7dfaef4916
Disable "Multiple Attachments With Encrypted Doc Should Fail" test
...
This test has been disabled as it tries to decode an encoded PDF using BouncyCastle lib
Elasticsearch security manager does not allow permission java.security.SecurityPermission "insertProvider.BC";
See https://github.com/elastic/elasticsearch/pull/13077
See https://github.com/elastic/elasticsearch-mapper-attachments/pull/150#issuecomment-134247110
2015-08-25 13:29:33 +02:00
38ae04230a
Update to 2.0.0.beta1
...
Note this PR requires for now https://github.com/elastic/elasticsearch/pull/13001 to be merged in branch 2.0.
It sounds like it's not required for master branch (2.1.0-SNAPSHOT)
2015-08-24 17:21:38 +02:00
348b05a50e
Add licences
2015-08-24 16:21:30 +02:00
75b8075a53
[test] move to real integration tests
...
We have a security manager issue with [Bouncy Castle](http://www.bouncycastle.org/wiki/display/JA1/Using+the+Bouncy+Castle+Provider's+ImplicitlyCA+Facility ).
Recommended permissions:
```
grant {
permission java.security.SecurityPermission "putProviderProperty.BC";
permission java.security.SecurityPermission "insertProvider.BC";
permission org.bouncycastle.jce.ProviderConfigurationPermission "BC", "ecImplicitlyCA, threadLocalEcImplicitlyCA";
};
```
Steps to reproduce the issue:
```sh
cd target/integ-tests/elasticsearch-2.0.0-SNAPSHOT
# Configure elasticsearch for SENSE (if you need)
echo "http.cors.enabled: true" >> config/elasticsearch.yml
echo "http.cors.allow-origin: /.*/" >> config/elasticsearch.yml
echo "http.cors.allow-credentials: true" >> config/elasticsearch.yml
# Launch elasticsearch
sh bin/elasticsearch
```
Then run this test script in SENSE:
```json
DELETE test
PUT test
{
"settings": {
"index.mapping.attachment.ignore_errors": false
},
"mappings": {
"doc":{
"properties":{
"file1":{
"type":"attachment"
},
"file2":{
"type":"attachment"
}
}
}
}
}
PUT test/doc/1
{
"file1": "PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFsLy9FTiINCiAgICAgICAgImh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw0L2xvb3NlLmR0ZCI+DQo8aHRtbCBsYW5nPSJmciI+DQo8aGVhZD4NCiAgICA8dGl0bGU+SGVsbG88L3RpdGxlPg0KICAgIDxtZXRhIG5hbWU9ImRhdGUiIGNvbnRlbnQ9IjIwMTItMTEtMzAiPg0KICAgIDxtZXRhIG5hbWU9IkF1dGhvciIgY29udGVudD0ia2ltY2h5Ij4NCiAgICA8bWV0YSBuYW1lPSJLZXl3b3JkcyIgY29udGVudD0iZWxhc3RpY3NlYXJjaCxjb29sLGJvbnNhaSI+DQo8L2hlYWQ+DQo8Ym9keT5Xb3JsZDwvYm9keT4NCjwvaHRtbD4NCg==",
"file2": "%PDF-1.4
%äüöß
2 0 obj
<</Length 3 0 R/Filter/FlateDecode>>
stream
0~k?????l5?7,>??˟Xje?.L?K1-?&?[D3?HV???v?`v?WqDNA?i<ZM??MQ?w??+T?f&??NH?xY??D???}@ ?IgҞa?u???D??=DO?H??o?o???y?QY?t???8??kc?yf?????n?Mf|Ezu\&?Oy?j,?=x_)??K0m
endstream
endobj

3 0 obj
186
endobj

4 0 obj
<</Type/XObject
/Subtype/Form
/BBox[ -9 420 604 420.1 ]
/Group<</S/Transparency/CS/DeviceRGB/K true>>
/Length 8
/Filter/FlateDecode
>>
stream
?? ?
ۉ
endstream
endobj

5 0 obj
<</CA 0.5
   /ca 0.5
>>
endobj

7 0 obj
<</Length 8 0 R/Filter/FlateDecode/Length1 19920>>
stream
?G?ˊ?e?Q?Q??0+?3B?7M??M?
_w?;4??L??A??7??µ???s?9OS$<]?ղ?C?܎OYc???R??!6???Ik??u???
                                                        {???????y?v?? )t"?l7?????mk??ۮ??sU#7??3?P??u?U?,?\)??z?J?=?? ??:@?".væ2?凚?????u]??e?(???O??qA?nXs|8?u?@{??,yX?Nc؄a˷????b_K?&??????A2?*(???y????m??N??l?
??ɱX??????V/kytlK?y\k?w?L6Q??C!???[?,???f?:?f?  ?.o?a?
?z?в?????L6QWi???(??:1??mwx?r$??RY??+?T!Á,?-?????K?`۝???|=>???o???TaF?|,N=???N?r?d?B?
TP??͛?Y?ٓV&???]ɐ`"?ㅰ??-?k|2+?sP:??M?O?{??OV?Ԧ??}???????R?
                                     s
?w?j??P?Mw??O?q?|?ѫ?
                    ?
                     |A4?Th???vk*??m???
                                       ??????:*
?޺BO[?8?,??A???X?       ??[????Z?{yCr?~;|M??c?Bø1G?????֡??~??oC??F?q8?e???q??kX?n?T?	??iۙ릚??(	g?J??x??ԋ
?L0??7sx?t~???$?????*???V??CV:?>??a??k?q?s???ܓZ)???Ə?s??̾m:`֗Eέe??t۞??=K0(?j?}??z??4@?`??7?O[Y?,?/W0??b??1Q?B<??
??F?/??3?ŋ?1???᧩???ګKk ^??YT???#.nY??Dg??X????ě????!m???F
                                                         ?Iܙ?wϲO?ĭO?qR?O3??\?2x?>k/FJa?'SuY	4u~?5j?a??i߅𸳋J?΃??{? ??ue?ďj??I????I?e.??O?Ą?UE{?9A??ct?zN_??s????hP?????WM??[(???7?<4Z???z?(???6??ƪB?@?8R?Q?ۨ2y?.!A?
?4?A*7?|?Ղ?_|? ?ڵ?雈?F??6?B>???$??`???P@\????k?܂?
                                                 ?L??0????z?\???????W?IR$~??g?{-o?ҧR?hq??Wk?ic?4"??B4?$ ?X??n??f쐨r?u.??2!?4?H????3?DH???]?ب?'?bw??#??F8?-?ӈ?Ȧ?w?WC????(z?
\?UΠ??q?/???0
             ?1cW?(?&5}??\V?N3??_????@!??~??6QS????????Gtr2??	Z?N??3
                                                                      ?\?*?R????(?????1?%?Z\??4?u?;?z??W?(Ώ??י????9<?3??~??1
??եo??aۇ.?tv<&??-w?oh?ӯ?:??2??)'??1?'?	|?#Sӵ:???6܇?2?A?*?41M??j??b???jAZT??6I5???:ͽ?? ???c??P?
               ???6/{̣S]-?%??/????c1;?j#$#d?	???dm??-7?v????y?~n?tM?p7懑!|?2??4??4F?"?ʌ7?p?֏}.?S?#(
                      N???
                          =<??x0??!?Je???m???ጱ?H?n?P?J(?qTz	??O???OӼ9?լ???(f?K?G@???{??!iB?^_2v?TV28?H?.?X??{????C?F<iх߬7,??r?ц??_S:m??H??_R?3h	?g?lU6?w????U?????v??????Xy!C?n$???
                           ?r????J鮻'???+)*L9S???????/?C?????Xme????x??\?5%"[~'??Dr??%}?Hu_GI?AAO?ճ???k??/?z@??aM?(?Rb??????'%E
                                               Y=??Ī???jRy?PYK????{w]}?P?ك????(?!????31??
         t????T???v?x=???????R?3???-*?nHy??0͓?rQ??ݕZ?n???a?w?j?Ѓ? ??Q?/!u?f]g%?X?t{?=i`?z?C?m]?Sd=?p?%?h?
                        ?\?????e???b٪k~??z7ފ?t?"9????*3??y?Sh?? g???H?k?Y????GP4??z?t?`CQ?瀏??^?Q?u??NJ?c[4?q?ѕ?y?R??'?or?!?%??`L??bc?Q????q?p?d?T?;????w?????]BJ.?Ϥ?sm?U
?v?9o??=({?=??p?fjw????O???????Y???vp?L?~??\֋????i~?$????>???	?կI?w??k|?&V
                                                  ?~R?u?|&?Ba??VV?????G+?E$?kJ?9>?uwOH?D??????a?-8?????p?1?^D7?sz?[?+RSZ=??9?N?Pj?G?{???M4
z???h}?(z?8?8????ތ.?'??'?QR??@??$??$X
???
   ???<??XI??h?s?p<?t????4a?zHE-?{U??)??ԫVtX$f???j?"/??mL}?eܹ#R?C?????B1??d?eo?
                                                                               u+>t>ԃtK?Q????m\????Oɑ1?aN>?/4pnU
                                ;>?*f?<?mZI??b?1@?h??!u?^?|̮?,+ma??00'?z?[???]\?`ZMP"?iA????삑4jE3?u?Tr??p?PR???N?e$~g??p???NGn???S}?q?R??Kk??/~??ڶ?I3??ݤ_:?
                                                                           B?\?N?t>hi??;??jk,g?˴??z?ź!??wf?????Y{{????.?p>o(xnzۨEm~3B???o.????;????	?{3??K?"&/U"?y???U????
              ??dM????U+??.?s?wSͻ@?
                                   ?1&???h?H?[?J7?f???ř?3?x24?8dwg??&???0yJ?C??%;ʍn?or?Mm?	Ðh???Ma,?!???l
y*?x?7?jZ"??<_??z?@??#??H?=?Է?P?W9[?\??????Hn?q=D?ԯ?????5-[???l???{_f??<?t5֮??ܼ???J?]?H|??"?$????n???'????7!,vQ??̊??<
                                  *?^qa?j?]??D<ח??Ą??YF???Eޞ!0?SV??m???p^??0?^??7?҈?`???5f????9M??[???n?z?/??
                             0??<rH????~??	S-04|u??ZL??,???Η7L-?Ǡ??!2??????"?zů?J?]w??????vcU??? ?p???:X핎:W?l?#@j??.??????^????????dN3]G-fO{t?=?j9 H4?Vr?????=??h'$?|?IG??u?;s5???/ʰ?|???6?p???RV?W?g?,??Z{5?zs!o? t+?)?WE?
???*??'ɞ?a??????@_!c????&dǎe"?E??8??oe?????`???o???:?)2??+??q????-?-Hp??ܰn??x!??0?By?ʣfO?tJ???NR?6?bV,vʺ3?
                     ?.n@`?Vs;??B??i???(?G?5???_??Yr?A?????)?K&?٭???;8??????u???P?n6"*6׷??b?bIK?f&???2(?+??f\1?z]?%?Xˠ?H/????E???@P̣?W??7?E??Pn??????8+O???fz?*&??ҟ?€?N?O)$???{d?h?<??ԷZeT???????'???"???S
                                          ?N????-z9??ձ3?'?d91????ҫ?
                                                                   ?oc??D2ՐLB??A?!??a?ȹ?x?h??G?H̟????Q??????2?zҳ?}?$'??????J???4/????@U????d??????^|?n??Aח??S?<???zgyz?_y??w?1?5??????9?Ös??.+o???YK?#???Ԙ???g?YO???
                                                   e??2??v?֧=?????<%?<?f?Yq?9?4;[΄?\?W????1ڜ??:tʅ?0????\???n?L??t?e??????-t??.????d)a???<???ot?]
                                                               ;?BQ&Tށ?gf9?#v͇@??BF8?jf?n?%K?T}x~U?????-5!?c??q+?f?t4ffmA)?#??"?v?-[>???~<Ԯ????r
                                                               ?f?????~??????'???.???M ????bv	??R??*?Ĉ?v_???նN??b?{k??0??BU?a? ?+??!AQ?5=|?A`"??|n?L????My.(????r*???%I"??=-^?M??#??????~?0MǷɩ???E??r???d?P.K???l"?lP]??$?C???J	}
N?????9?lG???l̂?iU7 &?D(l??H???m???W#?̨?+ۙJ?y:7?@?|W}?a???tyh??Z????a??z?)?????m?4%?7?ҵZ؅?K??X?~ӧ?????????ѵ???53*9د?׉
D*?7#k?w)?ɫR?
?????o'?w'x??;x??5????/??أAD2??P??????#LZ?.??Pé?24???^:?Ҫ???V?ۍ??-yg??o???$??
/?|S\?9T???9_????Z???ȱ!p?tU??F?!˴E??X?cIU?%x???3??YX:w?0???w?W?2
                                                                *
                                                                 ?ӣ??'?'`??${????i0?BJ?_?Ld?yY??????	?[?Qކx(\֘6??"?P%?*???-??h??n???>???????5.3??9???=??O??F%?C(ヮ??m??EN?UuP%co??:?Jyӹ??8??U???y,ZU????`?;????˝^#wb:iͰ?bQ?	?n??۩?X?0??#i?o?.?A??6B!??ߏ%??s???nݵ?y8?,?jk?|??{?V?<?ַ?ߊ?.??`@vV҂??"j??G?P?b?nt?փ????#?&H??.?G?hD??ƨ"??%?%????G3???{?w7??ݓG'?
                              ?w?????Ib`?Y?:?&Vmr??siX????n??_???4jy??KE*?ΘRx?x?;#23d$5??p+2"?\?<=$ɧ?YG???_M%??eB|JLBiւ?6?C՝?TvV_?r???s?ڤL?ò\[????|ml?	???c??3??????m?'"?>?{vԙ
               ?L??Ju2?b?`?i?f?<??`_??^?aU??ت?!?K??W`??@?D	?O?~??P~???gT????ne?o?璄???>??{$??tvj?s?#7?K?&6?֥?j??ݎ?x?&oc?/?r????%????p>G?%?H*&????4?!QC???Ϩ??dE???>Q?!?TSAJ\?bt??\ ?q8?!??Ԍ???d??*
??(l?Y?*??uS?]F)???+???????ߊײqI[?w??ZE?I38WNY??xs???Ĕ|??]IU8.7??/????????i?Ј??	Yxwh???Q?bYЄ?y???H}?O???Nځ??׻`???? ???V?
??ILF??G:;#F6&?v*?GW<??AH??o0??2a?????S)T????|KU???T	7?z????¶uI??NJr???ܬ?"=??B?q??R.?
          f??q?1?1?	?????>$|?.?ju?s`p?qS?Ց	?n?e????Nv:?˵????,?
                                                                   =\??%????X?˄?Q???Ǎ??WtՐ??w??|????-8f4??޺?|??{i?WA)?????+'??'?@:Mׁ??9Qou?'?S5eD?T7???A???mdv??"?p?rOhF?$I?߫2?%Y`??????auy?͗*T?G>?????]?d0?Y4>8]??e??CX????H?ؑY?Ԕ??3?;?|??vM??z???骛???u???ܳ?A4?????h??e?ћȉ?????j????(Wd???iBQP? D???疷???Ջ???C\5?/Av?fp???o@??????oD$???7???Xu?+
              톱X?Q?;\Q????[??ا?ؗ?w
v?xS??`?%?o???4??ZD?2?fc??.?Dz???Uo?^>?&??u??H?ڣ??&
                                                   ~?????=z?gGT??b???s<'??m?kx?R?#y?6?????FP4<??A?h??,??{1??DgEpF???	??u&???nv޽6????l7?UOt?*?e???Wq??^??+Wz??1?m?(\ZB?v=t/M(??$?_?5??L~?????-D\RV?}ܒ??4??
??
?!???w(Ƀ????:7?2{G??(?f??,M????0?rjKGX܄0U?}???Ӌ?3?l?p?w
                                                       ?=e6???2fR?"+h
                                                                     KP?'??]&(???v?@l???rx?vhRrc?T%??E޼k??+???6?Ri>:g????3??????_V??fX?????l?אָ%???$1?
"2???5GJ??O6???1?Ow???
hQH??)e4???=\?L?/?!A?=?^?$??e?????r>ka?O?j3?)?????eA?۸???!?/?]o?b?G?C#nk??1Lb?X??h???????8&?q?q!
?o??Y9( ?H@?!\?r ?G????+
                    .0߃+???-?3$i???D?A??2h??v?`?-?{?'2?XGr???H!uqy^cd?c?????*H6ڃ3?3???I?
        ??'/M ?Q??K????*
                         ?
8?l?Ţ????q<˟y??(??x???r?l??
??SA?|z9?g/8Mf?k&??*:?Wk?????B??N????ۇ^?H?\0r??\????Ǡ????!R??6_?	$?3YY'm??R?`b?e??g:?ud?_???9~???*?hHߡ???5??AOO?4??Mp?u?2h??^?{baT????S?"b????k?l??????sp?`yO?.*?s?0??q?7?5߅Fl?`m??<?ͅ?Mi????T??G?????%vG}?5ͧ????x??}@%???gSvlݍ?#.?? ?lid??4T?+?????????V?.???Z??	!???s??F6
Y
 ?1??}
?m?aq?/@?X;G?a?6m?p?UfqZ?I?L?'S???%??9???7?NN??p?A$mJ?X???2ͩ??l?{*??G̫???Ȟ
                                                        ???H??H?qQ???Ck<y?j??;
                                                                              Q9?s????z!]չmaL??1?k??Ȳ????x?1?D?}?5?? ????????]u???!O?P?8M??2?P???9(C?!?[pJ??ɒs?e?<?V??v?E?6'??U?$?F?V?P;??j?~???'V?ud?oq???b???rq????'?N?Г8{ҥ?0?Q\ނOm?'?=O?j#??'?????-*䫦??9?%X??????????kS㘝$$?Q?Ƽ??!̈?Qzf??ј???KQ?J1?????r?o?ք?nKy?5~??Yޔ??M?v???x??a<??]?S?0?}a?u?:]~K3?rhy?*V??aj?v2T?[??????M?S?????tD6?Kkw????߄r
                                                                     P"????k??b?Q{???????Z??
p??0?7?????5Q?Bӎ?:j??>)?r???9
                             ? ???˶?x?T_z?|N???kUK?i?s?nG?jp???!?@7}????nO?????v:&?3gNv?L?,zd??E?k?&wy??ي????|?????????7????
?s?????U?????V??Tw+\Ҧ*??zѐ?+?3??@3X???(?tS??R?s??/?Iч?f?jS۔?
                                                            n??{??h?/??Ȫ	???+&F?D҈??M?D;?^8??TP????+?????|2?S??{??2E??)??^skcx?f??U?EB]]:?P?pf??}?𹌱q%?ns?_F[?qFғ[y0Y??gGO???)kZi?}N]???H??ej)??:̙?&I???9?i?i!?_?poG?2r?*Y?u??$Ȍ׹YRǉ???T?O???&%>?ӄ?0Ԑ0(0O?c?B	???s??G]?7<FŇ9tczܖ??]??㼈?N	?????%??Hξ??????+CRQ?l?IFI?%g}{nb?8?!?P?????w???ؾ!+Мn???)????u?&?EƬ??0?owT?}?ƴD?]?Q?[?|(b??X?c??vW-??R?>0x?g??ƐJ?/1?#?w?Q??N?K:???5?~????dGo?	ć??$??O?R';4??AMb???'A_;??K?^&?*?Fi"?\??yV?;K$[???>??/Q?E-??W?u;<P3|9Y?C?r??:?1?:;$*݄?Ѯ????_ِc????3??gr???@??:??1???
?!?P_܁x#SC`?=@U?Irj???ǒ?8-z???;??b
?$+??sh???e.#݄
.%3??P?ǽ|gg?J??-`?z]???z)h}G/???W? ?q?G?':??
                       &1??
                           ?dq??r?pc?ƁnR??1M
                                            ?????7r<?%W?T?????l?) ?/ʘWv???6??ܹ??\u?x?;'???? ~_ȓݳ?2DƟ4???@??l=Z????/:v??2???x???ڌ@??[n??"???(~-)?x#f??\???p?'~??wv#3?ɱ??(??d?%
??K?֔n????J?:=r????&??Qz??3?9?{?????*P???`m??1?
????l>?L??1?s??W??_?}cS?Mp?N/<k?hVuJ?ZR????+????O?xݲxH?G??@?Z.?t?t|/?4?OX9??%H??ܭ??ԟ?????~?\???Ty???֩e????O??i‘??P??v?a????棱?l-lR??\???*?
                                                         rI??԰??:F?C???k;??4{Қ?Q?|???D
       ???0??%U?E???*2???94???/??Sp???H$?༈?@[q??#D??:?
endstream
endobj

8 0 obj
11872
endobj

9 0 obj
<</Type/FontDescriptor/FontName/BAAAAA+CourierNewPSMT
/Flags 5
/FontBBox[-121 -679 622 1021]/ItalicAngle 0
/Ascent 832
/Descent -300
/CapHeight 1020
/StemV 80
/FontFile2 7 0 R
>>
endobj

10 0 obj
<</Length 314/Filter/FlateDecode>>
stream
1??E?2q!?5??Μ?Ȣ??? Q???Lx}z?3????c?E?Gm+6T?#?????U???g?Kߨ?[̽M?;İ??ϩl??g?@?7?zU>|???p?;??(r,6??vL?rj????5?~>
                          ?U͹?y%??w['?~
                                       DR??敠??|3?????Eܟ&Ҁ?"N3???I΅?j?/??y?t????
礌mP??2ن?? Av???֍??)???????V]?=?C?H?nmv???
t??"?                                     L'^??
     y???_??b?~??N?-3?J?Xih4>??M????	
endstream
endobj

11 0 obj
<</Type/Font/Subtype/TrueType/BaseFont/BAAAAA+CourierNewPSMT
/FirstChar 0
/LastChar 20
/Widths[600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600
600 600 600 600 600 ]
/FontDescriptor 9 0 R
/ToUnicode 10 0 R
>>
endobj

12 0 obj
<</F1 11 0 R
>>
endobj

13 0 obj
<</Font 12 0 R
/XObject<</Tr4 4 0 R>>
/ExtGState<</EGS5 5 0 R>>
/ProcSet[/PDF/Text/ImageC/ImageI/ImageB]
>>
endobj

1 0 obj
<</Type/Page/Parent 6 0 R/Resources 13 0 R/MediaBox[0 0 595 842]/Group<</S/Transparency/CS/DeviceRGB/I true>>/Contents 2 0 R>>
endobj

6 0 obj
<</Type/Pages
/Resources 13 0 R
/MediaBox[ 0 0 595 842 ]
/Kids[ 1 0 R ]
/Count 1>>
endobj

14 0 obj
<</Type/Catalog/Pages 6 0 R
/OpenAction[1 0 R /XYZ null null 0]
/Lang(J?@n?)
>>
endobj

15 0 obj
<</Creator<D79C55D597C05122BBA77C6422F8>
/Producer<D79C55CE97DB5129BBA17C6422C5663ECCB5C3497D5DCB00ABD3B22A86C149D3>
/CreationDate(mYg???as??M9?Vk???M?)>>
endobj

16 0 obj
<</Filter/Standard/V 2/Length 128/R 3/O(?|A:m?p!S?3?Gх??H???ΧW;?T?\b)/U(??<[?NVc?п??}?)/P -1028>>
endobj

xref
0 17
0000000000 65535 f 
0000013470 00000 n 
0000000019 00000 n 
0000000276 00000 n 
0000000296 00000 n 
0000000473 00000 n 
0000013613 00000 n 
0000000513 00000 n 
0000012470 00000 n 
0000012492 00000 n 
0000012687 00000 n 
0000013071 00000 n 
0000013312 00000 n 
0000013345 00000 n 
0000013712 00000 n 
0000013809 00000 n 
0000013984 00000 n 
trailer
<</Size 17/Root 14 0 R
/Encrypt 16 0 R
/Info 15 0 R
/ID [ <52A9A94A6311847A966B5621D77A4DD3>
<52A9A94A6311847A966B5621D77A4DD3> ]
/DocChecksum /4A8590018ADCF5BB4BA4541CAACB1A4E
>>
startxref
14122
%%EOF",
"hello": "world"
}
POST test/_refresh
GET test/_search
{
"query": {
"match": {
"hello": "world"
}
}
}
```
Closes #149 .
2015-08-24 16:21:30 +02:00
b0567d7c18
[build] Update to elasticsearch 2.0.0
...
Fix compiling issues.
Also fix test issues.
Need now to move old integration tests to RESTIT
Closes #148 .
2015-08-24 16:21:21 +02:00
5af2a4d63d
[build] Update to elasticsearch 2.0.0
...
We need to define `<elasticsearch.version>` in `pom.xml` as we now inherit from elasticsearch project parent pom.
But `elasticsearch.version` is set by default to `project.version` which is here `3.0.0-SNAPSHOT` for the mapper project.
Related to #148
2015-08-19 10:24:09 +02:00
560a761b2f
Update to Tika 1.10
...
Release 1.10 - 8/1/2015
* Tika Config XML can now be used to create composite detectors,
and exclude detectors that DefaultDetector would otherwise
have used. This brings support in-line with Parsers. (TIKA-1702)
* Reverted to legacy sort order of parsers that was
mistakenly reversed in Tika 1.9 (TIKA-1689).
* Upgrade to POI 3.13-beta1 (TIKA-1667).
* Upgrade to PDFBox 1.8.10 (TIKA-1588).
* MimeTypes now tries to find a registered type with and
without parameters (TIKA-1692).
* Added more robust error handling for encoding detection
of .MSG files (TIKA-1238).
* Fixed bug in Tika's use of the Jackcess parser that
prevented reading of v97 Access files (TIKA-1681).
* Upgrade xerial.org's sqlite-jdbc to 3.8.10.1. NOTE:
as of Tika 1.9, this jar is "provided." Make sure
to upgrade your provided jar! (TIKA-1687).
* Add header/footer extraction to xls (via Aeham Abushwashi)
(TIKA-1400).
* Drop the source file name from the embedded file path in
RecursiveParserWrapper's "X-TIKA:embedded_resource_path"
(TIKA-1673).
* Upgraded to Java 7 (TIKA-1536).
* Non-standards compliant emails are now correctly detected
as message/rfc822 (TIKA-1602).
* Added parser for MS Access files via Jackcess. Many thanks
to Health Market Science, Brian O'Neill and James Ahlborn
for relicensing Jackcess to Apache v2! (TIKA-1601)
* GDALParser now correctly sets "nitf" as a supported
MediaType (TIKA-1664).
* Added DigestingParser to calculate digest hashes
and record them in metadata. Integrated with
tika-app and tika-server (TIKA-1663).
* Fixed ZipContainerDetector to detect all IPA files
(TIKA-1659).
Closes #147 .
2015-08-19 10:14:33 +02:00
7f1926dcbf
Changed 1.x version to 1.7
2015-07-17 17:36:57 +02:00
07b475bb48
update documentation with release 2.7.0
2015-07-17 15:11:40 +02:00
da4f00dde1
improve doc tests, exposes a previously existing problem with encrypted
...
pdfs that was hidden
2015-07-07 13:37:07 -07:00
8f3ccff057
fix jarhell
2015-07-07 13:36:43 -07:00
8c84f5a704
Fix compile
2015-07-07 07:54:33 -07:00
1e84dbd32b
Merge pull request #140 from rmuir/tika19
...
Upgrade tika to 1.9
2015-06-23 19:06:34 -04:00
4d22f92608
Upgrade tika to 1.9. Closes #129
2015-06-23 17:41:42 -04:00
91caf3cf3b
update documentation with release 2.6.0
2015-06-11 13:22:53 +02:00
06d84cd502
Create branch es-1.6
2015-06-11 13:13:09 +02:00
f743ebb87f
Fix compile errors after elasticsearch-core master refactorings and multi-module builds
2015-06-08 11:46:06 +02:00
cf97e14ff0
mark slow tests
2015-05-27 20:33:26 -04:00
bac187c4dc
fix forbidden api usage
2015-05-26 09:54:31 -04:00
2da374f39d
Absorb ImmutableSettings into Settings; fix other pre-existing compilation issues, but there are still forbidden API failures
2015-05-26 09:25:44 -04:00
7263437ca5
remove logging properties
2015-05-22 09:33:32 -04:00
2d3ab9500b
remove tabs
2015-05-22 00:34:36 -04:00
95de2e0a5e
switch to plugin pom
2015-05-21 22:56:06 -04:00
4e693efced
remove duplicate test config
2015-05-21 16:52:37 -04:00
3fd216bc60
engage forbidden apis
2015-05-21 10:37:37 -04:00
d8e595b76a
Fix attachment mapper tests to pass id through api instead of _id in a document
2015-05-13 17:05:33 -07:00
9298be93f6
disable securitymanager in tests, until #129 is addressed in tika
2015-05-12 07:38:55 -04:00
765afb655e
Fix attachment mapper to expose subfields.
...
The content mapper is now true subfield. There is limited backcompat
support for the previous behavior of indexing and querying as the main
field name. While indexes pre ES 2.0 can still be read, the content
must now be queried with `FIELDNAME.content`.
2015-05-11 23:21:40 -07:00
1c030f6f75
Update to Tika 1.8
...
Tika 1.8 has been released. See https://dist.apache.org/repos/dist/release/tika/CHANGES-1.8.txt
We can replace:
```java
public static boolean isLocaleCompatible() {
String language = Locale.getDefault().getLanguage();
boolean acceptedLocale = true;
if (
// We can have issues with JDK7 Patch < 80
(JVM_MAJOR_VERSION == 1 && JVM_MINOR_VERSION == 7 && JVM_PATCH_MAJOR_VERSION == 0 && JVM_PATCH_MINOR_VERSION < 80) ||
// We can have issues with JDK8 Patch < 40
(JVM_MAJOR_VERSION == 1 && JVM_MINOR_VERSION == 8 && JVM_PATCH_MAJOR_VERSION == 0 && JVM_PATCH_MINOR_VERSION < 40)
) {
if (language.equalsIgnoreCase("tr") || language.equalsIgnoreCase("az")) {
acceptedLocale = false;
}
}
return acceptedLocale;
}
```
by
```java
public static boolean isLocaleCompatible() {
return true;
}
```
Related to https://issues.apache.org/jira/browse/TIKA-1526 and #105
Note that Content-type has changed a bit and now returns something like `application/xhtml+xml; charset=ISO-8859-1` instead of `application/xhtml+xml`.
Closes #112 .
(cherry picked from commit bf4af47971ed07bfa126409413c435f121444c3c)
2015-05-07 10:17:59 +02:00
2f457111f9
Merge pull request #128 from elastic/get_past_mapping_changes
...
Fix the build and try to migrate past mappings changes
2015-05-05 15:10:39 -07:00
a83f98d018
fix standalone and remove unecessary override
2015-05-05 15:08:30 -07:00
7ce86d95fe
Fix the build and try to migrate past mappings changes, but there
...
is an @AwaitsFix test remaining with regards to copyTo behavior.
2015-05-05 13:43:31 -04:00
65a83e63d3
Mappings: Simplified mapper lookups
...
Due to https://github.com/elastic/elasticsearch/pull/10705
We need to adapt the mapper attachment plugin to version 2.0.0
Closes #125 .
2015-04-25 16:29:35 +02:00
7e2a9dbf0c
update documentation with release 2.5.0
2015-03-31 17:59:01 +02:00
d2c02b19fc
Don't wrap exceptions in `MapperParsingException`
...
Some exceptions might not be serializable. It would be safer not to wrap them in a `MapperParsingException` but just create the `MapperParsingException`.
Related to #113 .
(cherry picked from commit e58878c)
(cherry picked from commit a673185)
2015-03-31 14:41:47 +02:00
cbad7dce76
Cleanup: Remove unsafe field in BytesStreamInput
...
Related to https://github.com/elastic/elasticsearch/pull/10157
BytesStreamInput does not support anymore `BytesStreamInput(byte[], boolean)`
Closes #120 .
2015-03-30 15:00:50 +02:00
3154510fad
Update owner to elastic
...
Fix typo in previous commit
(cherry picked from commit 5303bc0)
(cherry picked from commit d3dab9b)
(cherry picked from commit 3ace2bb)
2015-03-30 14:53:58 +02:00
51da1fe2a1
parse java.specification.version not java.version, so that it is robust
2015-03-30 14:50:18 +02:00
d20c8861ca
Update owner to elastic
...
(cherry picked from commit c4d60ed)
(cherry picked from commit 450d088)
2015-03-30 11:36:10 +02:00
9f6519f84a
Move parent after artifact coordinates
2015-03-30 11:35:54 +02:00
021483626c
Merge pull request #117 from rmuir/exclude-jhighlight
...
Exclude jhighlight dependency, which contains LGPL-only files
2015-03-20 14:55:00 -04:00
977a7247c7
Exclude jhighlight dependency, which contains LGPL-only files
2015-03-20 14:42:55 -04:00
David Pilato
Clinton Gormley
Tanguy Leroux
Ryan Ernst
Robert Muir
Robert Muir
Simon Willnauer
Michael McCandless