Update version number to 11.8.0-beta5

Author: edewata

pki.spec

@@ -16,13 +16,13 @@ Name:             pki
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global           release_number 0.4
+%global           release_number 0.5
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
 # - stabilization (unsupported): beta<n> where n >= 1
 # - GA/update (supported): <none>
-%global           phase beta4
+%global           phase beta5
 
 %undefine         timestamp
 %undefine         commit_id
@@ -200,14 +200,14 @@ BuildRequires:    javapackages-tools
 BuildRequires:    xmlstarlet
 %endif
 
-BuildRequires:    tomcat-lib
+BuildRequires:    tomcat-lib >= 1:10.1.36
 BuildRequires:    tomcat-jakartaee-migration
 
-BuildRequires:    pki-resteasy-core                 >= 3.0.26-33
-BuildRequires:    pki-resteasy-client               >= 3.0.26-33
-BuildRequires:    pki-resteasy-servlet-initializer  >= 3.0.26-33
-BuildRequires:    pki-resteasy-jackson2-provider    >= 3.0.26-33
-BuildRequires:    pki-resteasy                      >= 3.0.26-33
+BuildRequires:    pki-resteasy-core                 >= 3.0.26
+BuildRequires:    pki-resteasy-client               >= 3.0.26
+BuildRequires:    pki-resteasy-servlet-initializer  >= 3.0.26
+BuildRequires:    pki-resteasy-jackson2-provider    >= 3.0.26
+BuildRequires:    pki-resteasy                      >= 3.0.26
 
 
 BuildRequires:    mvn(commons-cli:commons-cli)
@@ -241,7 +241,6 @@ BuildRequires:    mvn(org.jboss.resteasy:resteasy-jaxrs)
 BuildRequires:    mvn(org.jboss.resteasy:resteasy-client)
 BuildRequires:    mvn(org.jboss.resteasy:resteasy-jackson2-provider)
 BuildRequires:    mvn(org.jboss.resteasy:resteasy-servlet-initializer)
-
 %endif
 
 BuildRequires:    mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.36
@@ -1136,6 +1135,12 @@ then
     /usr/bin/javax2jakarta -logLevel=ALL -profile=EE   jakarta.annotation-api-$JAKARTA_ANNOTATION_API_VERSION.jar jakarta.annotation-api-$JAKARTA_ANNOTATION_API_VERSION.jar  
     /usr/bin/javax2jakarta -logLevel=ALL -profile=EE   jakarta.xml.bind-api-$JAXB_API_VERSION.jar jakarta.xml.bind-api-$JAXB_API_VERSION.jar 
 
+    # Now migrate the required resteasy jars, in case we are using an existing resteasy version.
+
+    /usr/bin/javax2jakarta -logLevel=ALL -profile=EE resteasy-client-$RESTEASY_VERSION.jar  resteasy-client-$RESTEASY_VERSION.jar
+    /usr/bin/javax2jakarta -logLevel=ALL -profile=EE resteasy-jackson2-provider-$RESTEASY_VERSION.jar resteasy-jackson2-provider-$RESTEASY_VERSION.jar
+    /usr/bin/javax2jakarta -logLevel=ALL -profile=EE resteasy-jaxrs-$RESTEASY_VERSION.jar  resteasy-jaxrs-$RESTEASY_VERSION.jar
+
     # Add local artifact so we can compile against the migrated jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar
     # We could have used the maven install plugin but it's not available with standard rpms.
 
@@ -1160,6 +1165,8 @@ then
     cp /usr/share/java/resteasy/resteasy-servlet-initializer.jar \
         resteasy-servlet-initializer-$RESTEASY_VERSION.jar
 
+    # Migrate the resteasy servlet initializer, in case we are using an existing resteasy version.
+    /usr/bin/javax2jakarta -logLevel=ALL -profile=EE resteasy-servlet-initializer-$RESTEASY_VERSION.jar resteasy-servlet-initializer-$RESTEASY_VERSION.jar
     ls -l
     popd
 fi
@@ -1275,7 +1282,6 @@ export JAVA_HOME=%{java_home}
 
 %if %{with maven}
 # build Java binaries and run unit tests with Maven
-
 %mvn_build %{!?with_test:-f} -j
 
 # create links to Maven-built JAR files for CMake