update-to-v0.6.26

.github/dependabot.yml

@@ -0,0 +1,8 @@
+---
+version: 2
+updates:
+  # Enable workflow version updates for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/build.yml

@@ -8,20 +8,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          java-version: 8
+          distribution: "zulu"
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
       - name: Build with testing
         run: ./gradlew check --console rich --info
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: tests
@@ -31,8 +32,8 @@ jobs:
         if: success()
         run: ./gradlew jacocoTestReport
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: success()
         with:
           name: jacoco
-          path: ./build/reports/jacoco/test
+          path: ./build/reports/coverage

.github/workflows/codeql.yml

@@ -0,0 +1,35 @@
+---
+name: "CodeQL SAST"
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+  schedule:
+    - cron: '0 0 1 * *'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [java]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.6.26
+- Catch up to Java 11
+
+## 0.6.25 - 2022-09-21
+- Properly shutdown ThreadExecutor when an unexpected error occurs
+
 ## 0.6.24 - 2021-10-19
 - Add retryable in case response data invalid json format
 

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id "checkstyle"
     id "jacoco"
     id "signing"
-    id "org.embulk.embulk-plugins" version "0.4.2"
+    id "org.embulk.embulk-plugins" version "0.5.5"
     id "com.palantir.git-version" version "0.12.3"
 }
 
@@ -15,7 +15,7 @@ repositories {
 group = "com.treasuredata.embulk.plugins"
 description = "Loads records from Marketo."
 version = {
-    def baseVersion = "0.6.24"
+    def baseVersion = "0.6.26"
     def troccoVersion = "0.1.0"
     def tag = "${baseVersion}-trocco-${troccoVersion}"
     def vd = versionDetails()
@@ -34,11 +34,16 @@ targetCompatibility = 1.8
 
 def embulkVersion = '0.10.29'
 
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
 dependencies {
     compileOnly "org.embulk:embulk-api:$embulkVersion"
     compileOnly "org.embulk:embulk-spi:$embulkVersion"
 
-    compile('org.embulk:embulk-util-config:0.3.1') {
+    implementation('org.embulk:embulk-util-config:0.3.2') {
         // Conflict with Embulk Core
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
@@ -47,33 +52,38 @@ dependencies {
         exclude group: 'javax.validation', module: 'validation-api'
     }
 
-    compile "org.embulk:embulk-util-json:0.1.1"
-    compile "org.embulk:embulk-util-text:0.1.1"
-    compile "org.embulk:embulk-util-timestamp:0.2.1"
+    implementation "org.embulk:embulk-util-json:0.1.1"
+    implementation "org.embulk:embulk-util-text:0.1.1"
+    implementation "org.embulk:embulk-util-timestamp:0.2.1"
 
     // Explicit dependencies for embulk-util-* that matches with Embulk
-    compile 'com.fasterxml.jackson.core:jackson-core:2.6.7'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.6.7'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.6.7'
-    compile 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7'
-    compile 'javax.validation:validation-api:1.1.0.Final'
-    compile('org.apache.bval:bval-jsr303:0.5'){
-        exclude group: 'org.apache.commons', module: 'commons-lang'
-    }
-
-    compile 'org.embulk:embulk-base-restclient:0.10.1'
-    compile 'org.embulk:embulk-util-retryhelper-jetty92:0.8.2'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.6.7'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.6.7'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.6.7'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7'
+    implementation 'javax.validation:validation-api:1.1.0.Final'
+    implementation 'org.apache.bval:bval-jsr303:0.5'
+    implementation 'org.embulk:embulk-base-restclient:0.10.1'
+    implementation 'org.embulk:embulk-util-retryhelper-jetty94:0.9.0'
+
+    implementation 'com.google.guava:guava:18.0'
+    implementation "com.google.code.findbugs:annotations:3.0.1"
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation "javax.xml.bind:jaxb-api:2.2.11"
+    implementation "com.sun.xml.bind:jaxb-core:2.2.11"
+    implementation "com.sun.xml.bind:jaxb-impl:2.2.11"
+    implementation "javax.activation:activation:1.1.1"
 
     compile 'com.google.guava:guava:18.0'
     compile  "com.google.code.findbugs:annotations:3.0.1"
     compile 'org.apache.commons:commons-lang3:3.4'
     compile 'org.apache.commons:commons-csv:1.8'
 
-    testCompile "junit:junit:4.+"
-    testCompile "org.embulk:embulk-core:$embulkVersion:tests"
-    testCompile "org.embulk:embulk-junit4:$embulkVersion"
-    testCompile "org.embulk:embulk-deps:$embulkVersion"
-    testCompile "org.mockito:mockito-core:2.+"
+    testImplementation "junit:junit:4.+"
+    testImplementation "org.embulk:embulk-core:$embulkVersion:tests"
+    testImplementation "org.embulk:embulk-junit4:$embulkVersion"
+    testImplementation "org.embulk:embulk-deps:$embulkVersion"
+    testImplementation "org.mockito:mockito-core:2.+"
 }
 
 embulkPlugin {

gradle/dependency-locks/compileClasspath.lockfile

@@ -0,0 +1,36 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.fasterxml.jackson.core:jackson-annotations:2.6.7
+com.fasterxml.jackson.core:jackson-core:2.6.7
+com.fasterxml.jackson.core:jackson-databind:2.6.7
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7
+com.google.code.findbugs:annotations:3.0.1
+com.google.code.findbugs:jsr305:3.0.1
+com.google.guava:guava:18.0
+com.sun.xml.bind:jaxb-core:2.2.11
+com.sun.xml.bind:jaxb-impl:2.2.11
+commons-beanutils:commons-beanutils-core:1.8.3
+javax.activation:activation:1.1.1
+javax.validation:validation-api:1.1.0.Final
+javax.xml.bind:jaxb-api:2.2.11
+net.jcip:jcip-annotations:1.0
+org.apache.bval:bval-core:0.5
+org.apache.bval:bval-jsr303:0.5
+org.apache.commons:commons-lang3:3.12.0
+org.eclipse.jetty:jetty-client:9.4.51.v20230217
+org.eclipse.jetty:jetty-http:9.4.51.v20230217
+org.eclipse.jetty:jetty-io:9.4.51.v20230217
+org.eclipse.jetty:jetty-util:9.4.51.v20230217
+org.embulk:embulk-api:0.10.29
+org.embulk:embulk-base-restclient:0.10.1
+org.embulk:embulk-spi:0.10.29
+org.embulk:embulk-util-config:0.3.2
+org.embulk:embulk-util-file:0.1.3
+org.embulk:embulk-util-json:0.1.1
+org.embulk:embulk-util-retryhelper-jetty94:0.9.0
+org.embulk:embulk-util-retryhelper:0.9.0
+org.embulk:embulk-util-text:0.1.1
+org.embulk:embulk-util-timestamp:0.2.1
+org.msgpack:msgpack-core:0.8.11
+org.slf4j:slf4j-api:1.7.30

gradle/dependency-locks/embulkPluginRuntime.lockfile → gradle/dependency-locks/runtimeClasspath.lockfile

@@ -8,23 +8,27 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7
 com.google.code.findbugs:annotations:3.0.1
 com.google.code.findbugs:jsr305:3.0.1
 com.google.guava:guava:18.0
+com.sun.xml.bind:jaxb-core:2.2.11
+com.sun.xml.bind:jaxb-impl:2.2.11
 commons-beanutils:commons-beanutils-core:1.8.3
+javax.activation:activation:1.1.1
 javax.validation:validation-api:1.1.0.Final
+javax.xml.bind:jaxb-api:2.2.11
 net.jcip:jcip-annotations:1.0
 org.apache.bval:bval-core:0.5
 org.apache.bval:bval-jsr303:0.5
 org.apache.commons:commons-csv:1.8
-org.apache.commons:commons-lang3:3.4
-org.eclipse.jetty:jetty-client:9.2.14.v20151106
-org.eclipse.jetty:jetty-http:9.2.14.v20151106
-org.eclipse.jetty:jetty-io:9.2.14.v20151106
-org.eclipse.jetty:jetty-util:9.2.14.v20151106
+org.apache.commons:commons-lang3:3.12.0
+org.eclipse.jetty:jetty-client:9.4.51.v20230217
+org.eclipse.jetty:jetty-http:9.4.51.v20230217
+org.eclipse.jetty:jetty-io:9.4.51.v20230217
+org.eclipse.jetty:jetty-util:9.4.51.v20230217
 org.embulk:embulk-base-restclient:0.10.1
-org.embulk:embulk-util-config:0.3.1
+org.embulk:embulk-util-config:0.3.2
 org.embulk:embulk-util-file:0.1.3
 org.embulk:embulk-util-json:0.1.1
-org.embulk:embulk-util-retryhelper-jetty92:0.8.2
-org.embulk:embulk-util-retryhelper:0.8.2
+org.embulk:embulk-util-retryhelper-jetty94:0.9.0
+org.embulk:embulk-util-retryhelper:0.9.0
 org.embulk:embulk-util-rubytime:0.3.2
 org.embulk:embulk-util-text:0.1.1
 org.embulk:embulk-util-timestamp:0.2.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Mar 27 16:55:11 ICT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip

gradlew

@@ -180,4 +180,4 @@ APP_ARGS=`save "$@"`
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -100,4 +100,4 @@ exit /b 1
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega