From 1d7ec38fd8fcd4fa0b522a1fc52d1b291baa8107 Mon Sep 17 00:00:00 2001
From: Jared Petersen <jaredtoddpetersen@gmail.com>
Date: Sun, 3 May 2020 08:22:31 -0700
Subject: [PATCH] changed passhprase configuration to be more in line with docs

---
 README.md              |  28 ++++++++--------------------
 __tests__/auth.test.ts |  14 ++++----------
 dist/index.js          | Bin 170235 -> 170076 bytes
 src/auth.ts            |  14 ++++----------
 4 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index 43985c5d..8416a447 100644
--- a/README.md
+++ b/README.md
@@ -134,16 +134,10 @@ The two `settings.xml` files created from the above example look like the follow
       <username>${env.GITHUB_ACTOR}</username>
       <password>${env.GITHUB_TOKEN}</password>
     </server>
-    <profiles>
-      <profile>
-        <activation>
-          <activeByDefault>true</activeByDefault>
-        </activation>
-        <properties>
-          <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
-        </properties>
-      </profile>
-    <profiles>
+    <server>
+      <id>gpg.passphrase</id>
+      <passphrase>${env.GPG_PASSPHRASE}</passphrase>
+    </server>
 </servers>
 ```
 
@@ -155,16 +149,10 @@ The two `settings.xml` files created from the above example look like the follow
       <username>${env.MAVEN_USERNAME}</username>
       <password>${env.MAVEN_CENTRAL_TOKEN}</password>
     </server>
-    <profiles>
-      <profile>
-        <activation>
-          <activeByDefault>true</activeByDefault>
-        </activation>
-        <properties>
-          <gpg.passphrase>${env.MAVEN_GPG_PASSPHRASE}</gpg.passphrase>
-        </properties>
-      </profile>
-    <profiles>
+    <server>
+      <id>gpg.passphrase</id>
+      <passphrase>${env.MAVEN_GPG_PASSPHRASE}</passphrase>
+    </server>
 </servers>
 ```
 
diff --git a/__tests__/auth.test.ts b/__tests__/auth.test.ts
index b8e3eac6..cb5f6595 100644
--- a/__tests__/auth.test.ts
+++ b/__tests__/auth.test.ts
@@ -157,17 +157,11 @@ describe('auth tests', () => {
           <username>\${env.${username}}</username>
           <password>\${env.&amp;&lt;&gt;&quot;&apos;&apos;&quot;&gt;&lt;&amp;}</password>
         </server>
+        <server>
+          <id>gpg.passphrase</id>
+          <passphrase>\${env.${gpgPassphrase}}</passphrase>
+        </server>
       </servers>
-      <profiles>
-        <profile>
-          <activation>
-            <activeByDefault>true</activeByDefault>
-          </activation>
-          <properties>
-            <gpg.passphrase>\${env.${gpgPassphrase}}</gpg.passphrase>
-          </properties>
-        </profile>
-      </profiles>
   </settings>
   `);
   });
diff --git a/dist/index.js b/dist/index.js
index c1018c00e67fc29a3e8dd2e95ab11cf5238d54d1..4ec5c6b4766b4d829eceacc3ff416f42e3353ff9 100644
GIT binary patch
delta 73
zcmeypk?YO|u7)j)C8^UlrZ7s%rx&E_6(klH7i1JA7N^?iXQtS3DZqivblo&YgXxKB
Wj3U!hQW<62*Q7CSUz5h<Zv+6$v=|fs

delta 279
zcmcb!f$R51u7)j)C8^WW7<uazfWW4pC_gPTC$-p)3&aHhm=Hn)D3+L9l3A8ml9``}
zEDV!Kb*gkpO-n4zDX}XlDowS~2P;Psg&Pjk0g+5B(M2;1WN$%gQAsAUW55ndFG$y$
uz9yB?zzf7GNGvWc$S6uIPDOT#jXpN*U{R3&U`pWv?Hp;0+d0yhLW}^77f)LN

diff --git a/src/auth.ts b/src/auth.ts
index 6b40ccb3..b724d558 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -82,17 +82,11 @@ export function generate(
           <username>\${env.${escapeXML(username)}}</username>
           <password>\${env.${escapeXML(password)}}</password>
         </server>
+        <server>
+          <id>gpg.passphrase</id>
+          <passphrase>\${env.${escapeXML(gpgPassphrase)}}</passphrase>
+        </server>
       </servers>
-      <profiles>
-        <profile>
-          <activation>
-            <activeByDefault>true</activeByDefault>
-          </activation>
-          <properties>
-            <gpg.passphrase>\${env.${escapeXML(gpgPassphrase)}}</gpg.passphrase>
-          </properties>
-        </profile>
-      </profiles>
   </settings>
   `;
 }