Skip to content

Commit d9fe25b

Browse files
committed
Merge branch '1.2.x'
2 parents 820115b + f1eaf0c commit d9fe25b

File tree

8 files changed

+11
-1251
lines changed

8 files changed

+11
-1251
lines changed

build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ buildscript {
1111
classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'
1212
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2'
1313
classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$javaFormatVersion"
14+
classpath 'io.spring.nohttp:nohttp-gradle:0.0.2.RELEASE'
1415
}
1516
}
1617

@@ -24,6 +25,7 @@ allprojects {
2425

2526
apply plugin: 'samples'
2627
apply plugin: 'org.sonarqube'
28+
apply plugin: 'io.spring.nohttp'
2729

2830
sonarqube {
2931
properties {
@@ -36,6 +38,14 @@ sonarqube {
3638
}
3739
}
3840

41+
nohttp {
42+
source.exclude 'samples/rest-notes-slate/slate/source/javascripts/lib/_jquery*.js'
43+
source.exclude 'buildSrc/.gradle/**'
44+
source.exclude '**/build/**'
45+
source.exclude '**/target/**'
46+
whitelistFile = project.file('config/nohttp/whitelist.lines')
47+
}
48+
3949
ext {
4050
springVersion = '5.0.5.RELEASE'
4151
javadocLinks = [

config/eclipse/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 411 deletions
This file was deleted.

config/eclipse/org.eclipse.jdt.ui.prefs

Lines changed: 0 additions & 125 deletions
This file was deleted.

config/nohttp/whitelist.lines

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
^http://rest-assured.io.*

0 commit comments

Comments
 (0)