From 8afc02ff37350114ea2820f767dfc9491b241d5e Mon Sep 17 00:00:00 2001
From: John Freeman <john.freeman.opensource@gmail.com>
Date: Sun, 21 Aug 2022 12:16:11 +0100
Subject: [PATCH] Removed GitHub plugin repo config (#500)

No longer required.
---
 .github/workflows/maven-deploy.yml | 28 +++-------------------------
 pom.xml                            | 15 ---------------
 2 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
index 1618dfbe..f9f50a8e 100644
--- a/.github/workflows/maven-deploy.yml
+++ b/.github/workflows/maven-deploy.yml
@@ -20,35 +20,14 @@ jobs:
           java-version: 11
           distribution: 'temurin'
           gpg-private-key: ${{ secrets.GPG_KEY }}
+          server-id: ossrh
+          server-username: OSSRH_USER
+          server-password: OSSRH_TOKEN
       - name: Cache local Maven repository
         uses: gantsign/maven-periodic-cache-action@v1
         with:
           key-suffix: '-deploy'
           additional-path: '!~/.m2/repository/com/github/gantsign/maven'
-      - name: Configure maven settings.xml
-        shell: bash
-        run: |
-          mkdir -p ~/.m2
-          cat << 'EOF' > ~/.m2/settings.xml
-          <?xml version="1.0" encoding="UTF-8"?>
-          <settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-              xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                                  https://maven.apache.org/xsd/settings-1.0.0.xsd">
-            <servers>
-              <server>
-                <id>ossrh</id>
-                <username>${env.OSSRH_USER}</username>
-                <password>${env.OSSRH_TOKEN}</password>
-              </server>
-              <server>
-                <id>github</id>
-                <username>${env.GITHUB_ACTOR}</username>
-                <password>${env.GITHUB_TOKEN}</password>
-              </server>
-            </servers>
-          </settings>
-          EOF
       - name: Deploy with Maven
         run: |
           ./mvnw deploy \
@@ -63,4 +42,3 @@ jobs:
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/pom.xml b/pom.xml
index 5a4771e7..0c423c2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -536,10 +536,6 @@
                 </bannedPlugins>
                 <requireNoRepositories>
                   <message>Best Practice is to never define repositories in pom.xml (use a repository manager instead)</message>
-                  <allowedPluginRepositories>
-                    <!-- for kotlin-maven-plugin-tools -->
-                    <repository>github</repository>
-                  </allowedPluginRepositories>
                 </requireNoRepositories>
                 <banDuplicateClasses>
                   <findAllDuplicates>true</findAllDuplicates>
@@ -800,17 +796,6 @@
     <url>https://travis-ci.org/gantsign/ktlint-maven-plugin</url>
   </ciManagement>
 
-  <pluginRepositories>
-    <pluginRepository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>github</id>
-      <name>kotlin-maven-plugin-tools</name>
-      <url>https://maven.pkg.github.com/gantsign/kotlin-maven-plugin-tools</url>
-    </pluginRepository>
-  </pluginRepositories>
-
   <distributionManagement>
     <snapshotRepository>
       <id>ossrh</id>