Skip to content

Commit 244e594

Browse files
committed
Fix nohttp for custom whitelist.lines
Looks like we can't have a custom `whitelist.lines` in the `/checkstyle` dir. * Move `whitelist.lines` with the `http://www.jcraft.com` entry into the `/src/nohttp` * Upgrade `nohttp` to `0.0.3` * Revert `jsch` URL in the `sftp.adoc` * Upgrade to Micormeter-1.1.5
1 parent 153a748 commit 244e594

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
88
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
99
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.18'
10-
classpath 'io.spring.nohttp:nohttp-gradle:0.0.2.RELEASE'
10+
classpath 'io.spring.nohttp:nohttp-gradle:0.0.3.RELEASE'
1111
}
1212
}
1313

@@ -21,6 +21,7 @@ if (System.getenv('TRAVIS') || System.getenv('bamboo_buildKey')) {
2121
apply plugin: 'io.spring.nohttp'
2222

2323
nohttp {
24+
whitelistFile = file('src/nohttp/whitelist.lines')
2425
source.include '**/src/**'
2526
source.exclude '**/*.gif', '**/*.jpg', '**/*.png', '**/*.svg', '**/*.ks'
2627
}
@@ -134,7 +135,7 @@ subprojects { subproject ->
134135
kryoShadedVersion = '4.0.2'
135136
lettuceVersion = '5.1.7.RELEASE'
136137
log4jVersion = '2.11.2'
137-
micrometerVersion = '1.1.4'
138+
micrometerVersion = '1.1.5'
138139
mockitoVersion = '2.26.0'
139140
mysqlVersion = '8.0.16'
140141
pahoMqttClientVersion = '1.2.0'

src/checkstyle/whitelist.lines

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/nohttp/whitelist.lines

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
^http://www.jcraft.com.*

src/reference/asciidoc/sftp.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ You can configure the SFTP session factory with a regular bean definition, as th
6565
====
6666

6767
Every time an adapter requests a session object from its `SessionFactory`, a new SFTP session is created.
68-
Under the covers, the SFTP Session Factory relies on the https://github.com/is/jsch[JSch] library to provide the SFTP capabilities.
68+
Under the covers, the SFTP Session Factory relies on the http://www.jcraft.com/jsch[JSch] library to provide the SFTP capabilities.
6969

7070
However, Spring Integration also supports the caching of SFTP sessions.
7171
See <<sftp-session-caching>> for more information.

0 commit comments

Comments
 (0)