Skip to content

Commit 41883a1

Browse files
authored
Remove deprecated Gradle usage (#1273)
* Remove maven plugin in Gradle * version -> archiveVersion in Gradle * Remove testCompile Gradle deprecation warnings
1 parent 8bda49e commit 41883a1

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

build.gradle

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ subprojects {
6060
compile "org.bouncycastle:bcprov-jdk15on:1.69"
6161
compileOnly "com.github.spotbugs:spotbugs-annotations:4.1.2"
6262

63-
testCompile "com.squareup.okhttp3:mockwebserver:4.8.1"
64-
testCompile "junit:junit:4.13"
63+
testImplementation "com.squareup.okhttp3:mockwebserver:4.8.1"
64+
testImplementation "junit:junit:4.13"
6565
}
6666

6767
configurations.all() {
@@ -129,7 +129,6 @@ subprojects {
129129

130130
project(':api') {
131131
apply plugin: 'java'
132-
apply plugin: 'maven'
133132
apply plugin: 'maven-publish'
134133
apply plugin: 'signing'
135134
apply plugin: 'com.github.johnrengelman.shadow'
@@ -147,7 +146,7 @@ project(':api') {
147146
jar {
148147
manifest {
149148
attributes('Implementation-Title': archivesBaseName,
150-
'Implementation-Version': version,
149+
'Implementation-Version': archiveVersion.get(),
151150
'Built-By': 'MinIO, inc',
152151
'Built-JDK': System.getProperty('java.version'),
153152
'Source-Compatibility': sourceCompatibility,
@@ -244,7 +243,6 @@ project(':api') {
244243

245244
project(':adminapi') {
246245
apply plugin: 'java'
247-
apply plugin: 'maven'
248246
apply plugin: 'maven-publish'
249247
apply plugin: 'signing'
250248
apply plugin: 'com.github.johnrengelman.shadow'
@@ -261,13 +259,13 @@ project(':adminapi') {
261259

262260
dependencies {
263261
compile project(':api')
264-
testCompile project(':api')
262+
testImplementation project(':api')
265263
}
266264

267265
jar {
268266
manifest {
269267
attributes('Implementation-Title': archivesBaseName,
270-
'Implementation-Version': version,
268+
'Implementation-Version': archiveVersion.get(),
271269
'Built-By': 'MinIO, inc',
272270
'Built-JDK': System.getProperty('java.version'),
273271
'Source-Compatibility': sourceCompatibility,

0 commit comments

Comments
 (0)