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          | 14 ++++----------
 src/auth.ts            | 14 ++++----------
 4 files changed, 20 insertions(+), 50 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 c1018c00..4ec5c6b4 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2928,17 +2928,11 @@ function generate(id = exports.DEFAULT_ID, username = exports.DEFAULT_USERNAME,
           <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>
   `;
 }
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>
   `;
 }