Skip to content

Commit a32538c

Browse files
authored
Merge pull request #336 from webauthn4j/use-constrains-to-define-dependency-versions
Use constraints block to define dependency versions
2 parents 3a86778 + e9b64b1 commit a32538c

File tree

1 file changed

+20
-18
lines changed

1 file changed

+20
-18
lines changed

build.gradle

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ apply plugin: 'org.asciidoctor.convert'
4747
group 'com.webauthn4j'
4848
version "${webAuthn4JSpringSecurityVersion}"
4949

50-
def sampleAppProjects = subprojects.findAll { ["fido-server-conformance-test-app", "spa", "spa-angular-client"].contains(it.name) };
51-
def webAuthn4JSpringSecurityLibraryProjects = subprojects.findAll { it.name.startsWith('webauthn4j-spring-security') }; ;
52-
def allJavaProjects = new HashSet();
50+
def sampleAppProjects = subprojects.findAll { ["fido-server-conformance-test-app", "spa", "spa-angular-client"].contains(it.name) }
51+
def webAuthn4JSpringSecurityLibraryProjects = subprojects.findAll { it.name.startsWith('webauthn4j-spring-security') }
52+
def allJavaProjects = new HashSet()
5353
allJavaProjects.addAll(webAuthn4JSpringSecurityLibraryProjects);
5454
allJavaProjects.addAll(sampleAppProjects);
5555

@@ -198,25 +198,27 @@ configure(allJavaProjects) {
198198
def webDriverManagerVersion = '3.8.1'
199199

200200
dependencies {
201+
constraints {
202+
// Independent libraries
203+
implementation("com.webauthn4j:webauthn4j-util:$webauthn4jVersion")
204+
implementation("com.webauthn4j:webauthn4j-core:$webauthn4jVersion")
205+
implementation("com.webauthn4j:webauthn4j-metadata:$webauthn4jVersion")
206+
implementation("com.webauthn4j:webauthn4j-test:$webauthn4jVersion")
207+
208+
// Independent libraries for Sample applications
209+
implementation("org.terasoluna.gfw:terasoluna-gfw-common:$terasolunaVersion")
210+
implementation("org.terasoluna.gfw:terasoluna-gfw-web:$terasolunaVersion")
211+
implementation("org.thymeleaf:thymeleaf-testing:$thymeleafVersion")
212+
implementation("org.modelmapper:modelmapper:$modelMapperVersion")
213+
implementation("org.lazyluke:log4jdbc-remix:$log4jdbcVersion")
214+
implementation("org.dbunit:dbunit:$dbunitVersion")
215+
implementation("com.github.springtestdbunit:spring-test-dbunit:$springTestDbunitVersion")
216+
implementation("io.github.bonigarcia:webdrivermanager:$webDriverManagerVersion")
217+
}
201218
// BOM
202219
implementation platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
203220
implementation platform("org.springframework.security:spring-security-bom:${springSecurityVersion}")
204221

205-
// Independent libraries
206-
implementation("com.webauthn4j:webauthn4j-util:$webauthn4jVersion")
207-
implementation("com.webauthn4j:webauthn4j-core:$webauthn4jVersion")
208-
implementation("com.webauthn4j:webauthn4j-metadata:$webauthn4jVersion")
209-
implementation("com.webauthn4j:webauthn4j-test:$webauthn4jVersion")
210-
211-
// Independent libraries for Sample applications
212-
implementation("org.terasoluna.gfw:terasoluna-gfw-common:$terasolunaVersion")
213-
implementation("org.terasoluna.gfw:terasoluna-gfw-web:$terasolunaVersion")
214-
implementation("org.thymeleaf:thymeleaf-testing:$thymeleafVersion")
215-
implementation("org.modelmapper:modelmapper:$modelMapperVersion")
216-
implementation("org.lazyluke:log4jdbc-remix:$log4jdbcVersion")
217-
implementation("org.dbunit:dbunit:$dbunitVersion")
218-
implementation("com.github.springtestdbunit:spring-test-dbunit:$springTestDbunitVersion")
219-
implementation("io.github.bonigarcia:webdrivermanager:$webDriverManagerVersion")
220222
}
221223

222224
check.dependsOn dependencyCheckAnalyze

0 commit comments

Comments
 (0)