From 7e43f9903f6230aeb729d756f3882a784d353558 Mon Sep 17 00:00:00 2001
From: Andres Becerra <abecerra@ebi.ac.uk>
Date: Tue, 2 Jan 2024 11:07:01 +0000
Subject: [PATCH 1/3] reorder pom plugins

---
 pom.xml | 155 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 75 insertions(+), 80 deletions(-)

diff --git a/pom.xml b/pom.xml
index b0932f0..43df782 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
 		<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-		<quarkus.platform.version>3.6.3</quarkus.platform.version>
+		<quarkus.platform.version>3.6.5</quarkus.platform.version>
 		<surefire-plugin.version>3.1.2</surefire-plugin.version>
 	</properties>
 
@@ -122,7 +122,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.26</version>
+			<version>1.18.30</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -148,6 +148,59 @@
 	</dependencies>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>${quarkus.platform.group-id}</groupId>
+				<artifactId>quarkus-maven-plugin</artifactId>
+				<version>${quarkus.platform.version}</version>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<goals>
+							<goal>build</goal>
+							<goal>generate-code</goal>
+							<goal>generate-code-tests</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${compiler-plugin.version}</version>
+				<configuration>
+					<compilerArgs>
+						<arg>-parameters</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>${surefire-plugin.version}</version>
+				<configuration>
+					<systemPropertyVariables>
+						<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+						<maven.home>${maven.home}</maven.home>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>${surefire-plugin.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<systemPropertyVariables>
+						<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+						<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+						<maven.home>${maven.home}</maven.home>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
@@ -177,70 +230,34 @@
 					</execution>
 				</executions>
 			</plugin>
-
-         <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.13</version>
-            <extensions>true</extensions>
-            <configuration>
-               <serverId>ossrh</serverId>
-               <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-               <autoReleaseAfterClose>true</autoReleaseAfterClose>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
-            <executions>
-               <execution>
-                  <id>sign-artifacts</id>
-                  <phase>verify</phase>
-                  <goals>
-                     <goal>sign</goal>
-                  </goals>
-                  <configuration>
-                     <keyname>AGR Admin</keyname>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-
 			<plugin>
-				<groupId>${quarkus.platform.group-id}</groupId>
-				<artifactId>quarkus-maven-plugin</artifactId>
-				<version>${quarkus.platform.version}</version>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<version>1.6.13</version>
 				<extensions>true</extensions>
+				<configuration>
+					<serverId>ossrh</serverId>
+					<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+					<autoReleaseAfterClose>true</autoReleaseAfterClose>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-gpg-plugin</artifactId>
+				<version>1.6</version>
 				<executions>
 					<execution>
+						<id>sign-artifacts</id>
+						<phase>verify</phase>
 						<goals>
-							<goal>build</goal>
-							<goal>generate-code</goal>
-							<goal>generate-code-tests</goal>
+							<goal>sign</goal>
 						</goals>
+						<configuration>
+							<keyname>AGR Admin</keyname>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${compiler-plugin.version}</version>
-				<configuration>
-					<compilerArgs>
-						<arg>-parameters</arg>
-					</compilerArgs>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${surefire-plugin.version}</version>
-				<configuration>
-					<systemPropertyVariables>
-						<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-						<maven.home>${maven.home}</maven.home>
-					</systemPropertyVariables>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<profiles>
@@ -251,30 +268,8 @@
 					<name>native</name>
 				</property>
 			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-failsafe-plugin</artifactId>
-						<version>${surefire-plugin.version}</version>
-						<configuration>
-							<systemPropertyVariables>
-								<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-								<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-									<maven.home>${maven.home}</maven.home>
-							</systemPropertyVariables>
-						</configuration>
-						<executions>
-							<execution>
-								<goals>
-									<goal>integration-test</goal>
-									<goal>verify</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
 			<properties>
+				<skipITs>false</skipITs>
 				<quarkus.package.type>native</quarkus.package.type>
 			</properties>
 		</profile>

From 311c3775e090d3aafec6b071290c99957ec391fc Mon Sep 17 00:00:00 2001
From: Andres Becerra <abecerra@ebi.ac.uk>
Date: Mon, 15 Jan 2024 15:21:01 +0000
Subject: [PATCH 2/3] move verify action

---
 .github/workflows/github-actions-PR-validation.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github-actions-PR-validation.yml b/.github/workflows/github-actions-PR-validation.yml
index 799cb8a..eeb7790 100644
--- a/.github/workflows/github-actions-PR-validation.yml
+++ b/.github/workflows/github-actions-PR-validation.yml
@@ -38,9 +38,6 @@ jobs:
       - name: Run Maven test
         run: |
           mvn --no-transfer-progress test
-      - name: Run Maven verify
-        run: |
-          mvn --no-transfer-progress --batch-mode --update-snapshots verify
       - name: Package API
         run: |
           mvn clean package -Dquarkus-profile=test -ntp
@@ -52,6 +49,10 @@ jobs:
           OKTA_URL: ${{ secrets.OKTA_URL }}
         run: |
           make integration-test
+      - name: Run Maven verify
+        run: |
+          mvn --no-transfer-progress --batch-mode --update-snapshots verify
+ 
 
   test-build-docker-image:
     if: github.event.action != 'edited' || github.event.changes.base

From 510e36d8a0a5e3939e3288e17eeef2e9b9fdd20d Mon Sep 17 00:00:00 2001
From: Andres Becerra <abecerra@ebi.ac.uk>
Date: Mon, 15 Jan 2024 15:25:56 +0000
Subject: [PATCH 3/3] remove verify action

---
 .github/workflows/github-actions-PR-validation.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/github-actions-PR-validation.yml b/.github/workflows/github-actions-PR-validation.yml
index eeb7790..6590bf1 100644
--- a/.github/workflows/github-actions-PR-validation.yml
+++ b/.github/workflows/github-actions-PR-validation.yml
@@ -49,9 +49,6 @@ jobs:
           OKTA_URL: ${{ secrets.OKTA_URL }}
         run: |
           make integration-test
-      - name: Run Maven verify
-        run: |
-          mvn --no-transfer-progress --batch-mode --update-snapshots verify
  
 
   test-build-docker-image: