Merge pull request #694 from ywy2090/master-ChangeLog

update netty-sm-ssl-context

.github/workflows/workflow.yml

@@ -0,0 +1,33 @@
+name: Java-SDK GitHub Actions
+on:
+  push:
+  pull_request:
+  release:
+    types: [published, created, edited]
+env:
+  CCACHE_DIR: ${{ github.workspace }}/ccache
+
+jobs:
+  build:
+    name: build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, ubuntu-16.04, macos-latest]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 5
+      - name: check commit
+        if: ${{ runner.os == 'Linux' && github.base_ref != 'master' && github.event_name == 'pull_request' }}
+        run: bash .ci/ci_check_commit.sh
+      - name: install macOS dependencies
+        if: runner.os == 'macOS'
+        run: brew install [email protected] openjdk
+      - name: install Ubuntu dependencies
+        if: runner.os == 'Linux'
+        run: sudo apt-get update && sudo apt install -y git curl libssl-dev default-jdk build-essential
+      - name: compile and run ut
+        run: ./gradlew build -x integrationTest
+      - name: run integration testing
+        run: /bin/bash .ci/ci_check.sh

build.gradle

@@ -69,13 +69,10 @@ dependencies {
     // compile 'io.netty:netty-tcnative:2.0.25.Final'
     // compile 'io.netty:netty-tcnative-boringssl-static:2.0.27.Final'
     // compile 'org.fisco-bcos:netty-sm-ssl-context:1.0.0-SNAPSHOT'
-    compile ('org.fisco-bcos:netty-sm-ssl-context:1.0.0') {
+    compile ('org.fisco-bcos:netty-sm-ssl-context:1.1.0') {
         exclude module:"log4j"
     }
 
-    // update tcnative version
-    compile 'org.fisco-bcos:tcnative:2.0.30.0-SNAPSHOT'
-
     compile 'org.ethereum:solcJ-all:0.4.25'
     compile 'io.netty:netty-all:4.1.50.Final'
     compile 'com.google.guava:guava:29.0-jre'