From 244e5942dfb89965c1cc8657daa4ece87d6af824 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Mon, 17 Jun 2019 16:55:37 -0400
Subject: [PATCH] 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
---
 build.gradle                     | 5 +++--
 src/checkstyle/whitelist.lines   | 1 -
 src/nohttp/whitelist.lines       | 1 +
 src/reference/asciidoc/sftp.adoc | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 src/checkstyle/whitelist.lines
 create mode 100644 src/nohttp/whitelist.lines

diff --git a/build.gradle b/build.gradle
index 1e5b8231f9..f9e7aca6c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 		classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
 		classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.18'
-		classpath 'io.spring.nohttp:nohttp-gradle:0.0.2.RELEASE'
+		classpath 'io.spring.nohttp:nohttp-gradle:0.0.3.RELEASE'
 	}
 }
 
@@ -21,6 +21,7 @@ if (System.getenv('TRAVIS') || System.getenv('bamboo_buildKey')) {
 	apply plugin: 'io.spring.nohttp'
 
 	nohttp {
+		whitelistFile = file('src/nohttp/whitelist.lines')
 		source.include '**/src/**'
 		source.exclude '**/*.gif', '**/*.jpg', '**/*.png', '**/*.svg', '**/*.ks'
 	}
@@ -134,7 +135,7 @@ subprojects { subproject ->
 		kryoShadedVersion = '4.0.2'
 		lettuceVersion = '5.1.7.RELEASE'
 		log4jVersion = '2.11.2'
-		micrometerVersion = '1.1.4'
+		micrometerVersion = '1.1.5'
 		mockitoVersion = '2.26.0'
 		mysqlVersion = '8.0.16'
 		pahoMqttClientVersion = '1.2.0'
diff --git a/src/checkstyle/whitelist.lines b/src/checkstyle/whitelist.lines
deleted file mode 100644
index 3ea5aac42a..0000000000
--- a/src/checkstyle/whitelist.lines
+++ /dev/null
@@ -1 +0,0 @@
-^\Qhttp://www.jcraft.com/jsch\E$
diff --git a/src/nohttp/whitelist.lines b/src/nohttp/whitelist.lines
new file mode 100644
index 0000000000..26fa6277ba
--- /dev/null
+++ b/src/nohttp/whitelist.lines
@@ -0,0 +1 @@
+^http://www.jcraft.com.*
diff --git a/src/reference/asciidoc/sftp.adoc b/src/reference/asciidoc/sftp.adoc
index f39e70d446..171d3e9431 100644
--- a/src/reference/asciidoc/sftp.adoc
+++ b/src/reference/asciidoc/sftp.adoc
@@ -65,7 +65,7 @@ You can configure the SFTP session factory with a regular bean definition, as th
 ====
 
 Every time an adapter requests a session object from its `SessionFactory`, a new SFTP session is created.
-Under the covers, the SFTP Session Factory relies on the https://github.com/is/jsch[JSch] library to provide the SFTP capabilities.
+Under the covers, the SFTP Session Factory relies on the http://www.jcraft.com/jsch[JSch] library to provide the SFTP capabilities.
 
 However, Spring Integration also supports the caching of SFTP sessions.
 See <<sftp-session-caching>> for more information.