Skip to content

Commit

Permalink
Updated dependencies to address major CVEs
Browse files Browse the repository at this point in the history
- updated LICENSE and NOTICE files accordingly
- updated sub-module links
  • Loading branch information
sumwale committed Jun 11, 2022
1 parent be8d170 commit bd4e584
Show file tree
Hide file tree
Showing 9 changed files with 148 additions and 709 deletions.
657 changes: 65 additions & 592 deletions LICENSE

Large diffs are not rendered by default.

169 changes: 65 additions & 104 deletions NOTICE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion aqp
15 changes: 8 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,14 @@ buildscript {
classpath 'de.undercouch:gradle-download-task:3.4.3'
classpath 'net.rdrei.android.buildtimetracker:gradle-plugin:0.11.+'
classpath 'com.netflix.nebula:gradle-ospackage-plugin:5.2.+'
// classpath 'org.owasp:dependency-check-gradle:6.5.3'
classpath 'org.owasp:dependency-check-gradle:7.1.0.1'
}
}

apply plugin: 'wrapper'
apply plugin: 'distribution'
apply plugin: 'nebula.ospackage-base'
apply plugin: "nebula.ospackage"
// apply plugin: 'org.owasp.dependencycheck'

// def isEnterpriseProduct = rootProject.hasProperty('snappydata.enterprise')

Expand Down Expand Up @@ -70,6 +69,7 @@ allprojects {
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'idea'
apply plugin: "build-time-tracker"
apply plugin: 'org.owasp.dependencycheck'

group = 'io.snappydata'
version = '1.3.1'
Expand Down Expand Up @@ -112,7 +112,7 @@ allprojects {
snappySparkMetricsLibVersion = '2.0.0.1'
log4j2Version = '2.17.2'
slf4jVersion = '1.7.32'
junitVersion = '4.12'
junitVersion = '4.13.2'
mockitoVersion = '1.10.19'
hadoopVersion = '3.2.0'
awsSdkVersion = '1.11.375'
Expand All @@ -126,8 +126,8 @@ allprojects {
fastutilVersion = '8.5.6'
kryoVersion = '4.0.1'
thriftVersion = '0.9.3'
jacksonVersion = '2.13.1'
jacksonDatabindVersion = '2.13.1'
jacksonVersion = '2.13.3'
jacksonDatabindVersion = '2.13.3'
hiveVersion = '1.21.2.7.0.3.2-3'
metricsVersion = '4.0.3'
metrics2Version = '2.2.0'
Expand All @@ -140,6 +140,7 @@ allprojects {
objenesisVersion = '3.0.1'
rabbitMqVersion = '4.9.1'
akkaVersion = '2.3.16'
nettyAkkaVersion = '3.10.6.Final'
sprayVersion = '1.3.4'
sprayJsonVersion = '1.3.5'
sprayShapelessVersion = '1.3.3'
Expand All @@ -148,7 +149,7 @@ allprojects {
jodaTimeVersion = '2.10.1'
slickVersion = '2.1.0'
h2Version = '1.3.176'
commonsIoVersion = '2.6'
commonsIoVersion = '2.11.0'
commonsPoolVersion = '1.6'
dbcpVersion = '1.4'
shiroVersion = '1.2.6'
Expand Down Expand Up @@ -990,7 +991,7 @@ gradle.taskGraph.whenReady { graph ->
Set<String> skipPublishFor = [
'snappydata_' + scalaBinaryVersion, 'snappy-spark', 'snappy-store',
'snappy-dtests_' + scalaBinaryVersion, 'snappy-compatibility-tests_' + scalaBinaryVersion,
'snappydata-native', 'snappydata-store-prebuild',
'gemfire-junit', 'snappydata-native', 'snappydata-store-prebuild',
'snappy-spark-assembly_' + scalaBinaryVersion
]

Expand Down
6 changes: 5 additions & 1 deletion cluster/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,11 @@ dependencies {
//exclude(group: 'org.scala-lang', module: 'scala-library')
//exclude(group: 'org.apache.avro', module: 'avro')
}
compile(group:'com.google.cloud.bigdataoss', name:'gcs-connector', version: gcsHadoop3ConnectorVersion, classifier: 'shaded')
compile(group:'com.google.cloud.bigdataoss', name:'gcs-connector', version: gcsHadoop3ConnectorVersion, classifier: 'shaded') {
// shaded jar includes all dependencies but the pom still lists all dependencies as per
// the non-shaded jar, so skip all dependencies explicitly
transitive = false
}

testCompile project(':dunit')
testCompile "org.eclipse.collections:eclipse-collections:${eclipseCollectionsVersion}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ trait SnappyJobTestSupport extends Logging {
* exceeds specified time, the method will throw exception.
*/
def submitAndWaitForCompletion(classFullName: String, jobCmdAffix: String = "",
waitTimeMillis: Int = 60000): Unit = {
waitTimeMillis: Int = 120000): Unit = {
val consoleLog: String = submitJob(classFullName, jobCmdAffix)
logInfo("Job submission response:" + consoleLog)
val jobId = getJobId(consoleLog)
Expand Down
2 changes: 1 addition & 1 deletion spark
Submodule spark updated from cba053 to 0169c3
2 changes: 1 addition & 1 deletion spark-jobserver
Submodule spark-jobserver updated 1 files
+1 −1 build.gradle

0 comments on commit bd4e584

Please sign in to comment.