huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Java packaging (#25838) 

* Fix Java packaging

* fix flaky test
This commit is contained in:
Brennan 2020-09-15 10:20:43 -07:00 committed by GitHub
parent 17e04b70b0
commit ce76ae75f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SignalR/clients/java/signalr/core/build.gradle
View File

@ -1,3 +1,8 @@
plugins {
id 'java'
id 'maven'
}
group 'com.microsoft.signalr' group 'com.microsoft.signalr'
dependencies { dependencies {
@ -22,6 +27,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
task generatePOM { task generatePOM {
pom { pom {
project { project {
artifactId 'signalr'
inceptionYear '2018' inceptionYear '2018'
description 'ASP.NET Core SignalR Client for Java applications' description 'ASP.NET Core SignalR Client for Java applications'
url 'https://github.com/dotnet/aspnetcore' url 'https://github.com/dotnet/aspnetcore'

6
src/SignalR/clients/java/signalr/messagepack/build.gradle
View File

@ -1,3 +1,8 @@
plugins {
id 'java'
id 'maven'
}
group 'com.microsoft.signalr.messagepack' group 'com.microsoft.signalr.messagepack'
dependencies { dependencies {
@ -21,6 +26,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
task generatePOM { task generatePOM {
pom { pom {
project { project {
artifactId 'signalr-messagepack'
inceptionYear '2020' inceptionYear '2020'
description 'MessagePack protocol implementation for ASP.NET Core SignalR Client for Java applications' description 'MessagePack protocol implementation for ASP.NET Core SignalR Client for Java applications'
url 'https://github.com/dotnet/aspnetcore' url 'https://github.com/dotnet/aspnetcore'

6
src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java
View File

@ -2974,7 +2974,10 @@ class HubConnectionTest {
assertTrue(close.blockingAwait(5, TimeUnit.SECONDS)); assertTrue(close.blockingAwait(5, TimeUnit.SECONDS));
return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer)); return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer));
}) })
.on("DELETE", (req) -> Single.just(new HttpResponse(200, "", TestUtils.stringToByteBuffer("")))); .on("DELETE", (req) -> {
close.onComplete();
return Single.just(new HttpResponse(200, "", TestUtils.stringToByteBuffer("")));
});
HubConnection hubConnection = HubConnectionBuilder HubConnection hubConnection = HubConnectionBuilder
.create("http://example.com") .create("http://example.com")
@ -2984,7 +2987,6 @@ class HubConnectionTest {
hubConnection.start().timeout(30, TimeUnit.SECONDS).blockingAwait(); hubConnection.start().timeout(30, TimeUnit.SECONDS).blockingAwait();
assertTrue(hubConnection.getTransport() instanceof LongPollingTransport); assertTrue(hubConnection.getTransport() instanceof LongPollingTransport);
close.onComplete();
hubConnection.stop().timeout(30, TimeUnit.SECONDS).blockingAwait(); hubConnection.stop().timeout(30, TimeUnit.SECONDS).blockingAwait();
} }