From 24113a00c7799962c11bac37baa37ddf8b4c3a7a Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 16 Oct 2024 12:01:43 -0700 Subject: [PATCH 01/13] Use MacOS-13 in CI --- .azure/pipelines/jobs/default-build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index f328550c60c2..daf4def9ba48 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -106,7 +106,7 @@ jobs: # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md pool: ${{ if eq(parameters.agentOs, 'macOS') }}: - vmImage: macOS-12 + vmImage: macOS-13 ${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.useHostedUbuntu, true) }}: vmImage: ubuntu-20.04 @@ -164,8 +164,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_14.2.0.app/Contents/Developer - displayName: Use XCode 14.2.0 + - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer + displayName: Use XCode 15.2.0 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: @@ -323,7 +323,7 @@ jobs: pool: ${{ if eq(parameters.agentOs, 'macOS') }}: name: Azure Pipelines - image: macOS-12 + image: macOS-13 os: macOS ${{ if eq(parameters.agentOs, 'Linux') }}: name: $(DncEngInternalBuildPool) @@ -391,8 +391,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_14.2.0.app/Contents/Developer - displayName: Use XCode 14.2.0 + - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer + displayName: Use XCode 15.2.0 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: From 1bc73f3503b3895e50dbd13a5897389c6dc7988d Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 16 Oct 2024 12:13:44 -0700 Subject: [PATCH 02/13] Gradle 6.9 --- .../java/signalr/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties b/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties index 3eb10089fafd..465a6957736c 100644 --- a/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties +++ b/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionSha256Sum=765442b8069c6bee2ea70713861c027587591c6b1df2c857a23361512560894e +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From a4a692861bfb33bbf607086e1ca390b83588fc93 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 16 Oct 2024 12:34:54 -0700 Subject: [PATCH 03/13] Update gradle-wrapper.properties --- .../java/signalr/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties b/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties index 465a6957736c..0756f92dd7b5 100644 --- a/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties +++ b/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=765442b8069c6bee2ea70713861c027587591c6b1df2c857a23361512560894e -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip +distributionSha256Sum=2c406ba10eaed701b69d01de924dfaf36106d4764e2090175d103b2e7acba211 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 4c2f2ac93203db3df61d38030e9861dca81b8d4b Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 16 Oct 2024 12:57:01 -0700 Subject: [PATCH 04/13] Update gradle-wrapper.properties --- .../java/signalr/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties b/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties index 0756f92dd7b5..df5ca3a8b779 100644 --- a/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties +++ b/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=2c406ba10eaed701b69d01de924dfaf36106d4764e2090175d103b2e7acba211 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From be359bdf25a65bc514b19d580052bd2284a14961 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 16 Oct 2024 13:25:20 -0700 Subject: [PATCH 05/13] Update build.gradle --- src/SignalR/clients/java/signalr/messagepack/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SignalR/clients/java/signalr/messagepack/build.gradle b/src/SignalR/clients/java/signalr/messagepack/build.gradle index 4787c62e3aae..ced388cb1623 100644 --- a/src/SignalR/clients/java/signalr/messagepack/build.gradle +++ b/src/SignalR/clients/java/signalr/messagepack/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'maven' + id 'maven-publish' } group 'com.microsoft.signalr.messagepack' From 0b8ef8431258ceeca8f260164b3ad6991fbfab9c Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 16 Oct 2024 13:25:41 -0700 Subject: [PATCH 06/13] Update build.gradle --- src/SignalR/clients/java/signalr/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index 7314185e2fa4..5a34df81eec8 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -12,7 +12,7 @@ buildscript { plugins { id 'java' - id 'maven' + id 'maven-publish' } allprojects { @@ -52,4 +52,4 @@ spotless { indentWithSpaces(4) removeUnusedImports() // removes any unused imports } -} \ No newline at end of file +} From 436a2f065bc9ce2c015ec368484d04eb95552e6c Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 16 Oct 2024 13:25:54 -0700 Subject: [PATCH 07/13] Update build.gradle --- src/SignalR/clients/java/signalr/core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SignalR/clients/java/signalr/core/build.gradle b/src/SignalR/clients/java/signalr/core/build.gradle index 8d6dbc010274..69e1f42d73f9 100644 --- a/src/SignalR/clients/java/signalr/core/build.gradle +++ b/src/SignalR/clients/java/signalr/core/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'maven' + id 'maven-publish' } group 'com.microsoft.signalr' From 202ff4c49ae33fbf8928b8870956f164442cd3b3 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 16 Oct 2024 14:42:11 -0700 Subject: [PATCH 08/13] Update build.gradle --- src/SignalR/clients/java/signalr/core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SignalR/clients/java/signalr/core/build.gradle b/src/SignalR/clients/java/signalr/core/build.gradle index 69e1f42d73f9..a3e4d651f0ac 100644 --- a/src/SignalR/clients/java/signalr/core/build.gradle +++ b/src/SignalR/clients/java/signalr/core/build.gradle @@ -15,7 +15,7 @@ dependencies { archivesBaseName = 'signalr' task sourceJar(type: Jar) { - classifier "sources" + archiveClassifier "sources" from sourceSets.main.allJava } From 9500b795fa3dbb7854ecbb67e3402eec797c3256 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 16 Oct 2024 14:42:47 -0700 Subject: [PATCH 09/13] Update build.gradle --- src/SignalR/clients/java/signalr/messagepack/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SignalR/clients/java/signalr/messagepack/build.gradle b/src/SignalR/clients/java/signalr/messagepack/build.gradle index ced388cb1623..46740239e925 100644 --- a/src/SignalR/clients/java/signalr/messagepack/build.gradle +++ b/src/SignalR/clients/java/signalr/messagepack/build.gradle @@ -19,7 +19,7 @@ task sourceJar(type: Jar) { } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier "javadoc" + archiveClassifier "javadoc" from javadoc.destinationDir } From 271401b5a8f82fe1f34af05ac5f455783d20ee89 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 16 Oct 2024 14:43:05 -0700 Subject: [PATCH 10/13] Update build.gradle --- src/SignalR/clients/java/signalr/messagepack/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SignalR/clients/java/signalr/messagepack/build.gradle b/src/SignalR/clients/java/signalr/messagepack/build.gradle index 46740239e925..6af684ff1c22 100644 --- a/src/SignalR/clients/java/signalr/messagepack/build.gradle +++ b/src/SignalR/clients/java/signalr/messagepack/build.gradle @@ -14,7 +14,7 @@ dependencies { archivesBaseName = 'signalr-messagepack' task sourceJar(type: Jar) { - classifier "sources" + archiveClassifier "sources" from sourceSets.main.allJava } From 5118187e3a9e4f7d938c4a09aa99b9f03d1c82b2 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 16 Oct 2024 14:43:32 -0700 Subject: [PATCH 11/13] Update build.gradle --- src/SignalR/clients/java/signalr/core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SignalR/clients/java/signalr/core/build.gradle b/src/SignalR/clients/java/signalr/core/build.gradle index a3e4d651f0ac..864873567286 100644 --- a/src/SignalR/clients/java/signalr/core/build.gradle +++ b/src/SignalR/clients/java/signalr/core/build.gradle @@ -20,7 +20,7 @@ task sourceJar(type: Jar) { } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier "javadoc" + archiveClassifier "javadoc" from javadoc.destinationDir } From 012576208a9e3a92d7cee2b510ef86fd9556ec97 Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 18 Oct 2024 14:22:39 -0700 Subject: [PATCH 12/13] Fixup gradle --- eng/targets/Java.Common.targets | 4 +- global.json | 2 +- src/SignalR/clients/java/signalr/build.gradle | 5 +- .../clients/java/signalr/core/build.gradle | 71 +++++++++-------- .../microsoft/signalr/DefaultHttpClient.java | 4 +- .../java/signalr/messagepack/build.gradle | 76 ++++++++++--------- .../clients/java/signalr/test/build.gradle | 63 ++++++++++++--- .../test/signalr.client.java.Tests.javaproj | 4 +- 8 files changed, 145 insertions(+), 84 deletions(-) diff --git a/eng/targets/Java.Common.targets b/eng/targets/Java.Common.targets index c8905b10c4b6..81c643e60c27 100644 --- a/eng/targets/Java.Common.targets +++ b/eng/targets/Java.Common.targets @@ -64,8 +64,8 @@ - - + + diff --git a/global.json b/global.json index 7df5c2910210..9260b45d82d0 100644 --- a/global.json +++ b/global.json @@ -24,7 +24,7 @@ "xcopy-msbuild": "17.1.0" }, "native-tools": { - "jdk": "11" + "jdk": "11.0.24" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24511.1", diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index 5a34df81eec8..895f8c4338d3 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -6,7 +6,6 @@ buildscript { } dependencies { classpath "com.diffplug.spotless:spotless-plugin-gradle:6.6.1" - classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0' } } @@ -22,7 +21,9 @@ allprojects { // If we're run from outside MSBuild, just assign a bogus dev version. version project.findProperty('packageVersion') ?: "99.99.99-dev" - sourceCompatibility = 1.8 + java { + sourceCompatibility = 1.8 + } repositories { mavenCentral() diff --git a/src/SignalR/clients/java/signalr/core/build.gradle b/src/SignalR/clients/java/signalr/core/build.gradle index 864873567286..17961beef23b 100644 --- a/src/SignalR/clients/java/signalr/core/build.gradle +++ b/src/SignalR/clients/java/signalr/core/build.gradle @@ -5,6 +5,11 @@ plugins { group 'com.microsoft.signalr' +java { + withJavadocJar() + withSourcesJar() +} + dependencies { implementation 'com.google.code.gson:gson:2.8.9' implementation 'com.squareup.okhttp3:okhttp:4.12.0' @@ -12,49 +17,51 @@ dependencies { implementation 'org.slf4j:slf4j-api:1.7.25' } -archivesBaseName = 'signalr' - -task sourceJar(type: Jar) { - archiveClassifier "sources" - from sourceSets.main.allJava +base { + archivesName = 'signalr' } -task javadocJar(type: Jar, dependsOn: javadoc) { - archiveClassifier "javadoc" - from javadoc.destinationDir -} +publishing { + publications { + release(MavenPublication) { + from components.java -task generatePOM { - pom { - project { artifactId 'signalr' - inceptionYear '2018' description 'ASP.NET Core SignalR Client for Java applications' - url 'https://github.com/dotnet/aspnetcore' - name groupId + ':' + artifactId - licenses { - license { - name 'MIT License' - url 'https://opensource.org/licenses/MIT' - distribution 'repo' + + pom { + packaging = 'jar' + inceptionYear = '2018' + url = 'https://github.com/dotnet/aspnetcore' + name = groupId + ':' + artifactId + licenses { + license { + name = 'MIT License' + url = 'https://opensource.org/licenses/MIT' + distribution = 'repo' + } } - } - scm { - connection 'scm:git:https://github.com/dotnet/aspnetcore.git' - developerConnection 'scm:git:https://github.com/dotnet/aspnetcore.git' - url 'https://github.com/dotnet/aspnetcore/tree/main' - } - developers { - developer { - id 'microsoft' - name 'Microsoft' + scm { + connection = 'scm:git:https://github.com/dotnet/aspnetcore.git' + developerConnection = 'scm:git:https://github.com/dotnet/aspnetcore.git' + url = 'https://github.com/dotnet/aspnetcore/tree/main' + } + developers { + developer { + id = 'microsoft' + name = 'Microsoft' + } } } } - }.writeTo("${buildDir}/libs/signalr-${project.version}.pom") + } } -task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) +tasks.withType(GenerateMavenPom).all { + def matcher = name =~ /generatePomFileFor(\w+)Publication/ + def publicationName = matcher[0][1] + destination = layout.buildDirectory.file("libs/signalr-${project.version}.pom").get().asFile +} task generateVersionClass { inputs.property "version", project.version diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java index 767f306cd9b6..3ef3a6968843 100644 --- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java @@ -116,9 +116,9 @@ public Single send(HttpRequest httpRequest, ByteBuffer bodyContent case "POST": RequestBody body; if (bodyContent != null) { - body = RequestBody.create(MediaType.parse("text/plain"), ByteString.of(bodyContent)); + body = RequestBody.Companion.create(ByteString.of(bodyContent), MediaType.parse("text/plain")); } else { - body = RequestBody.create(null, new byte[]{}); + body = RequestBody.Companion.create(new byte[]{}, null); } requestBuilder.post(body); diff --git a/src/SignalR/clients/java/signalr/messagepack/build.gradle b/src/SignalR/clients/java/signalr/messagepack/build.gradle index 6af684ff1c22..492d0dbc6d16 100644 --- a/src/SignalR/clients/java/signalr/messagepack/build.gradle +++ b/src/SignalR/clients/java/signalr/messagepack/build.gradle @@ -5,52 +5,60 @@ plugins { group 'com.microsoft.signalr.messagepack' +java +{ + withJavadocJar() + withSourcesJar() +} + dependencies { implementation project(':core') - compile 'org.msgpack:msgpack-core:0.8.20' - compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' + implementation 'org.msgpack:msgpack-core:0.8.20' + implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.20' } -archivesBaseName = 'signalr-messagepack' - -task sourceJar(type: Jar) { - archiveClassifier "sources" - from sourceSets.main.allJava +base { + archivesName = 'signalr-messagepack' } -task javadocJar(type: Jar, dependsOn: javadoc) { - archiveClassifier "javadoc" - from javadoc.destinationDir -} +publishing { + publications { + release(MavenPublication) { + from components.java -task generatePOM { - pom { - project { artifactId 'signalr-messagepack' - inceptionYear '2020' description 'MessagePack protocol implementation for ASP.NET Core SignalR Client for Java applications' - url 'https://github.com/dotnet/aspnetcore' - name groupId + ':' + artifactId - licenses { - license { - name 'MIT License' - url 'https://opensource.org/licenses/MIT' - distribution 'repo' + + pom { + packaging = 'jar' + inceptionYear = '2020' + url = 'https://github.com/dotnet/aspnetcore' + name = groupId + ':' + artifactId + licenses { + license { + name = 'MIT License' + url = 'https://opensource.org/licenses/MIT' + distribution = 'repo' + } } - } - scm { - connection 'scm:git:https://github.com/dotnet/aspnetcore.git' - developerConnection 'scm:git:https://github.com/dotnet/aspnetcore.git' - url 'https://github.com/dotnet/aspnetcore/tree/main' - } - developers { - developer { - id 'microsoft' - name 'Microsoft' + scm { + connection = 'scm:git:https://github.com/dotnet/aspnetcore.git' + developerConnection = 'scm:git:https://github.com/dotnet/aspnetcore.git' + url = 'https://github.com/dotnet/aspnetcore/tree/main' + } + developers { + developer { + id = 'microsoft' + name = 'Microsoft' + } } } } - }.writeTo("${buildDir}/libs/signalr-messagepack-${project.version}.pom") + } } -task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) +tasks.withType(GenerateMavenPom).all { + def matcher = name =~ /generatePomFileFor(\w+)Publication/ + def publicationName = matcher[0][1] + destination = layout.buildDirectory.file("libs/signalr-messagepack-${project.version}.pom").get().asFile +} diff --git a/src/SignalR/clients/java/signalr/test/build.gradle b/src/SignalR/clients/java/signalr/test/build.gradle index 2fefd54f6481..27b81b32c947 100644 --- a/src/SignalR/clients/java/signalr/test/build.gradle +++ b/src/SignalR/clients/java/signalr/test/build.gradle @@ -1,16 +1,61 @@ -apply plugin: 'org.junit.platform.gradle.plugin' +plugins { + id 'java' +} + +configurations { + antJUnit +} dependencies { - implementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' - compile 'org.junit.jupiter:junit-jupiter-params:5.3.1' - runtime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' + implementation 'org.junit.jupiter:junit-jupiter-params:5.11.2' + testImplementation 'org.junit.jupiter:junit-jupiter:5.11.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.2' implementation 'com.google.code.gson:gson:2.8.5' - compile 'ch.qos.logback:logback-classic:1.2.3' + implementation 'ch.qos.logback:logback-classic:1.2.3' implementation project(':core') implementation project(':messagepack') - compile project(':messagepack') + implementation project(':messagepack') + antJUnit 'org.apache.ant:ant-junit:1.10.15' +} + +sourceSets { + test { + java { + srcDir 'src' + } + } +} + +test { + useJUnitPlatform() + testLogging { + events "passed", "skipped", "failed" + } + + reports { + html.required = false + junitXml.outputPerTestCase = true + junitXml.required = true + } +} + +// Merge test results into a single file for Helix to detect JUnit test file +task testReport { + ext { + resultsDir = file("$buildDir/test-results") + mergedFile = "test-results/junit-results.xml" + } + + doLast { + mkdir 'test-results' + ant.taskdef(name: 'junitreport', + classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator', + classpath: configurations.antJUnit.asPath) + + ant.junitreport(tofile: mergedFile) { + fileset(dir: resultsDir, includes: '**/TEST-*.xml') + } + } } -junitPlatform { - reportsDir file('test-results') -} \ No newline at end of file +test.finalizedBy(testReport) \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj index 3e8dfac79be9..823c53ae8a72 100644 --- a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj +++ b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj @@ -49,8 +49,8 @@ - - + + From 87a93ef8889c852de781df87225726fe43e20f0e Mon Sep 17 00:00:00 2001 From: Brennan Date: Mon, 21 Oct 2024 10:31:20 -0700 Subject: [PATCH 13/13] Apply suggestions from code review --- src/SignalR/clients/java/signalr/core/build.gradle | 2 -- src/SignalR/clients/java/signalr/messagepack/build.gradle | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/SignalR/clients/java/signalr/core/build.gradle b/src/SignalR/clients/java/signalr/core/build.gradle index 17961beef23b..10191fee2cbe 100644 --- a/src/SignalR/clients/java/signalr/core/build.gradle +++ b/src/SignalR/clients/java/signalr/core/build.gradle @@ -58,8 +58,6 @@ publishing { } tasks.withType(GenerateMavenPom).all { - def matcher = name =~ /generatePomFileFor(\w+)Publication/ - def publicationName = matcher[0][1] destination = layout.buildDirectory.file("libs/signalr-${project.version}.pom").get().asFile } diff --git a/src/SignalR/clients/java/signalr/messagepack/build.gradle b/src/SignalR/clients/java/signalr/messagepack/build.gradle index 492d0dbc6d16..34a69f6db856 100644 --- a/src/SignalR/clients/java/signalr/messagepack/build.gradle +++ b/src/SignalR/clients/java/signalr/messagepack/build.gradle @@ -58,7 +58,5 @@ publishing { } tasks.withType(GenerateMavenPom).all { - def matcher = name =~ /generatePomFileFor(\w+)Publication/ - def publicationName = matcher[0][1] destination = layout.buildDirectory.file("libs/signalr-messagepack-${project.version}.pom").get().asFile }