Merge remote-tracking branch 'origin/master'

Author: setchy

.github/workflows/ci.yml

@@ -63,7 +63,7 @@ jobs:
       - name: Make gradlew executable
         run: chmod +x ./gradlew
       - name: Gradle Publish Snapshot
-        if: env.BINTRAY_USER != 'SKIP_BINTRAY_PUBLISH'
+        if: env.BINTRAY_USER != 'SKIP_BINTRAY_PUBLISH' && env.BINTRAY_USER != null
         env:
           BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
           BINTRAY_PASS: ${{ secrets.BINTRAY_PASSWORD }}
@@ -81,13 +81,13 @@ jobs:
         with:
           java-version: 11
       - name: Cache SonarCloud packages
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Gradle packages
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -96,4 +96,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        if: env.SONAR_TOKEN != null
         run: ./gradlew build jacocoTestReport sonarqube --info

.github/workflows/pull-request.yml

@@ -65,14 +65,14 @@ jobs:
           java-version: 11
       - name: Cache SonarCloud packages
         if: env.SONAR_TOKEN != null
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Gradle packages
         if: env.SONAR_TOKEN != null
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

example-graphql-subscription/src/main/resources/public/index.html

@@ -43,7 +43,7 @@
   <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
         rel="stylesheet">
 
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 

example-spring-common/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     implementation(project(":graphiql-spring-boot-starter"))
 
     implementation "com.embedler.moon.graphql:spring-graphql-common:2.1.0-2016-05-22T16-50-32"
-    implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.3'
+    implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.4'
 
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-actuator")

gradle.properties

@@ -35,10 +35,10 @@ LIB_GRAPHQL_JAVA_VER=16.2
 LIB_EXTENDED_SCALARS_VERSION=16.0.1
 LIB_SPRING_BOOT_VER=2.4.5
 LIB_GRAPHQL_SERVLET_VER=11.1.0
-LIB_GRAPHQL_JAVA_TOOLS_VER=11.0.0
+LIB_GRAPHQL_JAVA_TOOLS_VER=11.0.1
 LIB_GRAPHQL_ANNOTATIONS_VER=8.3
 LIB_REFLECTIONS_VER=0.9.11
-LIB_APACHE_COMMONS_TEXT=1.8
+LIB_APACHE_COMMONS_TEXT=1.9
 LIB_JSOUP_VER=1.13.1
 ### Gradle Plugins
 LIB_BINTRAY_PLUGIN_VER=1.8.5