Skip to content

Commit

Permalink
upgrade to gradle 7.6
Browse files Browse the repository at this point in the history
  • Loading branch information
jaroldwong committed Jan 30, 2024
1 parent 5e2f93a commit 9055934
Show file tree
Hide file tree
Showing 6 changed files with 207 additions and 144 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM gradle:6.9-jdk8 AS builder
FROM gradle:7.6.3-jdk17 AS builder
USER root
WORKDIR /usr/src
COPY . .
RUN gradle build --no-daemon -x check -x test

FROM amazoncorretto:8-alpine-jre
FROM eclipse-temurin:17-jre-alpine
RUN apk --no-cache add fontconfig freetype font-dejavu
RUN apk --no-cache add openssl

Expand Down
60 changes: 30 additions & 30 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ repositories {
mavenCentral()
}

sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 17
targetCompatibility = 17

// Ensure environment variables are passed along
test {
Expand All @@ -38,34 +38,34 @@ test {
dependencies {
runtimeOnly("org.springframework.boot:spring-boot-properties-migrator")

compile("org.springframework.boot:spring-boot-starter-web")
compile("org.springframework.boot:spring-boot-starter-data-jpa")
compile("org.springframework.boot:spring-boot-starter-test")
compile("org.springframework.boot:spring-boot-starter-mail")
compile("org.springframework.boot:spring-boot-starter-validation")
compile("org.springframework.ldap:spring-ldap-ldif-core:2.3.2.RELEASE")
compile("io.jsonwebtoken:jjwt:0.9.0")
compile("commons-io:commons-io:2.6")
compile("org.springframework.security:spring-security-cas-client:3.0.8.RELEASE")
compile("org.hibernate:hibernate-validator-annotation-processor:5.2.5.Final")
compile("org.apache.poi:poi:3.17")
compile("org.apache.poi:poi-ooxml:3.17")
compile("javax.inject:javax.inject:1")
compile("ch.qos.logback:logback-core:1.2.3")
compile("ch.qos.logback:logback-classic:1.2.3")
compile("org.slf4j:slf4j-api:1.7.25")
compile("org.apache.commons:commons-lang3:3.7")
compile("javax.mail:mail:1.4.7")
compile("org.flywaydb:flyway-core:7.7.3")
compile("org.apache.httpcomponents:httpclient:4.5.9")
compile("org.javers:javers-core:2.4.1")
compile("javax.xml.bind:jaxb-api:2.3.1")
compile("com.amazonaws:aws-java-sdk-s3:1.12.187")
runtime("mysql:mysql-connector-java:8.0.33")
runtime("javax.annotation:javax.annotation-api:1.3.2")
testCompile("junit:junit")
testCompile("com.h2database:h2:1.4.199")
testCompile("com.jayway.jsonpath:json-path:2.4.0")
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
implementation("org.springframework.boot:spring-boot-starter-test")
implementation("org.springframework.boot:spring-boot-starter-mail")
implementation("org.springframework.boot:spring-boot-starter-validation")
implementation("org.springframework.ldap:spring-ldap-ldif-core:2.3.2.RELEASE")
implementation("io.jsonwebtoken:jjwt:0.9.0")
implementation("commons-io:commons-io:2.6")
implementation("org.springframework.security:spring-security-cas-client:3.0.8.RELEASE")
implementation("org.hibernate:hibernate-validator-annotation-processor:5.2.5.Final")
implementation("org.apache.poi:poi:3.17")
implementation("org.apache.poi:poi-ooxml:3.17")
implementation("javax.inject:javax.inject:1")
implementation("ch.qos.logback:logback-core:1.2.3")
implementation("ch.qos.logback:logback-classic:1.2.3")
implementation("org.slf4j:slf4j-api:1.7.25")
implementation("org.apache.commons:commons-lang3:3.7")
implementation("javax.mail:mail:1.4.7")
implementation("org.flywaydb:flyway-core:7.7.3")
implementation("org.apache.httpcomponents:httpclient:4.5.9")
implementation("org.javers:javers-core:2.4.1")
implementation("javax.xml.bind:jaxb-api:2.3.1")
implementation("com.amazonaws:aws-java-sdk-s3:1.12.187")
implementation("mysql:mysql-connector-java:8.0.33")
implementation("javax.annotation:javax.annotation-api:1.3.2")
testImplementation("junit:junit")
testImplementation("com.h2database:h2:1.4.199")
testImplementation("com.jayway.jsonpath:json-path:2.4.0")
}

task resolveDependencies {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 9055934

Please sign in to comment.