From df9cf052dc521c8aaf65f55a4cbcc8b957091213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20K=C3=A4hm?= Date: Fri, 27 Aug 2021 14:23:33 +0200 Subject: [PATCH] Release 10.0.0 # Apache Solr for TYPO3 - Tika Addon version 10.0.0 We are happy to release version 10.0.0 of EXT:tika. The focus of this release was the support of TYPO3s PSR-18 client. **Important**: This version is compatible with 10 LTS only. # Please read the release notes before updating: https://github.com/TYPO3-Solr/ext-tika/releases/tag/10.0.0 --- # How to Get Involved There are many ways to get involved with Apache Solr for TYPO3: * Submit bug reports and feature requests on [GitHub](https://github.com/TYPO3-Solr/ext-solr) * Ask or help or answer questions in our [Slack channel](https://typo3.slack.com/messages/ext-solr/) * Provide patches through Pull Request or review and comment on existing [Pull Requests](https://github.com/TYPO3-Solr/ext-solr/pulls) * Go to [www.typo3-solr.com](http://www.typo3-solr.com) or call [dkd](http://www.dkd.de) to sponsor the ongoing development of Apache Solr for TYPO3 Support us by becoming an EB partner: http://www.typo3-solr.com/en/contact/ or call: +49 (0)69 - 2475218 0 --- .github/ISSUE_TEMPLATE/bug_report.md | 8 +- .github/workflows/ci.yml | 86 ++++++++++++++---- Documentation/Index.rst | 2 +- Documentation/Releases/10_0.rst | 131 +++++++++++++++++++++++++++ Documentation/Settings.cfg | 4 +- Documentation/Settings.yml | 4 +- Documentation/conf.py | 6 +- composer.json | 3 +- ext_conf_template.txt | 1 - 9 files changed, 214 insertions(+), 31 deletions(-) create mode 100644 Documentation/Releases/10_0.rst diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 3539f6617..430371b00 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -28,11 +28,11 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Used versions (please complete the following information):** - - TYPO3 Version: [e.g. 10.4.13] + - TYPO3 Version: [e.g. 10.4.20] - Browser: [e.g. chrome, safari] - - EXT:solr Version: [e.g. 11.0.2] - - EXT:tika Version: [e.g. 6.1.0] - - Used Apache Solr Version: [e.g. 8.8.0] + - EXT:solr Version: [e.g. 11.1.1] + - EXT:tika Version: [e.g. 10.0.0] + - Used Apache Solr Version: [e.g. 8.9.0] - PHP Version: [e.g. 7.4.0] - MySQL Version: [e.g. 8.0.0] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34b3019bd..6374a361d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,8 @@ name: EXT:tika Github Actions on: push: branches: [ master ] + tags: + - "**" pull_request: branches: [ master ] @@ -35,45 +37,44 @@ jobs: name: TYPO3 ${{ matrix.TYPO3 }} on PHP ${{ matrix.PHP }} steps: - - - name: Checkout current state + - name: Checkout current state uses: actions/checkout@v2 - - - name: Cache Apache Tika Binaries + + - name: Cache Apache Tika Binaries id: tika-bineries uses: actions/cache@v2 with: path: $TIKA_PATH key: tika-bineries - - - name: Mount RAMFS + + - name: Mount RAMFS run: | id sudo mkdir /ramfs sudo mount -t tmpfs -o size=2048m none /ramfs sudo mkdir -p /ramfs/data-{solr,mysql,build} && sudo chown $USER /ramfs/data-* && sudo chown 8983:8983 /ramfs/data-solr - - - name: Setup PHP + + - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.PHP }} coverage: xdebug tools: composer:v2 - - - name: CI-Bootstrap + + - name: CI-Bootstrap run: | echo "CI_BUILD_DIRECTORY=$CI_BUILD_DIRECTORY/" cp -r ../ext-tika $CI_BUILD_DIRECTORY/. cd $CI_BUILD_DIRECTORY/ext-tika ./Build/Test/bootstrap.sh --skip-solr-install --skip-tika-server-install echo "Current Size of EXT:tika build Artefacts: " && du -sh $CI_BUILD_DIRECTORY/ext-tika - - - name: Build ext-solr docker image + + - name: Build ext-solr docker image run: | cd $CI_BUILD_DIRECTORY/ext-tika docker build -t $LOCAL_IMAGE_NAME -f .Build/Web/typo3conf/ext/solr/Docker/SolrServer/Dockerfile .Build/Web/typo3conf/ext/solr/ - - - name: 'Start Docker: Solr, Tika, MySQL' + + - name: 'Start Docker: Solr, Tika, MySQL' run: | docker run --name "MySQL-CI" -v /ramfs/data-mysql:/var/lib/mysql -p 3306:3306 \ -e MYSQL_DATABASE=$TYPO3_DATABASE_NAME \ @@ -84,9 +85,62 @@ jobs: docker run --rm --name="$LOCAL_CONTAINER_NAME" -d -p 127.0.0.1:8983:8983 -v "$LOCAL_VOLUME_NAME":"/var/solr" "$LOCAL_IMAGE_NAME" docker run -d -p 9998:9998 apache/tika:$TIKA_VERSION"-full" docker ps - - - name: CI-Build + + - name: CI-Build run: | cd $CI_BUILD_DIRECTORY/ext-tika ./Build/Test/cibuild.sh echo "Current Size of EXT:tika build Artefacts: " && du -sh $CI_BUILD_DIRECTORY/ && du -sh $CI_BUILD_DIRECTORY/ext-tika/.Build/* + + - name: Upload code coverage to Scrutinizer + run: | + cd $CI_BUILD_DIRECTORY/ext-tika + mkdir -p $GITHUB_WORKSPACE/bin + wget https://scrutinizer-ci.com/ocular.phar -O $GITHUB_WORKSPACE/bin/ocular && chmod +x $GITHUB_WORKSPACE/bin/ocular + php $GITHUB_WORKSPACE/bin/ocular code-coverage:upload --format=php-clover coverage.unit.clover + php $GITHUB_WORKSPACE/bin/ocular code-coverage:upload --format=php-clover coverage.integration.clover + + publish: + name: Publish new version to TER + needs: tests + if: startsWith(github.ref, 'refs/tags/') + runs-on: ubuntu-20.04 + env: + TYPO3_API_TOKEN: ${{ secrets.TYPO3_API_TOKEN }} + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Check tag + run: | + if ! [[ ${{ github.ref }} =~ ^refs/tags/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$ ]]; then + exit 1 + fi + - name: Get version + id: get-version + run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//} + + - name: Get comment + id: get-comment + run: | + readonly local comment=$(git tag -n10 -l ${{ steps.get-version.outputs.version }} | sed "s/^[0-9.]*[ ]*//g") + if [[ -z "${comment// }" ]]; then + echo ::set-output name=comment::Released version ${{ steps.get-version.outputs.version }} of tailor_ext + else + echo ::set-output name=comment::$comment + fi + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 7.4 + extensions: intl, mbstring, json, zip, curl + tools: composer:v2 + + - name: Install tailor + run: composer global require typo3/tailor --prefer-dist --no-progress + + - name: Publish EXT:tika to TER + run: php ~/.composer/vendor/bin/tailor ter:publish --comment "${{ steps.get-comment.outputs.comment }}" ${{ steps.get-version.outputs.version }} + + diff --git a/Documentation/Index.rst b/Documentation/Index.rst index ca42a2766..b6198573a 100644 --- a/Documentation/Index.rst +++ b/Documentation/Index.rst @@ -18,7 +18,7 @@ Apache Tika for TYPO3 tika :Version: - 6.1.0 + 10.0.0 :Language: en diff --git a/Documentation/Releases/10_0.rst b/Documentation/Releases/10_0.rst new file mode 100644 index 000000000..6f7b0955a --- /dev/null +++ b/Documentation/Releases/10_0.rst @@ -0,0 +1,131 @@ +========================================================== +Apache Solr for TYPO3 - Tika Addon version 10.0.0 released +========================================================== + +We are happy to announce version 10.0.0 of EXT:tika. + +**Important**: This version is compatible with 10 LTS only. + + +New in this Release +------------------- + +[TASK] Introduce TYPO3 PSR-18 client (#156) +=========================================== + + https://github.com/TYPO3-Solr/ext-tika/pull/156 + https://github.com/TYPO3-Solr/ext-tika/issues/154 + +The implementation to fetch website content based on the stream context and +method 'file_get_content()' is removed. Instead the TYPO3 build in +HTTP client is in use to access the Tika server. This client supports +PSR-18 and allows to use proxy information configured in TYPO3. + +Internally the string representation replaced by the URI interface. +This allows an easier and better way to handle server URIs. + +Replace use of general exception with BadResponseException. +Log exception in case it should not thrown. + +* Reduce log warnings while building supported mime types. +* Refactor unit and integration tests according to internal changes. +* Switch log severity from integer to LogLevel constants. +* Several code changes to method declaration. + +[TASK] Refactor logging (#161) +============================== + + https://github.com/TYPO3-Solr/ext-tika/pull/161 + https://github.com/TYPO3-Solr/ext-tika/issues/137 + https://github.com/TYPO3-Solr/ext-tika/issues/160 + +Use LoggerAwareInterface and LoggerAwareTrait instead of setup logging over the log manager. + +Replace log severity numbers with LogLevel constants. Set default level to debug. + +Unit tests: + +- Inject instance of NullLogger due changes to the logging behaviour. +- Access environment variables for unit and integration tests + in order to allow different testing environments. + +Contributors +------------ + +* Lars Tode +* Markus Friedrich +* Rafael Kähm + +Thanks to everyone who helped in creating this release! + +Also a big thanks to our partners that have joined the EB2021 program: + +* +Pluswerk AG +* 711media websolutions GmbH +* Abt Sportsline GmbH +* ACO Severin Ahlmann GmbH & Co. KG +* AVM Computersysteme Vertriebs GmbH +* cosmoblonde GmbH +* creativ clicks GmbH +* cron IT GmbH +* CS2 AG +* CW Media & Systems +* Earlybird GmbH & Co KG +* FLOWSITE GmbH +* form4 GmbH & Co. KG +* Getdesigned GmbH +* Granpasso Digital Strategy GmbH +* Ikanos GmbH +* internezzo ag +* Intersim AG +* Ion2s GmbH +* Leitgab Gernot +* mellowmessage GmbH +* Moselwal Digitalagentur UG (haftungsbeschränkt) +* network.publishing Möller-Westbunk GmbH +* OST Ostschweizer Fachhochschule +* Plan.Net Suisse AG +* Provitex GmbH +* punkt.de GmbH +* queo GmbH +* Rechnungshof +* Schoene neue kinder GmbH +* SIT GmbH +* SIZ GmbH +* Stämpfli AG +* Triplesense Reply Frankfurt +* TWT reality bytes GmbH +* visol digitale Dienstleistungen GmbH +* Web Commerce GmbH +* webconsulting business services gmbh +* webschuppen GmbH +* Webstobe GmbH +* Webtech AG +* wow! solution +* XIMA MEDIA GmbH +* Bundesanstalt Statistik Österreich +* ECOS TECHNOLOGY GMBH +* Fachhochschule Erfurt +* Hochschule Furtwangen - IMZ Online-Services +* Hochschule Niederrhein University of Applied Sciences +* l'Autorité des marchés financiers +* La Financière agricole du Québec +* LfdA - Labor für digitale Angelegenheiten GmbH + +How to Get Involved +------------------- + +There are many ways to get involved with Apache Solr for TYPO3: + +* Submit bug reports and feature requests on [GitHub](https://github.com/TYPO3-Solr/ext-solr) +* Ask or help or answer questions in our [Slack channel](https://typo3.slack.com/messages/ext-solr/) +* Provide patches through Pull Request or review and comment on existing [Pull Requests](https://github.com/TYPO3-Solr/ext-solr/pulls) +* Go to [www.typo3-solr.com](http://www.typo3-solr.com) or call [dkd](http://www.dkd.de) to sponsor the ongoing development of Apache Solr for TYPO3 + +Support us in 2021 by becoming an EB partner: + +http://www.typo3-solr.com/en/contact/ + +or call: + ++49 (0)69 - 2475218 0 diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg index a82db76f3..82cbf72b4 100644 --- a/Documentation/Settings.cfg +++ b/Documentation/Settings.cfg @@ -1,8 +1,8 @@ [general] project = Apache Tika for TYPO3 -version = 6.1.0-dev -release = 6.1.0-dev +version = 10.0.0 +release = 10.0.0 t3author = Ingo Renner, Timo Hund copyright = 2021 diff --git a/Documentation/Settings.yml b/Documentation/Settings.yml index 6dc78142f..8407dd7a2 100644 --- a/Documentation/Settings.yml +++ b/Documentation/Settings.yml @@ -6,8 +6,8 @@ conf.py: copyright: 2009-2021 project: Apache Tika for TYPO3 - version: 6.1.0-dev - release: 6.1.0-dev + version: 10.0.0 + release: 10.0.0 latex_documents: - - Index - tika.tex diff --git a/Documentation/conf.py b/Documentation/conf.py index e4195d3ba..fc8b94362 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -55,16 +55,16 @@ # General information about the project. project = u'EXT:tika Apache Tika for TYPO3' -copyright = u'2019, Ingo Renner, Timo Hund' +copyright = u'2021, Ingo Renner' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '6.1' +version = '10.0' # The full version, including alpha/beta/rc tags. -release = '6.1.0' +release = '10.0.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/composer.json b/composer.json index 719f69c4e..91ab513b4 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,6 @@ "support": { "email": "typo3-project-solr@lists.typo3.org", "issues": "https://github.com/TYPO3-Solr/ext-tika/issues", - "forum": "http://forum.typo3.org/index.php/f/53/", "source": "https://github.com/TYPO3-Solr/ext-tika" }, "replace": { @@ -64,7 +63,7 @@ }, "extra": { "branch-alias": { - "dev-master": "6.1.x-dev" + "dev-master": "10.0.x-dev" }, "typo3/cms": { "extension-key": "tika", diff --git a/ext_conf_template.txt b/ext_conf_template.txt index 9356d79b5..03d7cb9d3 100644 --- a/ext_conf_template.txt +++ b/ext_conf_template.txt @@ -1,4 +1,3 @@ - # customcategory=general=General # customcategory=jar=Tika App # customcategory=server=Tika Server