Skip to content

Commit 592da83

Browse files
authored
Merge branch 'main' into rest-api-spec-docs-url
2 parents ed6d2cb + 7519de6 commit 592da83

File tree

43 files changed

+1975
-308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1975
-308
lines changed

docs/changelog/133245.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 133245
2+
summary: Add query heads priority to `SliceQueue`
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/133347.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 133347
2+
summary: Force rollover on write to true when data stream indices list is empty
3+
area: Data streams
4+
type: bug
5+
issues:
6+
- 133176

docs/changelog/133410.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 133410
2+
summary: Upgrading to tika 3.2.2
3+
area: Ingest Node
4+
type: upgrade
5+
issues: []

docs/reference/query-languages/query-dsl/full-text-filter-tutorial.md

Lines changed: 574 additions & 0 deletions
Large diffs are not rendered by default.

docs/reference/query-languages/querydsl.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ mapped_pages:
66
# QueryDSL [query-dsl]
77

88
:::{note}
9-
This section provides detailed **reference information**.
10-
119
Refer to the [Query DSL overview](docs-content://explore-analyze/query-filter/languages/querydsl.md) in the **Explore and analyze** section for overview and conceptual information about Query DSL.
1210
:::
1311

docs/reference/query-languages/toc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ toc:
22
- file: index.md
33
- file: querydsl.md
44
children:
5+
- file: query-dsl/full-text-filter-tutorial.md
56
- file: query-dsl/query-filter-context.md
67
- file: query-dsl/compound-queries.md
78
children:

gradle/verification-metadata.xml

Lines changed: 88 additions & 88 deletions
Large diffs are not rendered by default.

modules/ingest-attachment/build.gradle

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ esplugin {
1919
// when updating tika, please review it's parent pom : https://repo1.maven.org/maven2/org/apache/tika/tika-parent
2020
// and manually update the transitive dependencies here
2121
def versions = [
22-
'tika' : '2.9.3',
23-
'pdfbox': '2.0.33',
24-
'poi' : '5.4.0',
22+
'tika' : '3.2.2',
23+
'pdfbox': '3.0.5',
24+
'poi' : '5.4.1',
2525
'sparsebitset' : '1.3', //poi dependency: https://repo1.maven.org/maven2/org/apache/poi/poi/
26-
'mime4j': '0.8.12',
27-
'commonsCodec': '1.18.0',
28-
'slf4' : '2.0.16',
26+
'mime4j': '0.8.13',
27+
'commonsCodec': '1.19.0',
28+
'slf4' : '2.0.17',
2929
'xz' : '1.10',
30-
'commonsIo' : '2.18.0',
30+
'commonsIo' : '2.20.0',
3131
//intentionally using the elder "juniversalchardet:juniversalchardet" rather than the newer "com.github.albfernandez:juniversalchardet"
3232
//since the "com.github.albfernandez" fork has some problems with Chinese.
3333
'juniversalchardet' : '1.0.3',
34-
'tagsoup' : '1.2.1',
34+
'jsoup' : '1.21.1',
3535
'jempbox' : '1.8.17',
3636
'xmlbeans' : '5.3.0', //poi-ooxml dependency: https://repo1.maven.org/maven2/org/apache/poi/poi-ooxml/
37-
'commonsCollections4' : '4.4',
38-
'commonsCompress' : '1.27.1',
39-
'commonsLang3' :'3.17.0',
37+
'commonsCollections4' : '4.5.0',
38+
'commonsCompress' : '1.28.0',
39+
'commonsLang3' :'3.18.0',
4040
'commonsMath3' : '3.6.1'
4141
]
4242

@@ -86,9 +86,10 @@ dependencies {
8686

8787
// external parser libraries
8888
// HTML
89-
api "org.ccil.cowan.tagsoup:tagsoup:${versions.tagsoup}"
89+
api "org.jsoup:jsoup:${versions.jsoup}"
9090
// Adobe PDF
9191
api "org.apache.pdfbox:pdfbox:${versions.pdfbox}"
92+
api "org.apache.pdfbox:pdfbox-io:${versions.pdfbox}"
9293
api "org.apache.pdfbox:fontbox:${versions.pdfbox}"
9394
api "org.apache.pdfbox:jempbox:${versions.jempbox}"
9495
// OpenOffice
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License
2+
3+
Copyright (c) 2009-2025 Jonathan Hedley <https://jsoup.org/>
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

0 commit comments

Comments
 (0)