From 9be3f3b3becbf31170fdd113aceefbceef2f8cec Mon Sep 17 00:00:00 2001 From: Cyrus <24922493+cyrus-dev@users.noreply.github.com> Date: Tue, 7 Mar 2023 09:23:55 -0500 Subject: [PATCH] Update the build.gradle and settings.gradle files [no-ci] --- HIRS_AttestationCA/build.gradle | 21 +++++++++------------ HIRS_AttestationCAPortal/build.gradle | 8 ++++---- HIRS_Utils/build.gradle | 21 +++++++++++---------- settings.gradle | 18 ++++++++++++++---- 4 files changed, 38 insertions(+), 30 deletions(-) diff --git a/HIRS_AttestationCA/build.gradle b/HIRS_AttestationCA/build.gradle index 1b68e194..dd39cbb5 100644 --- a/HIRS_AttestationCA/build.gradle +++ b/HIRS_AttestationCA/build.gradle @@ -26,18 +26,15 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa:3.0.1' - implementation 'commons-codec:commons-codec:1.15' - implementation 'com.eclipsesource.minimal-json:minimal-json:0.9.5' - implementation 'com.google.guava:guava:31.1-jre' - implementation 'org.apache.commons:commons-lang3:3.12.0' - - implementation 'org.bouncycastle:bcmail-jdk15on:1.70' - implementation 'jakarta.persistence:jakarta.persistence-api:3.1.0' -// implementation libs.jackson_core -// implementation libs.jackson_databind - implementation 'com.fasterxml.jackson.core:jackson-core:2.14.2' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' + implementation libs.bouncycastle + implementation libs.commons.codec + implementation libs.commons.lang3 + implementation libs.jakarta.api + implementation libs.jakarta.xml + implementation libs.guava + implementation libs.jackson.core + implementation libs.jackson.databind + implementation libs.minimal.json implementation 'org.apache.logging.log4j:log4j-core:2.19.0' implementation 'org.apache.logging.log4j:log4j-api:2.19.0' diff --git a/HIRS_AttestationCAPortal/build.gradle b/HIRS_AttestationCAPortal/build.gradle index 48af0696..01ec1516 100644 --- a/HIRS_AttestationCAPortal/build.gradle +++ b/HIRS_AttestationCAPortal/build.gradle @@ -28,10 +28,10 @@ dependencies { implementation project(':HIRS_Utils') implementation project(':HIRS_AttestationCA') - implementation 'com.github.marandus:pci-ids:0.3' - implementation 'org.bouncycastle:bcmail-jdk15on:1.70' - implementation 'com.google.guava:guava:31.1-jre' - implementation 'org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.0' + implementation libs.pci + implementation libs.bouncycastle + implementation libs.guava + implementation libs.jakarta.servlet implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-validation' diff --git a/HIRS_Utils/build.gradle b/HIRS_Utils/build.gradle index 80198c60..6d8ff8f3 100644 --- a/HIRS_Utils/build.gradle +++ b/HIRS_Utils/build.gradle @@ -22,20 +22,21 @@ configurations { } dependencies { - implementation 'org.bouncycastle:bcmail-jdk15on:1.70' - implementation 'com.google.guava:guava:31.1-jre' - implementation 'commons-codec:commons-codec:1.15' - implementation 'org.apache.commons:commons-lang3:3.12.0' + implementation libs.bouncycastle + implementation libs.lombok + implementation libs.jackson.core + implementation libs.jackson.databind + implementation libs.jakarta.api + implementation libs.jakarta.xml + implementation libs.guava + implementation libs.commons.codec + implementation libs.commons.lang3 + implementation libs.minimal.json + implementation 'org.apache.logging.log4j:log4j-core:2.19.0' implementation 'org.apache.logging.log4j:log4j-api:2.19.0' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' - implementation 'jakarta.persistence:jakarta.persistence-api:3.1.0' - implementation 'com.eclipsesource.minimal-json:minimal-json:0.9.5' - implementation 'com.fasterxml.jackson.core:jackson-core:2.14.2' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2' implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.1' compileOnly libs.lombok - implementation libs.lombok annotationProcessor libs.lombok testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0' diff --git a/settings.gradle b/settings.gradle index 0ae7a3d5..dcd004a9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,10 +9,20 @@ dependencyResolutionManagement { libs { version('springboot', '3.0.1') version('jackson', '2.14.2') - library('common-lang3', 'org.apache.commons:commons-lang3:3.12.0') - library('jackson-core', 'com.fasterxml.jackson.core', 'jackson-core').version('jackson') - library('jackson-databind', 'com.fasterxml.jackson.core', 'jackson-databind').version('jackson') - library('spring-datajpa', 'org.springframework.boot', 'spring-boot-starter-data-jpa').version('springboot') + library('commons-codec', 'commons-codec:commons-codec:1.15') + library('commons-lang3', 'org.apache.commons:commons-lang3:3.12.0') + library('bouncycastle', 'org.bouncycastle:bcmail-jdk15on:1.70') + library('guava', 'com.google.guava:guava:31.1-jre') + library('minimal-json', 'com.eclipsesource.minimal-json:minimal-json:0.9.5') + library('jakarta-servlet', 'org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.0') + library('jakarta-api', 'jakarta.persistence:jakarta.persistence-api:3.1.0') + library('jakarta-xml', 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0') + library('jackson-core', 'com.fasterxml.jackson.core', 'jackson-core').versionRef('jackson') + library('jackson-databind', 'com.fasterxml.jackson.core', 'jackson-databind').versionRef('jackson') + library('pci', 'com.github.marandus:pci-ids:0.3') +// library('spring-datajpa', 'org.springframework.boot', 'spring-boot-starter-data-jpa').version('springboot') +// library('spring-datajpa', 'org.springframework.boot', 'spring-boot-starter-web').version('springboot') +// library('spring-datajpa', 'org.springframework.boot', 'spring-boot-starter-validation').version('springboot') library('lombok', 'org.projectlombok:lombok:1.18.26') } }