From 03af8d9dd95a1c91272233da9b12860aa2d676de Mon Sep 17 00:00:00 2001
From: Eddie Carpenter <eddie.carpenter@frei.one>
Date: Sat, 17 Aug 2024 21:39:19 +1200
Subject: [PATCH 1/3] Updated versions and removed unused files

---
 .github/project.yml |  2 +-
 qodana.yaml         | 34 ----------------------------------
 settings.xml        | 11 -----------
 3 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 qodana.yaml
 delete mode 100644 settings.xml

diff --git a/.github/project.yml b/.github/project.yml
index bf123b460..c0cbe1112 100644
--- a/.github/project.yml
+++ b/.github/project.yml
@@ -1,3 +1,3 @@
 release:
   current-version: "2.0.0"
-  next-version: "2.0.1-SNAPSHOT"
+  next-version: "2.1.0-SNAPSHOT"
diff --git a/qodana.yaml b/qodana.yaml
deleted file mode 100644
index 5a7f6b2d4..000000000
--- a/qodana.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-#-------------------------------------------------------------------------------#
-#               Qodana analysis is configured by qodana.yaml file               #
-#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
-#-------------------------------------------------------------------------------#
-version: "1.0"
-
-#Specify inspection profile for code analysis
-profile:
-  name: qodana.starter
-
-#Enable inspections
-#include:
-#  - name: <SomeEnabledInspectionId>
-
-#Disable inspections
-#exclude:
-#  - name: <SomeDisabledInspectionId>
-#    paths:
-#      - <path/where/not/run/inspection>
-
-projectJDK: "21" #(Applied in CI/CD pipeline)
-
-# Execute shell command before Qodana execution (Applied in CI/CD pipeline)
-# bootstrap: sh ./prepare-qodana.sh
-
-#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
-#plugins:
-#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
-
-#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
-linter: jetbrains/qodana-jvm:latest
-exclude:
-  - name: CdiInjectionPointsInspection
-  - name: EqualsWhichDoesntCheckParameterClass
diff --git a/settings.xml b/settings.xml
deleted file mode 100644
index 0749cb461..000000000
--- a/settings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0         http://maven.apache.org/xsd/settings-1.0.0.xsd">
-    <servers>
-        <server>
-            <id>devrepo</id>
-            <username>teamcity</username>
-            <password>${env.REPO_PASSWORD}</password>
-        </server>
-    </servers>
-</settings>

From 9948699d897019b67125f57c098ea2c97689a3c7 Mon Sep 17 00:00:00 2001
From: Eddie Carpenter <eddie.carpenter@frei.one>
Date: Sat, 17 Aug 2024 22:01:54 +1200
Subject: [PATCH 2/3] updated build script with PGP key info

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 95434fae1..e0c35a9b2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -67,6 +67,15 @@ jobs:
         with:
           maven-version: 3.9.6
 
+      - name: Configure GPG Key
+        run: |
+          echo -n "GPG_PRIVATE_KEY" | base64 --decode | gpg --import
+        env:
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+
+      - name: Display pgp key
+        run: gpg --list-keys
+
       - name: Display Maven Version
         run: mvn -v
 

From 2324731908eb940c1cdbf3eb77eed0cc0689c04c Mon Sep 17 00:00:00 2001
From: Eddie Carpenter <eddie.carpenter@frei.one>
Date: Sat, 17 Aug 2024 22:09:27 +1200
Subject: [PATCH 3/3] Removed PGP signing from Pom

---
 .github/workflows/build.yml | 14 --------------
 pom.xml                     | 23 -----------------------
 2 files changed, 37 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e0c35a9b2..d4052e2c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,11 +52,6 @@ jobs:
           distribution: temurin
           java-version: 21
           cache: 'maven'
-          server-id: ossrh
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
       - name: Display settings.xml
         run: |
@@ -67,15 +62,6 @@ jobs:
         with:
           maven-version: 3.9.6
 
-      - name: Configure GPG Key
-        run: |
-          echo -n "GPG_PRIVATE_KEY" | base64 --decode | gpg --import
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-
-      - name: Display pgp key
-        run: gpg --list-keys
-
       - name: Display Maven Version
         run: mvn -v
 
diff --git a/pom.xml b/pom.xml
index 00e06a9cd..790539210 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,29 +203,6 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <version>${maven.gpg.version}</version>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <gpgArguments>
-                        <arg>--pinentry-mode</arg>
-                        <arg>loopback</arg>
-                    </gpgArguments>
-                </configuration>
-            </plugin>
-
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>