Skip to content

Commit 9eba7a7

Browse files
authored
upgrade gradle and dependencies (#1622)
Signed-off-by: Bala.FA <[email protected]>
1 parent 5094310 commit 9eba7a7

File tree

6 files changed

+47
-54
lines changed

6 files changed

+47
-54
lines changed

api/src/main/java/io/minio/org/apache/commons/validator/routines/InetAddressValidator.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package io.minio.org.apache.commons.validator.routines;
1919

20-
import java.io.Serializable;
2120
import java.util.ArrayList;
2221
import java.util.Arrays;
2322
import java.util.List;
@@ -39,7 +38,7 @@
3938
* @version $Revision$
4039
* @since Validator 1.4
4140
*/
42-
public class InetAddressValidator implements Serializable {
41+
public class InetAddressValidator {
4342

4443
private static final int IPV4_MAX_OCTET_VALUE = 255;
4544

@@ -63,6 +62,8 @@ public class InetAddressValidator implements Serializable {
6362
/** IPv4 RegexValidator. */
6463
private final RegexValidator ipv4Validator = new RegexValidator(IPV4_REGEX);
6564

65+
private InetAddressValidator() {}
66+
6667
/**
6768
* Returns the singleton instance of this validator.
6869
*

build.gradle

+36-49
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,20 @@
1515
*/
1616

1717
/********************************/
18-
/* gradleVersion = '8.10.2' */
18+
/* gradleVersion = '8.12.1' */
1919
/********************************/
2020

2121
plugins {
2222
id "com.github.johnrengelman.shadow" version "8.1.1"
23-
id "com.github.spotbugs" version "5.2.1"
24-
id "io.codearte.nexus-staging" version "0.30.0"
25-
id "de.marcphilipp.nexus-publish" version "0.4.0"
23+
id "com.github.spotbugs" version "6.1.3"
24+
id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
2625
id "com.diffplug.spotless" version "6.13.0"
2726
}
2827

2928
/*
3029
* Root project definitions
3130
*/
32-
apply plugin: 'io.codearte.nexus-staging'
33-
apply plugin: "de.marcphilipp.nexus-publish"
31+
apply plugin: 'io.github.gradle-nexus.publish-plugin'
3432

3533
allprojects {
3634
group = 'io.minio'
@@ -52,14 +50,14 @@ subprojects {
5250

5351
dependencies {
5452
api "com.carrotsearch.thirdparty:simple-xml-safe:2.7.1"
55-
api "com.google.guava:guava:33.3.1-jre"
53+
api "com.google.guava:guava:33.4.0-jre"
5654
api "com.squareup.okhttp3:okhttp:4.12.0"
57-
api "com.fasterxml.jackson.core:jackson-annotations:2.18.0"
58-
api "com.fasterxml.jackson.core:jackson-core:2.18.0"
59-
api "com.fasterxml.jackson.core:jackson-databind:2.18.0"
60-
api "org.bouncycastle:bcprov-jdk18on:1.78.1"
55+
api "com.fasterxml.jackson.core:jackson-annotations:2.18.2"
56+
api "com.fasterxml.jackson.core:jackson-core:2.18.2"
57+
api "com.fasterxml.jackson.core:jackson-databind:2.18.2"
58+
api "org.bouncycastle:bcprov-jdk18on:1.80"
6159
api "org.apache.commons:commons-compress:1.27.1"
62-
api "commons-codec:commons-codec:1.17.1"
60+
api "commons-codec:commons-codec:1.18.0"
6361
api "org.xerial.snappy:snappy-java:1.1.10.7"
6462
compileOnly "com.github.spotbugs:spotbugs-annotations:4.8.6"
6563

@@ -74,8 +72,8 @@ subprojects {
7472
}
7573

7674
spotbugs {
77-
effort = "max"
78-
reportLevel = "low"
75+
effort = com.github.spotbugs.snom.Effort.MAX
76+
reportLevel = com.github.spotbugs.snom.Confidence.values()[0]
7977
excludeFilter = file("$rootDir/spotbugs-filter.xml")
8078
}
8179

@@ -93,9 +91,9 @@ subprojects {
9391
// Show stacktrace on test failure than opening in web browser.
9492
testLogging {
9593
exceptionFormat = 'full'
96-
showExceptions true
97-
showCauses true
98-
showStackTraces true
94+
showExceptions = true
95+
showCauses = true
96+
showStackTraces = true
9997
}
10098
}
10199

@@ -104,13 +102,16 @@ subprojects {
104102
System.setProperty('user.language', 'de')
105103
System.setProperty('user.country', 'DE')
106104
systemProperties = System.properties
105+
classpath = testing.suites.test.sources.runtimeClasspath
107106
dependsOn test
108107
}
109108

110109
check.dependsOn localeTest
111110

112-
sourceCompatibility = JavaVersion.VERSION_1_8
113-
targetCompatibility = JavaVersion.VERSION_1_8
111+
java {
112+
sourceCompatibility = JavaVersion.VERSION_1_8
113+
targetCompatibility = JavaVersion.VERSION_1_8
114+
}
114115

115116
spotless {
116117
java {
@@ -130,13 +131,14 @@ project(':api') {
130131
apply plugin: 'maven-publish'
131132
apply plugin: 'signing'
132133
apply plugin: 'com.github.johnrengelman.shadow'
133-
apply plugin: "de.marcphilipp.nexus-publish"
134134

135-
archivesBaseName = 'minio'
135+
base {
136+
archivesName = 'minio'
137+
}
136138

137139
jar {
138140
manifest {
139-
attributes('Implementation-Title': archivesBaseName,
141+
attributes('Implementation-Title': base.archivesName,
140142
'Implementation-Version': archiveVersion.get(),
141143
'Built-By': 'MinIO, inc',
142144
'Built-JDK': System.getProperty('java.version'),
@@ -175,7 +177,7 @@ project(':api') {
175177
publishing {
176178
publications {
177179
mavenJava(MavenPublication) {
178-
artifactId archivesBaseName
180+
artifactId = base.archivesName
179181
from components.java
180182
pom {
181183
name = 'minio'
@@ -215,16 +217,11 @@ project(':api') {
215217
}
216218
}
217219

218-
nexusStaging {
219-
packageGroup = group
220-
stagingProfileId = '9b746c9f8abc1'
221-
username = project.properties['nexusUsername']
222-
password = project.properties['nexusPassword']
223-
}
224-
225220
nexusPublishing {
221+
packageGroup = group
226222
repositories {
227223
sonatype {
224+
stagingProfileId = '9b746c9f8abc1'
228225
username = project.properties['nexusUsername']
229226
password = project.properties['nexusPassword']
230227
}
@@ -237,19 +234,21 @@ project(':adminapi') {
237234
apply plugin: 'maven-publish'
238235
apply plugin: 'signing'
239236
apply plugin: 'com.github.johnrengelman.shadow'
240-
apply plugin: "de.marcphilipp.nexus-publish"
237+
apply plugin: 'base'
241238

242-
archivesBaseName = 'minio-admin'
239+
base {
240+
archivesName = 'minio-admin'
241+
}
243242

244243
dependencies {
245244
api project(':api')
246-
api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.0"
245+
api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2"
247246
testImplementation project(':api')
248247
}
249248

250249
jar {
251250
manifest {
252-
attributes('Implementation-Title': archivesBaseName,
251+
attributes('Implementation-Title': base.archivesName,
253252
'Implementation-Version': archiveVersion.get(),
254253
'Built-By': 'MinIO, inc',
255254
'Built-JDK': System.getProperty('java.version'),
@@ -288,7 +287,7 @@ project(':adminapi') {
288287
publishing {
289288
publications {
290289
mavenJava(MavenPublication) {
291-
artifactId archivesBaseName
290+
artifactId = base.archivesName
292291
from components.java
293292
pom {
294293
name = 'minio'
@@ -328,20 +327,8 @@ project(':adminapi') {
328327
}
329328
}
330329

331-
nexusStaging {
332-
packageGroup = group
333-
stagingProfileId = '9b746c9f8abc1'
334-
username = project.properties['nexusUsername']
335-
password = project.properties['nexusPassword']
336-
}
337-
338330
nexusPublishing {
339-
repositories {
340-
sonatype {
341-
username = project.properties['nexusUsername']
342-
password = project.properties['nexusPassword']
343-
}
344-
}
331+
packageGroup = group
345332
}
346333
}
347334

@@ -385,7 +372,7 @@ project(':functional') {
385372

386373
task runFunctionalTest(type:JavaExec) {
387374
mainClass = 'FunctionalTest'
388-
classpath = sourceSets.main.runtimeClasspath
375+
classpath = testing.suites.test.sources.runtimeClasspath
389376

390377
ext.endpoint = 'https://play.min.io:9000'
391378
if (rootProject.hasProperty('endpoint')) {

gradle/wrapper/gradle-wrapper.jar

-19.7 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

gradlew.bat

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

0 commit comments

Comments
 (0)