Merge branch 'develop-v25.3' into develop-v26.1

autoversion.sh

@@ -5,17 +5,18 @@ CURRENT_FULL_VERSION=`mvn help:evaluate -q -DforceStdout -Dexpression=project.ve
 echo "Detected the current version: ${CURRENT_FULL_VERSION}"
 CURRENT_MINOR_VERSION=`echo "${CURRENT_FULL_VERSION}" | sed 's~^\([^\.]\+\.[^\.\-]\+\).*~\1~'`
 echo "Computed the current minor version: ${CURRENT_MINOR_VERSION}"
-set +e
-LATEST_SERVICE_VERSION=`git ls-remote --tags --refs --sort=-v:refname origin v${CURRENT_MINOR_VERSION}* | grep refs/tags | head -n1 | sed "s~.\+refs/tags/v${CURRENT_MINOR_VERSION}\.\(.\+\)~\1~"`
-set -e
-echo "Detected the latest service version in Git for the minor version: ${CURRENT_MINOR_VERSION} => ${LATEST_SERVICE_VERSION}"
-if [[ -z ${LATEST_SERVICE_VERSION} ]]; then
-	LATEST_SERVICE_VERSION=-1
-fi
-NEXT_FULL_VERSION="${CURRENT_MINOR_VERSION}.$((LATEST_SERVICE_VERSION + 1))"
-echo "Computed the next version: ${NEXT_FULL_VERSION}"
 
 CURRENT_APS_MAJOR_VERSION=`mvn help:evaluate -q -DforceStdout -Dexpression=aps.majorVersion`
 echo "Detected the current APS major version: ${CURRENT_APS_MAJOR_VERSION}"
 
-mvn versions:set -DnewVersion=${NEXT_FULL_VERSION}-aps-v${CURRENT_APS_MAJOR_VERSION}
+set +e
+LATEST_SERVICE_VERSION=`git ls-remote --tags --refs --sort=-v:refname origin v${CURRENT_MINOR_VERSION}*-aps-v${CURRENT_APS_MAJOR_VERSION} | grep refs/tags | head -n1 | sed "s~.\+refs/tags/v${CURRENT_MINOR_VERSION}\.\([^\.\-]\+\).*~\1~"`
+set -e
+echo "Detected the latest service version in Git for the minor version: ${CURRENT_MINOR_VERSION}.#-aps-v${CURRENT_APS_MAJOR_VERSION} => ${LATEST_SERVICE_VERSION}"
+if [[ -z ${LATEST_SERVICE_VERSION} ]]; then
+	LATEST_SERVICE_VERSION=-1
+fi
+NEXT_FULL_VERSION="${CURRENT_MINOR_VERSION}.$((LATEST_SERVICE_VERSION + 1))-aps-v${CURRENT_APS_MAJOR_VERSION}"
+echo "Computed the next version: ${NEXT_FULL_VERSION}"
+
+mvn versions:set -DnewVersion=${NEXT_FULL_VERSION}

pom.xml

@@ -42,10 +42,10 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		
-		<aps.majorVersion>25.2</aps.majorVersion>
+		<aps.majorVersion>26.1</aps.majorVersion>
 		<aps.version>${aps.majorVersion}.0</aps.version>
-		<!-- APS v25.2.0 uses CXF v4.1.2 -->
+		<!-- APS v26.1.0 uses CXF v4.2.0 -->
-		<cxf.version>4.1.2</cxf.version>
+		<cxf.version>4.2.0</cxf.version>
 	</properties>
 	
 	<dependencyManagement>