Skip to content

Commit 54c726d

Browse files
fix: CVEs (#13)
* Fix CVEs * Add .devrev/repo.yml
1 parent cdc0062 commit 54c726d

File tree

7 files changed

+114
-124
lines changed

7 files changed

+114
-124
lines changed

.devrev/repo.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deployable: true

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ gradle-app.setting
2222
*.tar.gz
2323
*.rar
2424

25+
.dccache
26+
2527
.settings
2628
.project
2729
.classpath

.travis.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

build.gradle

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@ buildscript {
44
}
55
}
66

7+
import com.github.spotbugs.snom.SpotBugsTask
78

89
plugins {
910
id 'idea'
1011
id 'com.palantir.git-version' version '0.5.2'
1112
id 'com.github.johnrengelman.shadow' version '2.0.4'
1213
id 'java'
13-
id "com.github.spotbugs" version "2.0.0" apply false
14+
id "com.github.spotbugs" version "4.8.0" apply false
1415
id "net.rdrei.android.buildtimetracker" version "0.11.0"
1516
}
1617

1718
task userWrapper(type: Wrapper) {
18-
gradleVersion = '5.3.1'
19+
gradleVersion = '5.6'
1920
}
2021

2122
description = "kafka-connect-dynamodb"
@@ -35,7 +36,7 @@ allprojects {
3536
apply plugin: 'idea'
3637

3738
apply plugin: 'com.github.spotbugs'
38-
tasks.withType(com.github.spotbugs.SpotBugsTask) {
39+
tasks.withType(SpotBugsTask) {
3940
reports {
4041
xml.enabled = false
4142
html.enabled = true
@@ -50,13 +51,13 @@ allprojects {
5051
testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
5152
testCompile "org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion"
5253
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
53-
implementation 'io.rest-assured:rest-assured:4.3.1'
54-
testCompile "org.testcontainers:testcontainers:1.14.3"
54+
implementation 'io.rest-assured:rest-assured:4.3.3'
55+
testCompile "org.testcontainers:testcontainers:1.16.1"
5556
testCompile "org.testcontainers:junit-jupiter:1.14.3"
5657
testCompile "org.testcontainers:kafka:1.15.0-rc2"
5758
testCompile "org.testcontainers:mockserver:1.15.0-rc2"
58-
testCompile "org.mock-server:mockserver-client-java:5.11.1"
59-
testCompile "com.google.code.gson:gson:2.8.6"
59+
testCompile "org.mock-server:mockserver-client-java:5.15.0"
60+
testCompile "com.google.code.gson:gson:2.8.9"
6061

6162
testCompile group: 'org.mockito', name: 'mockito-junit-jupiter', version: '2.26.0'
6263
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1'
@@ -133,4 +134,4 @@ buildtimetracker {
133134
}
134135
}
135136

136-
defaultTasks 'clean', 'check'
137+
defaultTasks 'clean', 'check'
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Wed May 15 17:05:40 EEST 2019
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip

gradlew.bat

Lines changed: 100 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
1-
@rem
2-
@rem Copyright 2015 the original author or authors.
3-
@rem
4-
@rem Licensed under the Apache License, Version 2.0 (the "License");
5-
@rem you may not use this file except in compliance with the License.
6-
@rem You may obtain a copy of the License at
7-
@rem
8-
@rem http://www.apache.org/licenses/LICENSE-2.0
9-
@rem
10-
@rem Unless required by applicable law or agreed to in writing, software
11-
@rem distributed under the License is distributed on an "AS IS" BASIS,
12-
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
@rem See the License for the specific language governing permissions and
14-
@rem limitations under the License.
15-
@rem
16-
17-
@if "%DEBUG%" == "" @echo off
18-
@rem ##########################################################################
19-
@rem
20-
@rem Gradle startup script for Windows
21-
@rem
22-
@rem ##########################################################################
23-
24-
@rem Set local scope for the variables with windows NT shell
25-
if "%OS%"=="Windows_NT" setlocal
26-
27-
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
29-
set APP_BASE_NAME=%~n0
30-
set APP_HOME=%DIRNAME%
31-
32-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
33-
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
34-
35-
@rem Find java.exe
36-
if defined JAVA_HOME goto findJavaFromJavaHome
37-
38-
set JAVA_EXE=java.exe
39-
%JAVA_EXE% -version >NUL 2>&1
40-
if "%ERRORLEVEL%" == "0" goto init
41-
42-
echo.
43-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
44-
echo.
45-
echo Please set the JAVA_HOME variable in your environment to match the
46-
echo location of your Java installation.
47-
48-
goto fail
49-
50-
:findJavaFromJavaHome
51-
set JAVA_HOME=%JAVA_HOME:"=%
52-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
53-
54-
if exist "%JAVA_EXE%" goto init
55-
56-
echo.
57-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
58-
echo.
59-
echo Please set the JAVA_HOME variable in your environment to match the
60-
echo location of your Java installation.
61-
62-
goto fail
63-
64-
:init
65-
@rem Get command-line arguments, handling Windows variants
66-
67-
if not "%OS%" == "Windows_NT" goto win9xME_args
68-
69-
:win9xME_args
70-
@rem Slurp the command line arguments.
71-
set CMD_LINE_ARGS=
72-
set _SKIP=2
73-
74-
:win9xME_args_slurp
75-
if "x%~1" == "x" goto execute
76-
77-
set CMD_LINE_ARGS=%*
78-
79-
:execute
80-
@rem Setup the command line
81-
82-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
83-
84-
@rem Execute Gradle
85-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
86-
87-
:end
88-
@rem End local scope for the variables with windows NT shell
89-
if "%ERRORLEVEL%"=="0" goto mainEnd
90-
91-
:fail
92-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
93-
rem the _cmd.exe /c_ return code!
94-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
95-
exit /b 1
96-
97-
:mainEnd
98-
if "%OS%"=="Windows_NT" endlocal
99-
100-
:omega
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem http://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
17+
@if "%DEBUG%" == "" @echo off
18+
@rem ##########################################################################
19+
@rem
20+
@rem Gradle startup script for Windows
21+
@rem
22+
@rem ##########################################################################
23+
24+
@rem Set local scope for the variables with windows NT shell
25+
if "%OS%"=="Windows_NT" setlocal
26+
27+
set DIRNAME=%~dp0
28+
if "%DIRNAME%" == "" set DIRNAME=.
29+
set APP_BASE_NAME=%~n0
30+
set APP_HOME=%DIRNAME%
31+
32+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
34+
35+
@rem Find java.exe
36+
if defined JAVA_HOME goto findJavaFromJavaHome
37+
38+
set JAVA_EXE=java.exe
39+
%JAVA_EXE% -version >NUL 2>&1
40+
if "%ERRORLEVEL%" == "0" goto init
41+
42+
echo.
43+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
44+
echo.
45+
echo Please set the JAVA_HOME variable in your environment to match the
46+
echo location of your Java installation.
47+
48+
goto fail
49+
50+
:findJavaFromJavaHome
51+
set JAVA_HOME=%JAVA_HOME:"=%
52+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
53+
54+
if exist "%JAVA_EXE%" goto init
55+
56+
echo.
57+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
58+
echo.
59+
echo Please set the JAVA_HOME variable in your environment to match the
60+
echo location of your Java installation.
61+
62+
goto fail
63+
64+
:init
65+
@rem Get command-line arguments, handling Windows variants
66+
67+
if not "%OS%" == "Windows_NT" goto win9xME_args
68+
69+
:win9xME_args
70+
@rem Slurp the command line arguments.
71+
set CMD_LINE_ARGS=
72+
set _SKIP=2
73+
74+
:win9xME_args_slurp
75+
if "x%~1" == "x" goto execute
76+
77+
set CMD_LINE_ARGS=%*
78+
79+
:execute
80+
@rem Setup the command line
81+
82+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
83+
84+
@rem Execute Gradle
85+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
86+
87+
:end
88+
@rem End local scope for the variables with windows NT shell
89+
if "%ERRORLEVEL%"=="0" goto mainEnd
90+
91+
:fail
92+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
93+
rem the _cmd.exe /c_ return code!
94+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
95+
exit /b 1
96+
97+
:mainEnd
98+
if "%OS%"=="Windows_NT" endlocal
99+
100+
:omega

source/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
description = "Kafka Connect Source connector that reads from DynamoDB streams"
22

33
dependencies {
4-
implementation 'com.google.code.gson:gson:2.8.2'
4+
implementation 'com.google.code.gson:gson:2.8.9'
55
implementation 'com.amazonaws:aws-java-sdk-resourcegroupstaggingapi:1.11.551'
66
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
77

0 commit comments

Comments
 (0)