From 592859d6b129ad41b74d202cc079b8ce6f890c02 Mon Sep 17 00:00:00 2001 From: Damien Arrachequesne Date: Sun, 10 Jul 2022 09:05:36 +0200 Subject: [PATCH 1/4] chore(release): prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d0fffef6..46fff7a0 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.socket engine.io-client - 2.1.0 + 2.1.1-SNAPSHOT jar engine.io-client Engine.IO Client Library for Java @@ -30,7 +30,7 @@ https://github.com/socketio/engine.io-client-java scm:git:https://github.com/socketio/engine.io-client-java.git scm:git:https://github.com/socketio/engine.io-client-java.git - engine.io-client-2.1.0 + HEAD From 8519952a51baff36a2844d726876266b37ad6ffe Mon Sep 17 00:00:00 2001 From: Damien Arrachequesne Date: Sun, 10 Jul 2022 09:50:07 +0200 Subject: [PATCH 2/4] docs: add changelog for version 1.0.2 --- History.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/History.md b/History.md index 2336a66c..fefc5946 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,16 @@ +1.0.2 / 2022-07-10 +================== + +From the "1.x" branch. + +### Bug Fixes + +* check the type of the initial packet ([319f2e2](https://github.com/socketio/engine.io-client-java/commit/319f2e21bedced2866790671b3ae9ae7b0fabb82)) +* increase the readTimeout value of the default OkHttpClient ([2d87497](https://github.com/socketio/engine.io-client-java/commit/2d874971c2428a7a444b3a33afe66aedcdce3a96)) + + + 2.1.0 / 2022-07-10 ================== From 050dd2653a6c510e91679897c39ad849ee5f0132 Mon Sep 17 00:00:00 2001 From: Damien Arrachequesne Date: Tue, 18 Feb 2025 22:30:05 +0100 Subject: [PATCH 3/4] ci: fix java 7 build Maven has been upgraded from 3.8 to 3.9, which is not compatible with JDK 7. See also: https://github.com/actions/runner-images/issues/11093 --- .github/workflows/ci.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 439755f9..415e673b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,24 +11,38 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java: [7, 8, 11] steps: - uses: actions/checkout@v2 + + - name: Install Maven 3.8.x (instead of 3.9.x) + run: | + MAVEN_VERSION=3.8.8 + wget https://downloads.apache.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz + tar xzvf apache-maven-$MAVEN_VERSION-bin.tar.gz + sudo mv apache-maven-$MAVEN_VERSION /opt/maven + sudo rm -f /usr/bin/mvn # Remove existing symbolic link if it exists + sudo ln -s /opt/maven/bin/mvn /usr/bin/mvn # Create new symbolic link + - name: Setup java uses: actions/setup-java@v1 with: java-version: ${{ matrix.java }} + - name: Cache Maven packages - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: Setup Node.js uses: actions/setup-node@v1 with: node-version: 14.x + - name: Run the Maven verify phase run: mvn verify -Dgpg.skip=true From 5d02ea0cedb8ed8e959fa839b5609e5bb0c809e2 Mon Sep 17 00:00:00 2001 From: Damien Arrachequesne Date: Mon, 11 Aug 2025 09:20:10 +0200 Subject: [PATCH 4/4] ci: upgrade maven to version 3.8.9 Previous version is no longer available at [1]. [1]: https://dlcdn.apache.org/maven/maven-3/ --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 415e673b..1c4a623f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - name: Install Maven 3.8.x (instead of 3.9.x) run: | - MAVEN_VERSION=3.8.8 + MAVEN_VERSION=3.8.9 wget https://downloads.apache.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz tar xzvf apache-maven-$MAVEN_VERSION-bin.tar.gz sudo mv apache-maven-$MAVEN_VERSION /opt/maven