Skip to content

Commit 0c16fab

Browse files
build: upgrade Gradle
Signed-off-by: Andreas Reichel <andreas@manticore-projects.com> Signed-off-by: manticore-projects <andreas@manticore-projects.com>
1 parent 695af0b commit 0c16fab

File tree

1 file changed

+15
-19
lines changed

1 file changed

+15
-19
lines changed

build.gradle

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -150,19 +150,17 @@ dependencies {
150150
testImplementation 'commons-io:commons-io:2.+'
151151
testImplementation 'org.apache.commons:commons-text:+'
152152
testImplementation 'org.mockito:mockito-core:+'
153-
testImplementation 'org.assertj:assertj-core:+'
153+
testImplementation 'org.assertj:assertj-core:3.+'
154154
testImplementation 'org.hamcrest:hamcrest-core:+'
155155
testImplementation 'org.apache.commons:commons-lang3:+'
156156
testImplementation 'com.h2database:h2:+'
157-
158-
// for JaCoCo Reports
159157
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'
160-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.4'
161158
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.4'
162-
163-
// https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
164159
testImplementation 'org.mockito:mockito-junit-jupiter:5.18.0'
165160

161+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.4'
162+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.4'
163+
166164
// Performance Benchmark
167165
testImplementation 'org.openjdk.jmh:jmh-core:+'
168166
testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:+'
@@ -180,11 +178,9 @@ dependencies {
180178
javacc('org.javacc.generator:java:8.1.0-SNAPSHOT') { changing = true }
181179
}
182180
configurations.configureEach {
183-
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
184-
if (details.requested.group in ['org.javacc:core', 'org.javacc.generator']) {
185-
// Check for updates every build
186-
resolutionStrategy.cacheChangingModulesFor 30, 'seconds'
187-
}
181+
// Cache SNAPSHOT/changing modules for javacc for 30 seconds so updates are picked up quickly
182+
resolutionStrategy {
183+
cacheChangingModulesFor 30, 'seconds'
188184
}
189185
}
190186

@@ -220,18 +216,18 @@ javadoc {
220216
jar {
221217
manifest {
222218
attributes (
223-
"Automatic-Module-Name": "net.sf.jsqlparser"
219+
"Automatic-Module-Name": "net.sf.jsqlparser"
224220
)
225221
}
226222

227223
bundle {
228224
properties.empty()
229225
bnd(
230-
"Created-By": System.properties.get('user.name'),
231-
"Bundle-SymbolicName": "net.sf.jsqlparser",
232-
"Import-Package": "*",
233-
"Export-Package": "net.sf.jsqlparser.*",
234-
"Automatic-Module-Name": "net.sf.jsqlparser"
226+
"Created-By": System.properties.get('user.name'),
227+
"Bundle-SymbolicName": "net.sf.jsqlparser",
228+
"Import-Package": "*",
229+
"Export-Package": "net.sf.jsqlparser.*",
230+
"Automatic-Module-Name": "net.sf.jsqlparser"
235231
)
236232
}
237233

@@ -342,7 +338,7 @@ jacocoTestCoverageVerification {
342338

343339
//@todo: temporarily increased to 7000, we need to bring that down to 5500 after accepting the Keywords PR
344340
maximum = 20000
345-
}
341+
}
346342
excludes = [
347343
'net.sf.jsqlparser.util.validation.*',
348344
'net.sf.jsqlparser.**.*Adapter',
@@ -698,4 +694,4 @@ jmh {
698694
fork = 3
699695
iterations = 5
700696
timeOnIteration = '1s'
701-
}
697+
}

0 commit comments

Comments
 (0)