Merge branch 'hotfix/4.1.1'

korpling · Aug 20, 2021 · f27e4f1 · f27e4f1
2 parents 5306e78 + c25c0d8
commit f27e4f1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -9,16 +9,18 @@ jobs:
           uses: actions/checkout@v2
         - name: Set JAVA_HOME to included JDK 8
           run: echo JAVA_HOME=$JAVA_HOME_8_X64 >> $GITHUB_ENV
+        - run: misc/download-annis-cli.sh 0.30.0
+          env:
+            OS_NAME: linux
+        - run: misc/import-test-corpora.sh
         - name: Build server binary
           run: mvn clean install
         - name: Build desktop binary
           run: mvn -Pdesktop install
         - name: Release assets on GitHub
-          uses: softprops/[email protected]
+          uses: alexellis/[email protected]
           with:
-            files: |
-              target/annis-*-server.jar
-              target/annis-*-desktop.jar
+            asset_paths: '["./target/annis-*-server.jar", "./target/annis-*-desktop.jar"]'
           env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   deploy_documentation:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.1.1] - 2021-08-20
+
+### Fixed
+
+- Do not use the default read timeout in the HTTP REST client (#712)
+- Use an GitHub Action that only uploads the release files instead of creating a new release
+- Download the test corpora before building the release artifacts
+
 ## [4.1.0] - 2021-08-19
 
 ### Added
@@ -915,7 +923,8 @@ https://github.com/korpling/ANNIS/issues?milestone=4&state=closed
 - [#37](https://github.com/korpling/ANNIS/issues/37) Allow to migrate corpora in database initialization
 
 
-[Unreleased]: https://github.com/korpling/ANNIS/compare/v4.1.0...HEAD
+[Unreleased]: https://github.com/korpling/ANNIS/compare/v4.1.1...HEAD
+[4.1.1]: https://github.com/korpling/ANNIS/compare/v4.1.0...v4.1.1
 [4.1.0]: https://github.com/korpling/ANNIS/compare/v4.0.0...v4.1.0
 [4.0.0]: https://github.com/korpling/ANNIS/compare/v4.0.0-beta.6...v4.0.0
 [4.0.0-beta.6]: https://github.com/korpling/ANNIS/compare/v4.0.0-beta.5...v4.0.0-beta.6

diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>org.corpus-tools</groupId>
 	<artifactId>annis</artifactId>
-	<version>4.1.0</version>
+	<version>4.1.1</version>
 	<name>ANNIS user interface</name>
 	<packaging>jar</packaging>
 	<scm>

diff --git a/src/main/java/org/corpus_tools/annis/gui/CommonUI.java b/src/main/java/org/corpus_tools/annis/gui/CommonUI.java
@@ -180,7 +180,7 @@ public String getUrlPrefix() {
 
     public ApiClient getClient() {
 
-      final ApiClient client = Configuration.getDefaultApiClient();
+      final ApiClient client = Configuration.getDefaultApiClient().setReadTimeout(0);
       // Use the configuration to allow changing the path to the web-service
       client.setBasePath(getConfig().getWebserviceUrl());