Skip to content

Commit 1edd9e2

Browse files
Bruce Irschickbirschick-bq
andauthored
Revert "[AD-976] Implement single-instance SSH Tunnel. (#436)" (#447)
* Revert "[AD-976] Implement single-instance SSH Tunnel. (#436)" * Commit Code Coverage Badge Co-authored-by: birschick-bq <[email protected]>
1 parent e4bb011 commit 1edd9e2

30 files changed

+466
-3092
lines changed

.github/badges/branches.svg

Lines changed: 1 addition & 1 deletion
Loading

.github/badges/jacoco.svg

Lines changed: 1 addition & 1 deletion
Loading

NOTICE

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,12 +348,12 @@ Package Artifact: https://repo.maven.apache.org/maven2/com/google/protobuf/proto
348348
Package Artifact: https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.6.1/protobuf-java-3.6.1-sources.jar
349349
Package Artifact: https://github.com/google/protobuf.git
350350
-----------------------
351-
Package ID: com.github.mwiede:jsch:0.2.4
352-
Package Homepage: https://github.com/mwiede/jsch
351+
Package ID: com.jcraft:jsch:0.1.55
352+
Package Homepage: http://www.jcraft.com/jsch/
353353
Package SPDX-License-Identifier: BSD-3-Clause
354-
Package Artifact: https://repo.maven.org/maven2/com/github/mwiede/jsch/0.2.4/jsch-0.2.4.jar
355-
Package Artifact: https://repo.maven.org/maven2/com/github/mwiede/jsch/0.2.4/jsch-0.2.4-sources.jar
356-
Package Artifact: https://github.com/mwiede/jsch.git
354+
Package Artifact: https://repo.maven.apache.org/maven2/com/jcraft/jsch/0.1.55/jsch-0.1.55.jar
355+
Package Artifact: https://repo.maven.apache.org/maven2/com/jcraft/jsch/0.1.55/jsch-0.1.55-sources.jar
356+
Package Artifact: http://git.jcraft.com/jsch.git
357357
-----------------------
358358
Package ID: org.codehaus.janino:commons-compiler:3.1.6
359359
Package Homepage: http://janino-compiler.github.io/commons-compiler/
@@ -16570,7 +16570,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1657016570
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1657116571
-----------------------
1657216572

16573-
github.com/mwiede/jsch/0.2.4 LICENSE
16573+
com.jcraft/jsch/0.1.55 LICENSE
1657416574

1657516575
JSch 0.0.* was released under the GNU LGPL license. Later, we have switched
1657616576
over to a BSD-style license.

build.gradle

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'com.github.spotbugs' version '5.0.13'
3+
id 'com.github.spotbugs' version '5.0.10'
44
id 'checkstyle'
55
id 'jacoco'
66
id 'com.github.hierynomus.license' version '0.16.1'
@@ -145,32 +145,24 @@ spotbugsMain {
145145
// Configure HTML report
146146
reports {
147147
xml {
148-
required.set(true)
148+
enabled = true
149149
destination = file("$buildDir/reports/spotbugs/main.xml")
150150
}
151-
html {
152-
required.set(true)
153-
destination = file("$buildDir/reports/spotbugs/main.html")
154151
}
155-
}
156152
}
157153
spotbugsTest {
158154
// Configure HTML report
159155
reports {
160156
xml {
161-
required.set(true)
157+
enabled = true
162158
destination = file("$buildDir/reports/spotbugs/test.xml")
163159
}
164-
html {
165-
required.set(true)
166-
destination = file("$buildDir/reports/spotbugs/test.html")
167160
}
168-
}
169161
}
170162

171163
task checkSpotBugsMainReport {
172164
doLast {
173-
def xmlReport = spotbugsMain.reports.getByName("xml")
165+
def xmlReport = spotbugsMain.reports.getByName("XML")
174166
def slurped = new groovy.xml.XmlSlurper().parse(xmlReport.destination)
175167
def bugsFound = slurped.BugInstance.size()
176168
slurped.BugInstance.each {
@@ -187,7 +179,7 @@ task checkSpotBugsMainReport {
187179

188180
task checkSpotBugsTestReport {
189181
doLast {
190-
def xmlReport = spotbugsTest.reports.getByName("xml")
182+
def xmlReport = spotbugsTest.reports.getByName("XML")
191183
def slurped = new XmlSlurper().parse(xmlReport.destination)
192184
def bugsFound = slurped.BugInstance.size()
193185
slurped.BugInstance.each {
@@ -326,18 +318,18 @@ dependencies {
326318
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.14.1'
327319
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-guava', version: '2.14.1'
328320
implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre'
329-
implementation group: 'org.slf4j', name: 'slf4j-log4j12', version: '2.0.4'
321+
implementation group: 'org.slf4j', name: 'slf4j-log4j12', version: '2.0.3'
330322
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
331323
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.19.0'
332324
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.19.0'
333-
implementation group: 'org.mongodb', name: 'mongodb-driver-sync', version: '4.8.0'
334-
implementation group: 'com.github.mwiede', name: 'jsch', version: '0.2.4'
325+
implementation group: 'org.mongodb', name: 'mongodb-driver-sync', version: '4.7.2'
326+
implementation group: 'com.jcraft', name: 'jsch', version: '0.1.55'
335327
implementation group: 'org.apache.calcite', name: 'calcite-core', version: '1.32.0'
336328
implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
337-
implementation 'io.github.hakky54:sslcontext-kickstart:7.4.8'
329+
implementation 'io.github.hakky54:sslcontext-kickstart:7.4.7'
338330

339331
compileOnly group: 'org.immutables', name: 'value', version: '2.9.2'
340-
compileOnly group: 'com.puppycrawl.tools', name: 'checkstyle', version: '10.4'
332+
compileOnly group: 'com.puppycrawl.tools', name: 'checkstyle', version: '10.3.4'
341333
compileOnly 'org.projectlombok:lombok:1.18.24'
342334
annotationProcessor 'org.projectlombok:lombok:1.18.24'
343335

@@ -347,18 +339,18 @@ dependencies {
347339
testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.24'
348340
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.9.1'
349341
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.1'
350-
testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.9.0'
351-
testRuntimeOnly group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '3.5.2'
342+
testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.8.0'
343+
testRuntimeOnly group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '3.5.1'
352344
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-api:5.9.1'
353345
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
354346
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.1'
355347

356348
spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0'
357349

358-
testFixturesCompileOnly group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '3.5.2'
350+
testFixturesCompileOnly group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '3.4.11'
359351
testFixturesCompileOnly 'org.junit.jupiter:junit-jupiter-api:5.9.1'
360352
testFixturesImplementation group: 'com.google.guava', name: 'guava', version: '29.0-jre'
361-
testFixturesImplementation group: 'org.mongodb', name: 'mongodb-driver-sync', version: '4.8.0'
353+
testFixturesImplementation group: 'org.mongodb', name: 'mongodb-driver-sync', version: '4.7.2'
362354
testFixturesImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.2'
363355
testFixturesImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.2'
364356
}

config/spotbugs/spotbugs-exclude.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,14 @@
9090
<Bug pattern="ODR_OPEN_DATABASE_RESOURCE"/>
9191
</Match>
9292
<Match>
93-
<Or>
94-
<Source name="Driver.java"/>
95-
<Source name="DocumentDbSshTunnelServer.java"/>
96-
</Or>
93+
<Source name="Driver.java"/>
9794
<Bug pattern="COMMAND_INJECTION"/>
9895
</Match>
9996
<Match>
10097
<Or>
10198
<Source name="DocumentDbConnectionProperties.java"/>
10299
<Source name="DocumentDbConnectionPropertiesTest.java"/>
103100
<Source name="DocumentDbMain.java"/>
104-
<Source name="DocumentDbSshTunnelLock.java"/>
105-
<Source name="DocumentDbSshTunnelServer.java"/>
106-
<Source name="DocumentDbSshTunnelService.java"/>
107101
</Or>
108102
<Bug pattern="PATH_TRAVERSAL_IN"/>
109103
</Match>

0 commit comments

Comments
 (0)