From 0f17a655c246255fdb43bd7c04ec62ef9b055b1d Mon Sep 17 00:00:00 2001
From: "Jain, Nihal" <nihaljain.cs@gmail.com>
Date: Wed, 29 Nov 2023 20:20:51 +0530
Subject: [PATCH] PHOENIX-7126 Update apache parent pom version in QueryServer
 and bump maven plugins/dependencies to latest - Bump apache parent pom
 version to 30 - Remove maven-assembly-plugin-version as it is coming from
 parent pom - Bump following plugins:   - maven-eclipse-plugin.version to 2.10
   - maven-build-helper-plugin.version to 3.5.0   -
 spotbugs-maven-plugin.version to 4.8.1.0   - spotbugs.version to 4.8.1   -
 maven-owasp-plugin.version to 8.4.0   - jacoco-maven-plugin.version to 0.8.11
   - maven-sonar-plugin.version to 3.10.0.2594  - Fix scope of
 org.apache.phoenix:phoenix-queryserver scope to test as compilation fails
 otherwise with error "Non-test scoped test only dependencies found", possibly
 due to maven-dependency-plugin upgrade (via apache parent upgrade

---
 phoenix-queryserver-it/pom.xml |  1 +
 pom.xml                        | 18 ++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/phoenix-queryserver-it/pom.xml b/phoenix-queryserver-it/pom.xml
index 0dcd5c9..04103bc 100644
--- a/phoenix-queryserver-it/pom.xml
+++ b/phoenix-queryserver-it/pom.xml
@@ -89,6 +89,7 @@
     <dependency>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix-queryserver</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <!-- for tests -->
diff --git a/pom.xml b/pom.xml
index 33fadfb..6e1aa17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache</groupId>
       <artifactId>apache</artifactId>
-      <version>23</version>
+      <version>30</version>
     </parent>
 
     <groupId>org.apache.phoenix</groupId>
@@ -95,14 +95,13 @@
         <junit.version>4.13.2</junit.version>
 
         <!-- Plugin versions -->
-        <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
-        <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
-        <maven-build-helper-plugin.version>1.9.1</maven-build-helper-plugin.version>
-        <spotbugs-maven-plugin.version>4.1.3</spotbugs-maven-plugin.version>
-        <spotbugs.version>4.1.3</spotbugs.version>
-        <maven-owasp-plugin.version>6.5.3</maven-owasp-plugin.version>
-        <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
-        <maven-sonar-plugin.version>3.9.1.2184</maven-sonar-plugin.version>
+        <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
+        <maven-build-helper-plugin.version>3.5.0</maven-build-helper-plugin.version>
+        <spotbugs-maven-plugin.version>4.8.1.0</spotbugs-maven-plugin.version>
+        <spotbugs.version>4.8.1</spotbugs.version>
+        <maven-owasp-plugin.version>8.4.0</maven-owasp-plugin.version>
+        <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
+        <maven-sonar-plugin.version>3.10.0.2594</maven-sonar-plugin.version>
 
         <!-- Plugin options -->
         <it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
@@ -211,7 +210,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>${maven-assembly-plugin.version}</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-dependency-plugin</artifactId>