diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..439755f --- /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: [7, 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 b940182..0000000 --- a/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: java -dist: trusty -sudo: false -install: mvn install -DskipTests=true -Dgpg.skip=true -jdk: - - openjdk7 - - oraclejdk8 diff --git a/README.md b/README.md index e5131fc..fa96567 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # Socket.IO-client Java -[![Build Status](https://travis-ci.org/socketio/socket.io-client-java.png?branch=master)](https://travis-ci.org/socketio/socket.io-client-java) + +[![Build Status](https://github.com/socketio/socket.io-client-java/workflows/CI/badge.svg)](https://github.com/socketio/socket.io-client-java/actions) This is the Socket.IO v1.x and v2.x Client Library for Java, which is simply ported from the [JavaScript client](https://github.com/socketio/socket.io-client). diff --git a/src/test/java/io/socket/client/SSLConnectionTest.java b/src/test/java/io/socket/client/SSLConnectionTest.java index f0decc8..26ad1b1 100644 --- a/src/test/java/io/socket/client/SSLConnectionTest.java +++ b/src/test/java/io/socket/client/SSLConnectionTest.java @@ -66,7 +66,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..cf3be04 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 +MIIDazCCAlOgAwIBAgIUPRxvTroGehqqXb8XOvqliIcKyagwDQYJKoZIhvcNAQEL +BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDEyMTAxMDE0MDFaFw0zMDEy +MDgxMDE0MDFaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw +HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQCxJ8fUV6sRiNub3Af6jGpGTsWpCqtxBkRSADENMzdT +Twz4wUXXbgv/Tbt3XJovR1RtE9nx+WyA4XqBdfr8s/qDLiVWiyszU9E6jBjQva9B +aGJDZU0BEXjGDTFaE4tL3E/YWZvXVKmrEiq0aZa6anbjOefjG46CnXgfir/TZlx+ +8I5s/UmKY5PZ525zLHx/hGbCNCOfdH196CUsV5NNME5OIYIs0+9jLXkn8KS9uEKa +ifhf4rv4G2wo82KkIR1JIkKalH0xb0Z/R6+J2I2ADvxCIVxcGu78Nj0Ms5jpQKM6 +GTogpC3hN4fSAVdOLTHmQU1UrOg9btZtB79fYWn1KmMlAgMBAAGjUzBRMB0GA1Ud +DgQWBBSVf9NTqVxHgXqkdleQ4HGxxA8FTTAfBgNVHSMEGDAWgBSVf9NTqVxHgXqk +dleQ4HGxxA8FTTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB8 +8Jjqcipf2jHdiRx+4ltJ5y4hitgPsPRsR74L22hHAvICFC+2b2Iu3R1vSBJj5140 +HwwH7LUPyt3IKzQP8EOB2MbZsfH10Z3/ChnH1MHmOCDO+Wusi0C0HaOfWp/rAsgY +q+wLMGd3G72/Ba1YdaGHm9SjrziyAEnF5Uz8sUkQrDbZTiWp35PagJTDhdQ6pnUh +JROaoYgNYhGjQ89V1geIpIVTVqoGvLyvAi4k58KQyMUtxi7IEG/IdgopZAL9IL75 +D7fMXi21mrb1ohJpk3JlS1Z1XtoynIs4uzlv9wg6yKU5ExZ0QsUwuBekopUuSAvg +XeFIZbJz/WoAo0ZJ6o8Y -----END CERTIFICATE----- diff --git a/src/test/resources/key.pem b/src/test/resources/key.pem index 4a78a22..b80afb9 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----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCxJ8fUV6sRiNub +3Af6jGpGTsWpCqtxBkRSADENMzdTTwz4wUXXbgv/Tbt3XJovR1RtE9nx+WyA4XqB +dfr8s/qDLiVWiyszU9E6jBjQva9BaGJDZU0BEXjGDTFaE4tL3E/YWZvXVKmrEiq0 +aZa6anbjOefjG46CnXgfir/TZlx+8I5s/UmKY5PZ525zLHx/hGbCNCOfdH196CUs +V5NNME5OIYIs0+9jLXkn8KS9uEKaifhf4rv4G2wo82KkIR1JIkKalH0xb0Z/R6+J +2I2ADvxCIVxcGu78Nj0Ms5jpQKM6GTogpC3hN4fSAVdOLTHmQU1UrOg9btZtB79f +YWn1KmMlAgMBAAECggEAZCjGnTJ3wLEs4KD1Td2nlFqi/GDQ71UIuYfsM7daN1rB +Tb8QOq24UL7lF6Yeck6U2BraJSnNA8z3k0xd/BPRtesYJycF5L4l1EEzIomsFYHr +1IjokYsMSoVY+sGEBv7nkb2QE52FU/gwdtIf6wOYdf3eMhP5bbWUHdk3fVEpSIbN +q9Le23U4Rf+24TUFYQfSmxIADVXnleEBaIBvIj9+uqrQWkY7aTdvdZshuL08irrU +/UekrqsP6uruKPEL2n7xUYjM1MvkAuPmyHjikwevNpPAMuAlFty/ZCNd1fARDfKS +WToRnpgm5u8D414gDCesoyYuy3IbhQ4t95gru2T+3QKBgQDl6sW0+0RlTMA2QOv5 +IID9UfO01OhDZZTjy83tse+hqWNN93DengBaK4LLhPxUp0Ff62nICzoeCieXgrUF +rYkF9F1fIa1lOgTemmNoKYm3OzlBfWbZ2zlVPzxg6QlLaYBLc2ZNpAAuuGJjh115 +JjDwVh+TN/8MkPDG+dnKb52VLwKBgQDFQLV8UehHFzkirNw1+dYSCkNv9qJwoub9 +MD6lI4rl7pi//4i1QdKvJkCSSZ664s9UjyogyI+meRdUS9ea3JYUrWLUCoPr0nfb +5b0ohEb56QhEnCO5xVO49dDpb64b8rPxztLV5Ejr0cnS73UEZSu16ihrWMtxn5w3 +sRQ4L7pf6wKBgGDKk2z7kvGqfAjbD/yTSHpcs+Je92DYNPQpaoo0rJM8QkgicWvm +zHMpeii/1ZK1zvnYm3HR+CeJUt2f8yFuyw6sr1pLTToeUMp96HeDdSykTBhb+J6i +geJ3eq25rWYIBjC9ZkYtUr5YdWM9K4bDIzsqpqRNoJvjsNmzeZKVppuVAoGAOwsI +iAL4dTclWhTGAb4b7uB1mTEJJJAOdmEXj1TZQcQuouH5aNAgIV9g2qkAw04a42PL +J28BWMJMUmY1TlyS6/OObowLOu6QBBl7ioI1wJ6ZY/gc1YGUcvvZodZVFnaKmGnh +QDcKANSWBfa5XyxtbhF+McutcgBlwWHW/I6EyisCgYAnJ35YgVEx4hakXQNSwlPR +Y6ArQSHTlsBdpxbE2ekDrqTDfx6r2RVdiq3arZepk4UG9UDVBzCuZfQO8mRRV0lF +9tqssEl8uqJasxrLbY1LAg75btV+8o4UJhutstzzXG2oEY3YlZRbjl8a146jVd09 +2oxN1xfkQYQ9cLYTAOfrDw== +-----END PRIVATE KEY----- diff --git a/src/test/resources/keystore.jks b/src/test/resources/keystore.jks index 24c507b..fa70cab 100644 Binary files a/src/test/resources/keystore.jks and b/src/test/resources/keystore.jks differ