diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..2d3e134 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,34 @@ +name: CI + +on: + push: + pull_request: + schedule: + - cron: '0 0 * * 0' + +jobs: + verify: + runs-on: ubuntu-latest + + strategy: + matrix: + java: [8, 11] + + steps: + - uses: actions/checkout@v2 + - name: Setup java + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - name: Cache Maven packages + uses: actions/cache@v2 + 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 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 84c2bc2..0000000 --- a/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: java -sudo: false -install: mvn install -DskipTests=true -Dgpg.skip=true -jdk: - - openjdk7 - - oraclejdk8 -dist: trusty diff --git a/README.md b/README.md index 8abe70a..587c387 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # Engine.IO-client Java -[![Build Status](https://travis-ci.org/socketio/engine.io-client-java.png?branch=master)](https://travis-ci.org/socketio/engine.io-client-java) + +[![Build Status](https://github.com/socketio/engine.io-client-java/workflows/CI/badge.svg)](https://github.com/socketio/engine.io-client-java/actions) This is the Engine.IO Client Library for Java, which is simply ported from the [JavaScript client](https://github.com/socketio/engine.io-client). diff --git a/src/test/java/io/socket/engineio/client/SSLConnectionTest.java b/src/test/java/io/socket/engineio/client/SSLConnectionTest.java index 2e6a128..1405e4d 100644 --- a/src/test/java/io/socket/engineio/client/SSLConnectionTest.java +++ b/src/test/java/io/socket/engineio/client/SSLConnectionTest.java @@ -52,7 +52,7 @@ public class SSLConnectionTest extends Connection { TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); tmf.init(ks); - SSLContext sslContext = SSLContext.getInstance("TLSv1"); + SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); sOkHttpClient = new OkHttpClient.Builder() diff --git a/src/test/resources/cert.pem b/src/test/resources/cert.pem index bea755c..00d8bff 100644 --- a/src/test/resources/cert.pem +++ b/src/test/resources/cert.pem @@ -1,10 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIBfDCCASYCCQDTnGd/oOyF1DANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJB -VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0 -cyBQdHkgTHRkMB4XDTE0MDcwNzEzMTUzN1oXDTQxMTEyMTEzMTUzN1owRTELMAkG -A1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0 -IFdpZGdpdHMgUHR5IEx0ZDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC6sdeFPlqk -5Pap9woFx1RO05gLidw4MNcL+ZRSxy/sNeE4PhT/RLFcEvnXiHc92wT8YB5Z+WCM -k/jRQ0q19PNPAgMBAAEwDQYJKoZIhvcNAQEFBQADQQCnmm1N/yZiMBZw2JDfbsx3 -ecc0BGQ2BwWQuGHzP07TMi1AuOyNZSczl907OphYb9iRC8shZ4O+oXjQAuGTQ1Hp +MIIDazCCAlOgAwIBAgIUL0sTZnQmQ4K4o4NqeA1VAsKrn20wDQYJKoZIhvcNAQEL +BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDEyMDgwOTE3NDlaFw0zMDEy +MDYwOTE3NDlaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw +HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQDKCTIWvz8s+SjqjxOSmQSF3hvQVjfuIxAwCqKYKdiO +4ix72gkM2WRtzb6icOpDF9zVmcN2QIUXC+hvmVLVMGISZBA4qnGpRwGfVsJlxkO/ +yIOQ4OVn8tJHT+qv9sE656CV+yMbhcoR4E6n03hXcyRz44f14rz1yHz1cjrsDCqa +HfjQkMjXEi/oiOYvGOr7EqAlf0fHyne/FdRg3sfqjy9GXxD4djEzBt6ug11cIjvw +21lP3jC2Te9gng+9cxGlmBYZ6l2OxDZQYjVfOlhTEGOc/J1fP1cVXt/P1fJ5byR8 +ltN6KCcorPwxa6rtCEVy3PXdnKTj1eX5UocIRYVj3e57AgMBAAGjUzBRMB0GA1Ud +DgQWBBRJPJeTbeYMbtebcMKinxhVgr8x/TAfBgNVHSMEGDAWgBRJPJeTbeYMbteb +cMKinxhVgr8x/TAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQC1 +VLs5pldkzYoXI+3ry6TTTDxG/AJ1g/GKC4AXp9V+v44FA/dzD8dWVAGKLE/C1IYj +tm3VDeKBGTIgk5EFm0SI0bfgvJwOkSg0WJiX5rrvaXDB2J1tZX50XKZq68BYCiq9 +Qm41bSVV7xccRr7XG2bpKzHqbfjCDIDRdG8WnuTtysVGXMmjObPnrR8SoFVmrGcR +nrkGgp//QWNlGVRYL6cHbkt6eLjDTWJxeKUIN0SlSKOP52Olh1GWBxTeQtnP9VUY +yoj8Fj4lHaCAOlS5W9/kAJSTiLNnmi7v3eKYi+5wuHMFKxr/yRyaUloq78uaBJxa +Y2xdMyPo+uzo0rAXGoUT -----END CERTIFICATE----- diff --git a/src/test/resources/key.pem b/src/test/resources/key.pem index 4a78a22..0c2ddfc 100644 --- a/src/test/resources/key.pem +++ b/src/test/resources/key.pem @@ -1,9 +1,28 @@ ------BEGIN RSA PRIVATE KEY----- -MIIBOwIBAAJBALqx14U+WqTk9qn3CgXHVE7TmAuJ3Dgw1wv5lFLHL+w14Tg+FP9E -sVwS+deIdz3bBPxgHln5YIyT+NFDSrX0808CAwEAAQJAIdwLSIEsk2drTRwe1zl1 -ku5RTxZruE0zU1qqifDSQjab1StAK1tapxBVRlRlyLCfD704UClsU8sjGtq0Nh6n -kQIhAO2YJM1g0w9bWYet3zC2UdEASPzaQ7llpZmc51NRBx2NAiEAyShICAaclEuy -wwuD4hibV+b6I8CLYoyPBo32EaceN0sCIQCUed6NxfM/houlgV+Xtmfcnzv9X3yx -EDdzjpz08Q7sRQIgZFv1fBOYYSBXQppnJRFzx2pUmCvDHtrTrMh84RfIqnsCIQCf -JjNXXxOaHn1PNZpi6EHReiFQmy1Swt+AxpTsKixsfA== ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDKCTIWvz8s+Sjq +jxOSmQSF3hvQVjfuIxAwCqKYKdiO4ix72gkM2WRtzb6icOpDF9zVmcN2QIUXC+hv +mVLVMGISZBA4qnGpRwGfVsJlxkO/yIOQ4OVn8tJHT+qv9sE656CV+yMbhcoR4E6n +03hXcyRz44f14rz1yHz1cjrsDCqaHfjQkMjXEi/oiOYvGOr7EqAlf0fHyne/FdRg +3sfqjy9GXxD4djEzBt6ug11cIjvw21lP3jC2Te9gng+9cxGlmBYZ6l2OxDZQYjVf +OlhTEGOc/J1fP1cVXt/P1fJ5byR8ltN6KCcorPwxa6rtCEVy3PXdnKTj1eX5UocI +RYVj3e57AgMBAAECggEAMuJiBSyhwrf2QC1M5q03YGfyZWRxrb6TAyaKkPxpGIOK +ZJ8jjGLsUmNxUgRSXBeUfQ+/FPdnDcjn/8OEA0GuUad2Fm+HNPU3SWRWjb+DrLfZ +uxGJdcbIg0FzgGILhMR1w5B+5R2rKRlvdgFi29OaKL3zrlAu+1BFeKQOhwkBadMT +9Z7lFi4dUPCpgtm7F0lM5jMQvHslGtPu/VQTyrAvdyJjDtXfqDYFXMFgxyUuy0wh +dtMCxfnzePXDbS1D9wgzw1Dmmx/4gWoE80IHOUs7nzM1hPHQs8Qyr5ZFQ0iHq6DC +qcixIwRxZwunNyZ7M+JEPsSM20d0TF5FLFkw44Y9AQKBgQDvKCFbJTqD8yxTlD3H +sPKQCd4s08hR4E+sXnr3fF4ExyX1VwEPzev9fK4ez8pbQVFeuv0o89QhDQBJEGIu +HG0f2fYYcfil3+b3NYBTTEt+IIvhEE2LLCV1zkFe0uoG+qbZjksaHeXZ77TnKnGd +nTWHhoKZ7xMbKJzROUoMJ7GwuwKBgQDYQ8varcqW6UO4LS87OHA2lEs66OfJxnBk +Oox+Z34HXOsXlEqArx8S5/cX4/EM8UECobaqIQKzkvgRA5krL2Vroh588kJXf3yK +O5wESuE7zimg+m2RYnazXpdyxvgWhp1WSZzrm6ybJVCtUiY0x4SAaIWnU102JNMX +oge093K9QQKBgQCaJTKCrdcubxEV+clsKWfeYQ3btNE7vKl9vxPg6j8rMzULEf30 +MtS1eKQ95c5WzR3mQf2kZKxIdTnG3hF6CQZo7jKJhQQv3cXfdpN0nQtXiyC9eqWQ +W271pHBL7wO6ZdofBXDwr26T7sWZ7ah3X3m+FXuePhMBgUa6MAPDG96SuwKBgQDE +H096hArqKqaQGuHvWbJhvMAwr1Csqnn4WyRX6bDgKoLEgmXCJ44NjjGGB9/tdcgY +A+Fsjb0ubsTqYRIBmNzn7ECr3OMPCH0/uuk091ck7kTQSOseYmX1Kn47x3bqrq92 +thFJlYbFt+RfGdWuHZXrAV7brH0mgeSxVO6aTaFPQQKBgQDfkqfxQRmLEwIJygfk +Y1XwEvZqIf0gCZEHWPsGiYExClHc21RZSTbhc+XZ8DTgxYe375uMV6z5aolwjjrI +9bTMejqAC4l58rxdkE1NbxvQVbPwTdM/H4HyYJk9IPKSF0A11YLbalvGo0liWHKo +jfrYDnesTOn3+RLPe6G0K7jFgQ== +-----END PRIVATE KEY----- diff --git a/src/test/resources/keystore.jks b/src/test/resources/keystore.jks index 24c507b..3884f8a 100644 Binary files a/src/test/resources/keystore.jks and b/src/test/resources/keystore.jks differ