From b52d9c9840a7be1a89faeeebb4e942c917ca884a Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 16 Jan 2020 16:02:00 -0800
Subject: [PATCH 1/5] fix gpg key import process

---
 .github/workflows/build.yml |  4 ++--
 pom.xml                     |  5 +++--
 sdk-actors/pom.xml          | 19 +++++--------------
 sdk/pom.xml                 | 20 ++++++--------------
 setting.xml => settings.xml |  0
 5 files changed, 16 insertions(+), 32 deletions(-)
 rename setting.xml => settings.xml (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7de7cb1f13..c5d8285d40 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -62,7 +62,7 @@ jobs:
       if: github.event_name != 'pull_request'
       run: |
         echo ${{ secrets.GPG_PRIVATE_KEY }} | base64 -d > private-key.gpg
-        gpg --import private-key.gpg
+        gpg --batch --import private-key.gpg
     - name: deploy to OSSRH
       if: github.event_name != 'pull_request'
-      run: mvn -V -B -s settings.xml deploy
\ No newline at end of file
+      run: mvn -V -B -Dgpg.skip=false -s settings.xml deploy
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0dfd8f5910..0a44d9c23e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,10 +31,11 @@
       <id>ossrh</id>
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </snapshotRepository>
-    <repository>
+    <!-- Use default repository -->
+    <!-- <repository>
       <id>ossrh</id>
       <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
+    </repository> -->
   </distributionManagement>
 
   <dependencyManagement>
diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml
index 072168300f..c00e355e9b 100644
--- a/sdk-actors/pom.xml
+++ b/sdk-actors/pom.xml
@@ -15,17 +15,12 @@
   <version>0.2.0-SNAPSHOT</version>
   <name>dapr-sdk</name>
   <description>SDK for Actors on Dapr</description>
-  <repositories>
-    <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <name>libs-release</name>
-      <url>https://repo.spring.io/libs-release</url>
-    </repository>
-  </repositories>
 
+  <properties>
+    <skipITs>true</skipITs>
+    <maven.deploy.skip>false</maven.deploy.skip>
+  </properties>
+  
   <dependencies>
     <dependency>
       <groupId>io.dapr</groupId>
@@ -44,10 +39,6 @@
     </dependency>
   </dependencies>
 
-  <properties>
-    <skipITs>true</skipITs>
-    <maven.deploy.skip>false</maven.deploy.skip>
-  </properties>
   <build>
     <plugins>
       <plugin>
diff --git a/sdk/pom.xml b/sdk/pom.xml
index 500601e68c..fd3eb98359 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -15,16 +15,11 @@
   <version>0.2.0-SNAPSHOT</version>
   <name>dapr-sdk</name>
   <description>SDK for Dapr</description>
-  <repositories>
-    <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <name>libs-release</name>
-      <url>https://repo.spring.io/libs-release</url>
-    </repository>
-  </repositories>
+  
+  <properties>
+    <skipITs>true</skipITs>
+    <maven.deploy.skip>false</maven.deploy.skip>
+  </properties>
 
   <dependencies>
     <dependency>
@@ -81,10 +76,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <properties>
-    <skipITs>true</skipITs>
-    <maven.deploy.skip>false</maven.deploy.skip>
-  </properties>
+  
   <build>
     <plugins>
       <plugin>
diff --git a/setting.xml b/settings.xml
similarity index 100%
rename from setting.xml
rename to settings.xml

From 5584a2259b4995fc1421c9dde1672de3f395ff86 Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 16 Jan 2020 16:07:58 -0800
Subject: [PATCH 2/5] add GPG_TTY env setting

---
 .github/workflows/build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c5d8285d40..49f8af5072 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -62,7 +62,10 @@ jobs:
       if: github.event_name != 'pull_request'
       run: |
         echo ${{ secrets.GPG_PRIVATE_KEY }} | base64 -d > private-key.gpg
+        export GPG_TTY=$(tty)
         gpg --batch --import private-key.gpg
     - name: deploy to OSSRH
       if: github.event_name != 'pull_request'
-      run: mvn -V -B -Dgpg.skip=false -s settings.xml deploy
\ No newline at end of file
+      run: |
+        export GPG_TTY=$(tty)
+        mvn -V -B -Dgpg.skip=false -s settings.xml deploy
\ No newline at end of file

From 15deb65ca5bf6acef67ff457bad00e60d5bdd789 Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 16 Jan 2020 16:11:33 -0800
Subject: [PATCH 3/5] revert

---
 sdk-actors/pom.xml | 13 ++++++++++++-
 sdk/pom.xml        | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml
index c00e355e9b..85b27298eb 100644
--- a/sdk-actors/pom.xml
+++ b/sdk-actors/pom.xml
@@ -16,11 +16,22 @@
   <name>dapr-sdk</name>
   <description>SDK for Actors on Dapr</description>
 
+  <repositories>
+    <repository>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>central</id>
+      <name>libs-release</name>
+      <url>https://repo.spring.io/libs-release</url>
+    </repository>
+  </repositories>
+
   <properties>
     <skipITs>true</skipITs>
     <maven.deploy.skip>false</maven.deploy.skip>
   </properties>
-  
+
   <dependencies>
     <dependency>
       <groupId>io.dapr</groupId>
diff --git a/sdk/pom.xml b/sdk/pom.xml
index fd3eb98359..fe0f3cf954 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -16,6 +16,17 @@
   <name>dapr-sdk</name>
   <description>SDK for Dapr</description>
   
+  <repositories>
+    <repository>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>central</id>
+      <name>libs-release</name>
+      <url>https://repo.spring.io/libs-release</url>
+    </repository>
+  </repositories>
+
   <properties>
     <skipITs>true</skipITs>
     <maven.deploy.skip>false</maven.deploy.skip>
@@ -76,7 +87,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <build>
     <plugins>
       <plugin>

From e0bfc0903d3418c63aea9686ef4b30b9ec5d0537 Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 16 Jan 2020 16:17:23 -0800
Subject: [PATCH 4/5] rename dapr-sdk to dapr-actors

---
 sdk-actors/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml
index 85b27298eb..03fc2f67e6 100644
--- a/sdk-actors/pom.xml
+++ b/sdk-actors/pom.xml
@@ -13,7 +13,7 @@
   <artifactId>dapr-sdk-actors</artifactId>
   <packaging>jar</packaging>
   <version>0.2.0-SNAPSHOT</version>
-  <name>dapr-sdk</name>
+  <name>dapr-actors</name>
   <description>SDK for Actors on Dapr</description>
 
   <repositories>

From 1e93c5657f9058bb4276b7b10377c06bc9feab69 Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 16 Jan 2020 16:19:01 -0800
Subject: [PATCH 5/5] fix

---
 sdk-actors/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml
index 03fc2f67e6..56405fdae0 100644
--- a/sdk-actors/pom.xml
+++ b/sdk-actors/pom.xml
@@ -13,7 +13,7 @@
   <artifactId>dapr-sdk-actors</artifactId>
   <packaging>jar</packaging>
   <version>0.2.0-SNAPSHOT</version>
-  <name>dapr-actors</name>
+  <name>dapr-sdk-actors</name>
   <description>SDK for Actors on Dapr</description>
 
   <repositories>