Skip to content

Commit

Permalink
Merge branch 'master' into 1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
vaites committed May 28, 2024
2 parents 11b9404 + 9d7d13a commit 64a3586
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ jobs:
- '2.6.0'
- '2.7.0'
- '2.8.0'
- '2.9.0'
- '2.9.1'
- '2.9.2'

name: PHP ${{ matrix.php }} - TIKA ${{ matrix.tika }}

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## v1.3.1

* Fixed remote file download (thanks to @denistorresan)
* Tested up to Apache Tika 1.28.5 and 2.9.2

## v1.3.0

* Added `WebClient::setFetcherName()` to easily set the [fetcher name](https://cwiki.apache.org/confluence/display/TIKA/tika-pipes) (thanks to @relthyg)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ to work with the new versions of the tool.
* Support for local and remote resources
* No heavyweight library dependencies
* Compatible with Apache Tika 1.15 or greater
* Tested up to 1.28.5 and 2.8.0
* Tested up to 1.28.5 and 2.9.2
* Works on Linux, macOS, Windows and probably on FreeBSD

## Requirements
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
"supported-versions": [
"1.15", "1.16", "1.17", "1.18", "1.19", "1.19.1", "1.20", "1.21", "1.22", "1.23", "1.24", "1.24.1",
"1.25", "1.26", "1.27", "1.28", "1.28.1", "1.28.2", "1.28.3", "1.28.4", "1.28.5",
"2.0.0", "2.1.0", "2.2.0", "2.2.1", "2.3.0", "2.4.0", "2.5.0", "2.6.0", "2.7.0", "2.8.0"
"2.0.0", "2.1.0", "2.2.0", "2.2.1", "2.3.0", "2.4.0", "2.5.0", "2.6.0", "2.7.0", "2.8.0",
"2.9.0", "2.9.1", "2.9.2"
]
},
"scripts": {
Expand Down

0 comments on commit 64a3586

Please sign in to comment.