Skip to content

Commit

Permalink
#164 : Updated Gradle deps for JDK 21
Browse files Browse the repository at this point in the history
* Also bump to latest Boot patch version.
* Fix SpotBugs whine.
  • Loading branch information
gazbert committed Apr 20, 2024
1 parent a301de1 commit 0d36c2b
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v2
with:
java-version: '17'
java-version: '21'
distribution: 'adopt'
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
Expand Down
36 changes: 18 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ buildscript {
}

dependencies {
classpath('io.spring.gradle:dependency-management-plugin:1.1.3')
classpath('org.springframework.boot:spring-boot-gradle-plugin:3.1.3')
classpath('io.spring.gradle:dependency-management-plugin:1.1.4')
classpath('org.springframework.boot:spring-boot-gradle-plugin:3.1.11')
}
}

plugins {
id 'org.sonarqube' version '4.3.1.3277' // https://plugins.gradle.org/plugin/org.sonarqube
id 'org.sonarqube' version '5.0.0.4638' // https://plugins.gradle.org/plugin/org.sonarqube
id 'jacoco'
id 'com.github.spotbugs' version '5.1.3' // https://plugins.gradle.org/plugin/com.github.spotbugs
id 'com.github.spotbugs' version '5.2.5' // https://plugins.gradle.org/plugin/com.github.spotbugs
}

buildScan {
Expand All @@ -23,11 +23,11 @@ buildScan {
}

ext.versions = [
springBootVersion : '3.1.3',
springCloudVersion : '4.0.4',
springBootVersion : '3.1.11',
springCloudVersion : '4.0.5',

// Should be same as dependency used by springBootVersion
springCoreVersion : '6.0.11',
springCoreVersion : '6.0.19',

hibernateVaildatorVersion: '8.0.1.Final',
jjwtVersion : '0.11.5'
Expand Down Expand Up @@ -62,20 +62,20 @@ ext.libraries = [
jjwt_impl : dependencies.create("io.jsonwebtoken:jjwt-impl:" + ext.versions.jjwtVersion),
jjwt_jackson : dependencies.create("io.jsonwebtoken:jjwt-jackson:" + ext.versions.jjwtVersion),

google_guava : dependencies.create("com.google.guava:guava:32.1.2-jre"),
google_guava : dependencies.create("com.google.guava:guava:33.1.0-jre"),
google_gson : dependencies.create("com.google.code.gson:gson:2.10.1"),
h2 : dependencies.create("com.h2database:h2:2.2.222"),
h2 : dependencies.create("com.h2database:h2:2.2.224"),

jakarta_mail_api : dependencies.create("jakarta.mail:jakarta.mail-api:2.1.2"),
jakarta_mail_sun : dependencies.create("org.eclipse.angus:angus-mail:2.0.2"),
jakarta_mail_api : dependencies.create("jakarta.mail:jakarta.mail-api:2.1.3"),
jakarta_mail_sun : dependencies.create("org.eclipse.angus:angus-mail:2.0.3"),

jakarta_xml_api : dependencies.create("jakarta.xml.bind:jakarta.xml.bind-api:4.0.2"),

snake_yaml : dependencies.create("org.yaml:snakeyaml:1.33"),

springdoc_openapi_ui : dependencies.create("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0"),

lombok : dependencies.create("org.projectlombok:lombok:1.18.20"),
lombok : dependencies.create("org.projectlombok:lombok:1.18.32"),

validation_api : dependencies.create("jakarta.validation:jakarta.validation-api:3.0.2"),
hibernate_validator : dependencies.create("org.hibernate.validator:hibernate-validator:" + ext.versions.hibernateVaildatorVersion),
Expand All @@ -86,13 +86,13 @@ ext.libraries = [
easymock : dependencies.create("org.easymock:easymock:5.2.0"),

// JUnit 4 still as Powermock does not play with Junit 5: https://github.com/powermock/powermock/issues/929
junit_vintage_engine : dependencies.create("org.junit.vintage:junit-vintage-engine:5.10.0"),
junit_vintage_engine : dependencies.create("org.junit.vintage:junit-vintage-engine:5.10.2"),

spring_boot_starter_test : dependencies.create("org.springframework.boot:spring-boot-starter-test:" + ext.versions.springBootVersion) {
exclude module: "spring-boot-starter-logging"
},
spring_security_test : dependencies.create("org.springframework.security:spring-security-test:6.1.3"),
awaitility : dependencies.create("org.awaitility:awaitility:4.2.0")
spring_security_test : dependencies.create("org.springframework.security:spring-security-test:6.1.8"),
awaitility : dependencies.create("org.awaitility:awaitility:4.2.1")
]

allprojects {
Expand All @@ -117,8 +117,8 @@ subprojects {

apply plugin: 'java'

sourceCompatibility = 1.17
targetCompatibility = 1.17
sourceCompatibility = 1.21
targetCompatibility = 1.21

repositories {
mavenCentral()
Expand Down Expand Up @@ -151,7 +151,7 @@ subprojects {
}

jacoco {
toolVersion = "0.8.9" // https://docs.gradle.org/current/userguide/jacoco_plugin.html
toolVersion = "0.8.11" // https://docs.gradle.org/current/userguide/jacoco_plugin.html
}
jacocoTestReport {
reports {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ private void initialise() {
final String errorMsg =
"Failed to initialise Email Alerter. "
+ "Alerts are enabled but no SMTP Config has been supplied in config.";
throw new IllegalStateException(errorMsg);
log.error(errorMsg);
}

log.info("SMTP host: " + smtpConfig.getHost());
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
<revision>2.2.0-SNAPSHOT</revision>

<!-- Should be same as dependency used by spring-boot-starter.version -->
<spring-core.version>6.0.18</spring-core.version>
<spring-core.version>6.0.19</spring-core.version>

<jjwt.version>0.11.5</jjwt.version>
<powermock.version>2.0.9</powermock.version>
<spring-boot-starter.version>3.1.10</spring-boot-starter.version>
<spring-boot-starter.version>3.1.11</spring-boot-starter.version>
<checkstlye.version>3.3.1</checkstlye.version>
<spotbugs.version>4.8.4.0</spotbugs.version>
<hibernate-vaildator.version>8.0.1.Final</hibernate-vaildator.version>
Expand All @@ -61,7 +61,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.10</version>
<version>3.1.11</version>
</parent>
<profiles>
<profile>
Expand Down

0 comments on commit 0d36c2b

Please sign in to comment.