Merge branch 'develop-v25.2' into develop-v25.3

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>25.3</aps.majorVersion>
 		<aps.version>${aps.majorVersion}.0</aps.version>
-		<!-- APS v25.2.0 uses CXF v4.1.2 -->
+		<!-- APS v25.3.0 uses CXF v4.1.3 -->
-		<cxf.version>4.1.2</cxf.version>
+		<cxf.version>4.1.3</cxf.version>
 	</properties>
 	
 	<dependencyManagement>
@@ -89,13 +89,11 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
-			<scope>runtime</scope>
 		</dependency>
 		<!-- Package JackSON joda-time support -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-joda</artifactId>
-			<scope>runtime</scope>
 		</dependency>
 
 		<!-- Provided by APS -->
@@ -126,6 +124,11 @@
 					<artifactId>versions-maven-plugin</artifactId>
 					<version>2.21.0</version>
 				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>flatten-maven-plugin</artifactId>
+					<version>1.7.0</version>
+				</plugin>
 				<plugin>
 					<artifactId>maven-dependency-plugin</artifactId>
 					<version>3.11.0</version>
@@ -163,6 +166,21 @@
 					<property>base.version</property>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<!-- this is required because we are not creating a new POM when shading -->
+						<id>flatten-pom</id>
+						<phase>process-resources</phase>
+						<goals><goal>flatten</goal></goals>
+						<configuration>
+							<flattenMode>ossrh</flattenMode>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<!-- Several CXF libraries have a bus-extensions.txt file that will overwrite each other during the packaging process -->
 			<!-- Only the last one packaged will have its contents in tact -->
 			<!-- We need the contents of all of them and that can be done by simply concatenating them -->
@@ -227,7 +245,11 @@
 						<phase>package</phase>
 						<goals><goal>shade</goal></goals>
 						<configuration>
+							<!-- without this, the main artifact is shaded -->
 							<shadedArtifactAttached>true</shadedArtifactAttached>
+							<!-- this keeps the dependencies in POM, letting downstream projects know what this library provides -->
+							<!-- this is necessary as we are not renaming/relocating any packages -->
+							<createDependencyReducedPom>false</createDependencyReducedPom>
 							<transformers>
 								<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
 								<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">