Prepare for PNC Jakarta versions (needed by Quarkus 3)

Author: dwalluck

core/pom.xml

@@ -96,11 +96,7 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.pnc</groupId>
-      <artifactId>pnc-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.pnc</groupId>
-      <artifactId>rest-client</artifactId>
+      <artifactId>rest-client${jakarta}</artifactId>
     </dependency>
     <dependency>
       <groupId>org.spdx</groupId>

maven-version-rules.xml

@@ -24,8 +24,8 @@
     <ignoreVersion type="regex">.+\.CR\d+</ignoreVersion>
     <ignoreVersion type="regex">.+\.Dev\d+</ignoreVersion>
     <ignoreVersion type="regex">.+-Alpha</ignoreVersion>
-    <ignoreVersion type="regex">.+-alpha-?\d+</ignoreVersion>
-    <ignoreVersion type="regex">.+-beta-?\d+</ignoreVersion>
+    <ignoreVersion type="regex">.+[-.][Aa]lpha-?\d+</ignoreVersion>
+    <ignoreVersion type="regex">.+[-.][Bb]eta-?\d+</ignoreVersion>
     <ignoreVersion type="regex">.+-M\d+</ignoreVersion>
     <ignoreVersion type="regex">.+-rc\d+</ignoreVersion>
   </ignoreVersions>
@@ -40,11 +40,6 @@
         <ignoreVersion type="regex">([^1]\..+|1\.[^4].*)</ignoreVersion>
       </ignoreVersions>
     </rule>
-    <rule groupId="org.hibernate.validator" comparisonMethod="maven">
-      <ignoreVersions>
-        <ignoreVersion type="regex">[^6]\..+</ignoreVersion>
-      </ignoreVersions>
-    </rule>
     <rule groupId="org.infinispan" comparisonMethod="maven">
       <ignoreVersions>
         <ignoreVersion type="regex">([2-9]+|1[^4].*)</ignoreVersion>
@@ -55,6 +50,11 @@
         <ignoreVersion type="regex">([^4]\..+|4\.[^6].*)</ignoreVersion>
       </ignoreVersions>
     </rule>
+    <rule groupId="org.jboss.resteasy" comparisonMethod="maven">
+      <ignoreVersions>
+        <ignoreVersion type="regex">[^3]\..+</ignoreVersion>
+      </ignoreVersions>
+    </rule>
     <rule groupId="org.jetbrains.kotlin" comparisonMethod="maven">
       <ignoreVersions>
         <ignoreVersion type="regex">([^1]\..+|1\.[^6].*)</ignoreVersion>

pom.xml

@@ -63,6 +63,7 @@
   </scm>
 
   <properties>
+    <jakarta />
     <koji.hub.url />
     <koji.web.url />
     <maven.compiler.release>17</maven.compiler.release>
@@ -86,6 +87,7 @@
     <version.commons-io>2.17.0</version.commons-io>
     <version.info.picocli>4.7.6</version.info.picocli>
     <version.io.dropwizard.metrics>4.2.28</version.io.dropwizard.metrics>
+    <version.jakarta.validation>3.1.0</version.jakarta.validation>
     <version.net.revelc.code.formatter>2.24.1</version.net.revelc.code.formatter>
     <version.net.revelc.code.impsort-maven-plugin>1.12.0</version.net.revelc.code.impsort-maven-plugin>
     <version.net.sourceforge.pmd>7.7.0</version.net.sourceforge.pmd>
@@ -134,15 +136,14 @@
     <version.org.ec4j.maven.editorconfig-maven-plugin>0.1.3</version.org.ec4j.maven.editorconfig-maven-plugin>
     <version.org.eclipse.packager>0.21.0</version.org.eclipse.packager>
     <version.org.fusesource.jansi>2.4.1</version.org.fusesource.jansi>
-    <version.org.hibernate.validator>6.2.5.Final</version.org.hibernate.validator>
+    <version.org.hibernate.validator>8.0.1.Final</version.org.hibernate.validator>
     <version.org.infinispan>14.0.32.Final</version.org.infinispan>
     <version.org.infinispan.protostream>4.6.5.Final</version.org.infinispan.protostream>
     <version.org.jacoco>0.8.12</version.org.jacoco>
     <version.org.jboss.byteman>4.0.23</version.org.jboss.byteman>
     <version.org.jboss.logging>3.6.1.Final</version.org.jboss.logging>
     <version.org.jboss.logmanager>3.0.6.Final</version.org.jboss.logmanager>
     <version.org.jboss.pnc>3.0.4</version.org.jboss.pnc>
-    <version.org.jboss.pnc.pnc-api>3.0.4</version.org.jboss.pnc.pnc-api>
     <version.org.jeasy>5.0.0</version.org.jeasy>
     <version.org.jetbrains.kotlin>1.6.21</version.org.jetbrains.kotlin>
     <version.org.json.json>20200518</version.org.json.json>
@@ -235,6 +236,11 @@
         <artifactId>picocli</artifactId>
         <version>${version.info.picocli}</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.validation</groupId>
+        <artifactId>jakarta.validation-api</artifactId>
+        <version>${version.jakarta.validation}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-collections4</artifactId>
@@ -288,7 +294,7 @@
         <artifactId>atlas-identities</artifactId>
         <version>${version.org.commonjava.atlas}</version>
       </dependency>
-      <!-- Required dependency for kojiji and pnc-rest-client -->
+      <!-- Required dependency for kojiji and rest-client -->
       <dependency>
         <groupId>org.commonjava.atlas</groupId>
         <artifactId>atlas-npm-identities</artifactId>
@@ -348,7 +354,7 @@
         <artifactId>jansi</artifactId>
         <version>${version.org.fusesource.jansi}</version>
       </dependency>
-      <!-- Required dependency for pnc-common and pnc-dto (6.x) -->
+      <!-- Required dependency for pnc-common and pnc-dto -->
       <dependency>
         <groupId>org.hibernate.validator</groupId>
         <artifactId>hibernate-validator</artifactId>
@@ -370,15 +376,34 @@
         <artifactId>jboss-logging</artifactId>
         <version>${version.org.jboss.logging}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jboss.pnc</groupId>
+        <artifactId>dto</artifactId>
+        <version>${version.org.jboss.pnc}</version>
+        <classifier>patch-builders${jakarta}</classifier>
+        <exclusions>
+          <exclusion>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <!-- Required dependency for resteasy-client -->
       <dependency>
         <groupId>org.jboss.pnc</groupId>
         <artifactId>pnc-api</artifactId>
-        <version>${version.org.jboss.pnc.pnc-api}</version>
+        <version>${version.org.jboss.pnc}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.pnc</groupId>
-        <artifactId>rest-client</artifactId>
+        <artifactId>rest-client${jakarta}</artifactId>
         <version>${version.org.jboss.pnc}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.pnc.dto</groupId>
+            <artifactId>dto</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.jboss.pnc.build.finder</groupId>
@@ -637,6 +662,12 @@
   </dependencyManagement>
 
   <dependencies>
+    <!-- Required dependency for rest-client -->
+    <dependency>
+      <groupId>org.jboss.pnc</groupId>
+      <artifactId>dto</artifactId>
+      <classifier>patch-builders${jakarta}</classifier>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>