From 5843b5415b56367de53f78376d94cac61f6fc0a7 Mon Sep 17 00:00:00 2001
From: Mikael Mengistu <mikaelm12@users.noreply.github.com>
Date: Wed, 8 Aug 2018 17:50:55 -0600
Subject: [PATCH] Update Java client build scripts for Maven publishing (#2765)

---
 build/repo.targets                   | 12 +++---------
 clients/java/signalr/build.gradle    | 24 +++++++++++++++++-------
 clients/java/signalr/settings.gradle |  2 +-
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/build/repo.targets b/build/repo.targets
index 424fa09955..54b7931cfa 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -126,15 +126,9 @@
   </Target>
 
   <ItemGroup>
-    <JavaBuildFiles Include="signalr-client-$(JavaClientVersion).jar;signalr-client-$(JavaClientVersion)-javadoc.jar;signalr-client-$(JavaClientVersion)-sources.jar;signalr-client-$(JavaClientVersion).pom"/>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Jars Include="signalr-client-$(JavaClientVersion).jar;signalr-client-$(JavaClientVersion)-javadoc.jar;signalr-client-$(JavaClientVersion)-sources.jar;" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PomFile Include="signalr-client-$(JavaClientVersion).pom" />
+    <Jars Include="signalr-$(JavaClientVersion).jar;signalr-$(JavaClientVersion)-javadoc.jar;signalr-$(JavaClientVersion)-sources.jar;" />
+    <PomFile Include="signalr-$(JavaClientVersion).pom" />
+    <JavaBuildFiles Include="@(Jars);@(PomFile)"/>
   </ItemGroup>
 
   <Target Name="PackJavaClient" Condition="'$(HasJdk)' == 'true'">
diff --git a/clients/java/signalr/build.gradle b/clients/java/signalr/build.gradle
index da1abbd823..00b71ef1c5 100644
--- a/clients/java/signalr/build.gradle
+++ b/clients/java/signalr/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'maven'
 }
 
-group 'com.microsoft.aspnetcore'
+group 'com.microsoft.aspnet'
 version '0.1.0-preview1'
 
 sourceCompatibility = 1.8
@@ -31,11 +31,10 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 task generatePOM {
     pom {
         project {
-            groupId 'com.microsoft.aspnetcore'
-            artifactId 'signalr'
-            version '0.1.0-preview1'
-
             inceptionYear '2018'
+            description 'ASP.NET Core SignalR Client for Java applications'
+            url 'https://github.com/aspnet/SignalR'
+            name groupId + ':' + artifactId
             licenses {
                 license {
                     name 'The Apache Software License, Version 2.0'
@@ -43,9 +42,20 @@ task generatePOM {
                     distribution 'repo'
                 }
             }
+            scm {
+                connection 'scm:git:git://github.com/aspnet/SignalR.git'
+                developerConnection 'scm:git:git://github.com/aspnet/SignalR.git'
+                url 'http://github.com/aspnet/SignalR/tree/master'
+            }
+            developers {
+                developer {
+                    id 'microsoft'
+                    name 'Microsoft'
+                }
+            }
         }
-    }.writeTo("signalr-client-0.1.0-preview1.pom")
+    }.writeTo("signalr-0.1.0-preview1.pom")
 
-    ant.move file: "signalr-client-0.1.0-preview1.pom",
+    ant.move file: "signalr-0.1.0-preview1.pom",
             todir: "${buildDir}/libs"
 }
diff --git a/clients/java/signalr/settings.gradle b/clients/java/signalr/settings.gradle
index 90473932b7..f3f257cc4d 100644
--- a/clients/java/signalr/settings.gradle
+++ b/clients/java/signalr/settings.gradle
@@ -1,3 +1,3 @@
-rootProject.name = 'signalr-client'
+rootProject.name = 'signalr'
 include 'main'