Skip to content

Commit e4a7d96

Browse files
committed
Bump Spring Boot to 3.4
1 parent 796b60c commit e4a7d96

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ task codeCoverageReport(type: JacocoReport) {
9090
,project('grpc-client-spring-boot-starter').sourceSets.main)
9191

9292
reports {
93-
xml.enabled true
93+
xml.required.set(true)
9494
xml.destination = new File(buildDir,"reports/jacoco/report.xml")
95-
html.enabled true
96-
csv.enabled false
95+
html.required.set(true)
96+
csv.required.set(true)
9797
}
9898
}
9999

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
grpcVersion=1.58.0
22

33

4-
springBootVersion=3.1.1
5-
springCloudVersion=2022.0.3
4+
springBootVersion=3.4.4
5+
springCloudVersion=2024.0.1
66

77
gradleErrorPronePluginVersion=3.0.1
88
errorProneVersion=2.16

gradle/wrapper/gradle-wrapper.jar

285 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015-2021 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
3232
# Busybox and similar reduced shells will NOT work, because this script
3333
# requires all of these POSIX shell features:
3434
# * functions;
35-
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36-
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37-
# * compound commands having a testable exit status, especially «case»;
38-
# * various built-in commands including «command», «set», and «ulimit».
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
3939
#
4040
# Important for patching:
4141
#

grpc-client-spring-boot-starter/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {
2929
}
3030

3131
task sourceJar(type: Jar) {
32-
classifier "sources"
32+
archiveClassifier.set("sources")
3333
from delombok
3434
}
3535

3636
task javadocJar(type: Jar, dependsOn: javadoc) {
37-
classifier "javadoc"
37+
archiveClassifier.set("javadoc")
3838
from javadoc.destinationDir
3939
}
4040

grpc-spring-boot-starter-demo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.lognet.springboot.grpc.gradle.ReactiveFeature
22

33
buildscript {
4-
ext.kotlin_version = '1.9.0'
4+
ext.kotlin_version = '1.9.10'
55
repositories {
66
mavenCentral()
77
}

grpc-spring-boot-starter/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ tasks.googleJavaFormat {
9696
}
9797
task sourceJar(type: Jar) {
9898
dependsOn(tasks.googleJavaFormat)
99-
classifier "sources"
99+
archiveClassifier.set("sources")
100100
from delombokOutputDir
101101
}
102102
javadoc {
103103
dependsOn tasks.googleJavaFormat
104104
source = delombokOutputDir
105105
}
106106
task javadocJar(type: Jar, dependsOn: javadoc) {
107-
classifier "javadoc"
107+
archiveClassifier.set("javadoc")
108108
from javadoc.destinationDir
109109
}
110110

grpc-spring-boot-starter/src/main/java/org/lognet/springboot/grpc/security/GrpcSecurityConfigurerAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.lognet.springboot.grpc.security.jwt.JwtAuthProviderFactory;
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.context.ApplicationContext;
8-
import org.springframework.security.config.annotation.ObjectPostProcessor;
8+
import org.springframework.security.config.ObjectPostProcessor;
99
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
1010
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
1111
import org.springframework.security.oauth2.jwt.JwtDecoder;

0 commit comments

Comments
 (0)