Skip to content

Commit 7399618

Browse files
jyeminjyemin
committed
Revert "Build: Updated configs"
This reverts commit cc061ee.
1 parent c142cec commit 7399618

File tree

5 files changed

+29
-51
lines changed

5 files changed

+29
-51
lines changed

‎build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ buildscript {
2525
}
2626
dependencies {
2727
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3'
28-
classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.9"
28+
classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.5.0"
2929
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2'
3030

3131
// Scala plugins
@@ -151,7 +151,7 @@ configure(scalaProjects) {
151151

152152
spotless {
153153
scala {
154-
scalafmt('2.0.0').configFile("$configDir/scala/scalafmt.conf")
154+
scalafmt('2.0.0').configFile("$configDir/scalafmt.conf")
155155
}
156156
}
157157
compileScala.dependsOn('spotlessApply')
@@ -253,7 +253,7 @@ configure(javaCodeCheckedProjects) {
253253
testImplementation('org.junit.jupiter:junit-jupiter-params')
254254
testImplementation('org.junit.vintage:junit-vintage-engine')
255255

256-
testImplementation platform('org.spockframework:spock-bom:2.0-groovy-3.0')
256+
testImplementation platform('org.spockframework:spock-bom:2.0-groovy-2.5')
257257
testImplementation 'org.spockframework:spock-core'
258258
testImplementation 'org.spockframework:spock-junit4'
259259
testImplementation("org.mockito:mockito-core:3.8.0")
@@ -328,11 +328,13 @@ configure(javaCodeCheckedProjects) {
328328
}
329329

330330
checkstyle {
331-
toolVersion = "9.1"
331+
toolVersion = "7.4"
332+
configFile = new File(configDir, 'checkstyle.xml')
333+
configProperties.checkstyleConfigDir = configDir
332334
}
333335

334336
spotbugs {
335-
excludeFilter = new File(configDir, 'spotbugs/exclude.xml')
337+
excludeFilter = new File(configDir, 'findbugs-exclude.xml')
336338
}
337339

338340
codenarc {

‎config/checkstyle/suppressions.xml renamed to ‎config/checkstyle-exclude.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919
<!DOCTYPE suppressions PUBLIC
2020
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
2121
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
22+
2223
<suppressions>
23-
<!-- vendored code -->
24-
<suppress checks="[a-zA-Z0-9]*" files="com[\\/]mongodb[\\/]internal[\\/]connection[\\/]tlschannel[\\/]"/>
2524

26-
<!-- MongoDriverVersion (generated code) -->
27-
<suppress checks="[a-zA-Z0-9]*" files="com[\\/]mongodb[\\/]internal[\\/]build[\\/]MongoDriverVersion.java" />
25+
<suppress checks="[a-zA-Z0-9]*" files="com[\\/]mongodb[\\/]internal[\\/]connection[\\/]tlschannel[\\/]"/>
2826

2927
<suppress checks="MethodLength" files="QuickTour"/>
3028
<suppress checks="Regexp" files="Tour"/>
@@ -62,10 +60,6 @@
6260
<!--Do not check test classes -->
6361
<suppress checks="Javadoc*" files=".*test.*"/>
6462

65-
<!--Do not check tour / helpers classes -->
66-
<suppress checks="Javadoc*" files=".*tour.*"/>
67-
<suppress checks="Javadoc*" files=".*helpers.*"/>
68-
6963
<!--Do not check The GridFSTour -->
7064
<suppress checks="Regexp" files="GridFSTour"/>
7165
<suppress checks="MethodLength" files="GridFSTour"/>

‎config/checkstyle/checkstyle.xml renamed to ‎config/checkstyle.xml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,27 +78,21 @@
7878
<!-- <property name="fileExtensions" value="java"/> -->
7979
<!-- </module> -->
8080

81-
<!-- Checks for Size Violations. -->
82-
<!-- See http://checkstyle.sf.net/config_sizes.html -->
83-
<module name="LineLength">
84-
<property name="max" value="140"/>
85-
<property name="ignorePattern" value="^.*[(http://|https://)|{@see|{@link].*$"/>
86-
</module>
87-
8881
<module name="TreeWalker">
8982

9083
<!-- Checks for Javadoc comments. -->
9184
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
9285
<module name="JavadocType">
9386
<property name="scope" value="public"/>
9487
</module>
95-
<module name="JavadocStyle">
88+
<module name="JavadocMethod">
9689
<property name="scope" value="public"/>
97-
<property name="checkFirstSentence" value="false"/>
90+
<property name="allowUndeclaredRTE" value="true"/>
9891
</module>
9992
<!--<module name="JavadocVariable"/>-->
10093
<!--<module name="JavadocStyle"/>-->
10194

95+
10296
<!-- Checks for Naming Conventions. -->
10397
<!-- See http://checkstyle.sf.net/config_naming.html -->
10498
<module name="ConstantName"/>
@@ -120,6 +114,14 @@
120114
<module name="RedundantImport"/>
121115
<module name="UnusedImports"/>
122116

117+
118+
<!-- Checks for Size Violations. -->
119+
<!-- See http://checkstyle.sf.net/config_sizes.html -->
120+
<module name="LineLength">
121+
<property name="max" value="140"/>
122+
<property name="ignorePattern" value="^.*[(http://|https://)|{@see|{@link].*$"/>
123+
</module>
124+
123125
<module name="MethodLength"/>
124126
<module name="ParameterNumber">
125127
<property name="max" value="12"/>
@@ -197,6 +199,8 @@
197199
<!--<module name="TodoComment"/>-->
198200
<module name="UpperEll"/>
199201

202+
<module name="FileContentsHolder"/>
203+
200204
<!--System.out.println not allowed-->
201205
<module name="Regexp">
202206
<property name="format" value="System\.out\.println"/>
@@ -217,18 +221,16 @@
217221
<property name="illegalPattern" value="true"/>
218222
<property name="ignoreComments" value="true"/>
219223
</module>
220-
221-
<module name="SuppressionCommentFilter"/>
222-
<module name="SuppressionCommentFilter">
223-
<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
224-
<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
225-
<property name="checkFormat" value="$1"/>
226-
</module>
227-
224+
</module>
225+
<module name="SuppressionCommentFilter"/>
226+
<module name="SuppressionCommentFilter">
227+
<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
228+
<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
229+
<property name="checkFormat" value="$1"/>
228230
</module>
229231

230232
<module name="SuppressionFilter">
231-
<property name="file" value="${config_loc}/suppressions.xml"/>
233+
<property name="file" value="${checkstyleConfigDir}/checkstyle-exclude.xml"/>
232234
</module>
233235

234236
</module>

‎config/spotbugs/exclude.xml renamed to ‎config/findbugs-exclude.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,6 @@
2323
<Bug code="EI,EI2"/>
2424
</Match>
2525

26-
<Match>
27-
<Class name="org.bson.types.ObjectId"/>
28-
<Bug pattern="DMI_RANDOM_USED_ONLY_ONCE"/>
29-
</Match>
30-
31-
<Match>
32-
<Class name="com.mongodb.internal.connection.AwsAuthenticator$AwsSaslClient"/>
33-
<Bug pattern="DMI_RANDOM_USED_ONLY_ONCE"/>
34-
</Match>
35-
36-
<Match>
37-
<Class name="com.mongodb.internal.connection.ScramShaAuthenticator$DefaultRandomStringGenerator"/>
38-
<Bug pattern="DMI_RANDOM_USED_ONLY_ONCE"/>
39-
</Match>
40-
41-
<Match>
42-
<Class name="org.bson.codecs.BsonValueCodecProvider"/>
43-
<Method name="getBsonTypeClassMap"/>
44-
<Bug pattern="MS_EXPOSE_REP"/>
45-
</Match>
4626

4727
<!-- these specific issues are deliberate design decisions -->
4828

‎config/scala/scalafmt.conf renamed to ‎config/scalafmt.conf

File renamed without changes.

0 commit comments

Comments
 (0)