Skip to content

Commit 1c88ba1

Browse files
artembilangaryrussell
authored andcommitted
Polishing for nohttp plugin
* Move the plugin and its task into the root project configuration * Add more image file extensions to exclude * Fix `sftp.adoc` do not use HTTP url for the JSCH library project page; use GitHub repo link instead
1 parent 703141b commit 1c88ba1

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

build.gradle

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,26 @@ buildscript {
66
dependencies {
77
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
88
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
9-
classpath "org.asciidoctor:asciidoctor-gradle-plugin:1.5.6"
10-
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
11-
classpath 'io.spring.nohttp:nohttp-gradle:0.0.1.RELEASE'
9+
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.18'
10+
classpath 'io.spring.nohttp:nohttp-gradle:0.0.2.RELEASE'
1211
}
1312
}
1413

1514
plugins {
16-
id 'org.sonarqube' version '2.7'
17-
id 'org.asciidoctor.convert' version '1.5.10'
15+
id 'org.sonarqube' version '2.7.1'
16+
id 'org.asciidoctor.convert' version '1.6.1'
1817
id 'org.ajoberstar.grgit' version '3.1.1'
1918
}
2019

20+
if (System.getenv('TRAVIS') || System.getenv('bamboo_buildKey')) {
21+
apply plugin: 'io.spring.nohttp'
22+
23+
nohttp {
24+
source.include '**/src/**'
25+
source.exclude '**/*.gif', '**/*.jpg', '**/*.png', '**/*.svg', '**/*.ks'
26+
}
27+
}
28+
2129
description = 'Spring Integration'
2230

2331
ext {
@@ -68,9 +76,6 @@ subprojects { subproject ->
6876
apply plugin: 'checkstyle'
6977
apply plugin: 'kotlin'
7078
apply plugin: 'kotlin-spring'
71-
if (System.getenv('TRAVIS') || System.getenv('bamboo_buildKey')) {
72-
apply plugin: 'io.spring.nohttp'
73-
}
7479

7580
sourceSets {
7681
test {
@@ -97,7 +102,7 @@ subprojects { subproject ->
97102
apacheSshdVersion = '2.2.0'
98103
aspectjVersion = '1.9.4'
99104
assertjVersion = '3.12.2'
100-
assertkVersion = '0.14'
105+
assertkVersion = '0.17'
101106
awaitilityVersion = '3.1.6'
102107
boonVersion = '0.34'
103108
commonsDbcp2Version = '2.6.0'
@@ -308,15 +313,7 @@ subprojects { subproject ->
308313

309314
checkstyle {
310315
configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
311-
toolVersion = "8.20"
312-
}
313-
314-
315-
if (System.getenv('TRAVIS') || System.getenv('bamboo_buildKey')) {
316-
nohttp {
317-
source.include 'src/**'
318-
source.exclude '**/*.gif', '**/*.ks'
319-
}
316+
toolVersion = "8.21"
320317
}
321318

322319
artifacts {

src/checkstyle/whitelist.lines

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
^\Qhttp://www.jcraft.com/jsch\E$

src/reference/asciidoc/sftp.adoc

Lines changed: 3 additions & 3 deletions
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 http://www.jcraft.com/jsch/[JSch] library to provide the SFTP capabilities.
68+
Under the covers, the SFTP Session Factory relies on the https://github.com/is/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.
@@ -99,7 +99,7 @@ The following list describes all the properties that are exposed by the https://
9999
It defaults to `false`.
100100

101101
`clientVersion`::Lets you set the client version property.
102-
It's default depends on the underlying JSch version but it will look like:_SSH-2.0-JSCH-0.1.45_
102+
It's default depends on the underlying JSch version but it will look like: _SSH-2.0-JSCH-0.1.45_
103103

104104
`enableDaemonThread`::If `true`, all threads are daemon threads.
105105
If set to `false`, normal non-daemon threads are used instead.
@@ -1349,7 +1349,7 @@ Its `cause` is another `PartialSuccessException` with `derivedInput` of `file2.t
13491349
[[sftp-jsch-logging]]
13501350
=== SFTP/JSCH Logging
13511351

1352-
Since we use JSch libraries (http://www.jcraft.com/jsch/) to provide SFTP support, you may at times require more information from the JSch API itself, especially if something is not working properly (such as authentication exceptions).
1352+
Since we use JSch libraries to provide SFTP support, you may at times require more information from the JSch API itself, especially if something is not working properly (such as authentication exceptions).
13531353
Unfortunately JSch does not use `commons-logging` but instead relies on custom implementations of their `com.jcraft.jsch.Logger` interface.
13541354
As of Spring Integration 2.0.1, we have implemented this interface.
13551355
So now, to enable JSch logging, you can configure your logger the way you usually do.

0 commit comments

Comments
 (0)