Merge branch 'develop-v24.4' into develop-v25.1

.mvn/extensions.xml

@@ -5,6 +5,6 @@
 	<extension>
 		<groupId>com.inteligr8</groupId>
 		<artifactId>provided-scope-maven-extension</artifactId>
-		<version>1.0-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</extension>
 </extensions>

autoversion.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+echo "Configuring the next version ..."
+CURRENT_FULL_VERSION=`mvn help:evaluate -q -DforceStdout -Dexpression=project.version`
+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}"
+
+CURRENT_APS_MAJOR_VERSION=`mvn help:evaluate -q -DforceStdout -Dexpression=aps.majorVersion`
+echo "Detected the current APS major version: ${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

@@ -5,7 +5,7 @@
 	
 	<groupId>com.inteligr8.activiti</groupId>
 	<artifactId>cxf-activiti-app-ext</artifactId>
-	<version>1.4.SNAPSHOT-aps-v24.1</version>
+	<version>1.4-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	
 	<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS App</name>
@@ -42,9 +42,10 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		
-		<aps.version>24.1.0</aps.version>
-		<!-- APS v24.1.0 uses CXF v3.5.5 -->
-		<cxf.version>3.5.5</cxf.version>
+		<aps.majorVersion>25.1</aps.majorVersion>
+		<aps.version>${aps.majorVersion}.0</aps.version>
+		<!-- APS v25.1.0 uses CXF v4.1.1 -->
+		<cxf.version>4.1.1</cxf.version>
 	</properties>
 	
 	<dependencyManagement>
@@ -88,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 -->
@@ -118,7 +117,70 @@
 	</dependencies>
 
 	<build>
+		<pluginManagement>
 			<plugins>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<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>
+				</plugin>
+				<plugin>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>3.5.0</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-shade-plugin</artifactId>
+					<version>3.6.2</version>
+				</plugin>
+				<plugin>
+					<groupId>com.inteligr8</groupId>
+					<artifactId>merge-maven-plugin</artifactId>
+					<version>1.0.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>truezip-maven-plugin</artifactId>
+					<version>1.2</version>
+				</plugin>
+				<plugin>
+					<groupId>io.repaint.maven</groupId>
+					<artifactId>tiles-maven-plugin</artifactId>
+					<version>2.44</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>versions-maven-plugin</artifactId>
+				<configuration>
+					<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 -->
@@ -153,7 +215,6 @@
 			<plugin>
 				<groupId>com.inteligr8</groupId>
 				<artifactId>merge-maven-plugin</artifactId>
-				<version>1.0.1</version>
 				<executions>
 					<execution>
 						<id>merge-bus-extensions</id>
@@ -178,14 +239,17 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.6.2</version>
 				<executions>
 					<execution>
 						<id>shade-jar</id>
 						<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">
@@ -207,7 +271,6 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>truezip-maven-plugin</artifactId>
-				<version>1.2</version>
 				<executions>
 					<execution>
 						<id>overwrite-bus-extensions</id>
@@ -228,7 +291,6 @@
 			<plugin>
 				<groupId>io.repaint.maven</groupId>
 				<artifactId>tiles-maven-plugin</artifactId>
-				<version>2.44</version>
 				<extensions>true</extensions>
 				<configuration>
 					<tiles>
@@ -258,7 +320,47 @@
 				<maven.deploy.skip>true</maven.deploy.skip>
 			</properties>
 			<build>
+				<pluginManagement>
 					<plugins>
+						<plugin>
+							<artifactId>maven-gpg-plugin</artifactId>
+							<version>3.2.8</version>
+						</plugin>
+						<plugin>
+							<groupId>org.sonatype.central</groupId>
+							<artifactId>central-publishing-maven-plugin</artifactId>
+							<version>0.10.0</version>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+				<plugins>
+					<plugin>
+						<artifactId>maven-jar-plugin</artifactId>
+						<executions>
+							<!-- `source` is required for deploy to maven-central -->
+							<execution>
+								<id>sources-jar</id>
+								<phase>package</phase>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<configuration>
+									<classifier>sources</classifier>
+								</configuration>
+							</execution>
+							<!-- `javadoc` is required for deploy to maven-central -->
+							<execution>
+								<id>javadoc-jar</id>
+								<phase>package</phase>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<configuration>
+									<classifier>javadoc</classifier>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<artifactId>maven-gpg-plugin</artifactId>
 						<executions>
@@ -272,7 +374,6 @@
 					<plugin>
 						<groupId>org.sonatype.central</groupId>
 						<artifactId>central-publishing-maven-plugin</artifactId>
-						<version>0.8.0</version>
 						<extensions>true</extensions>
 						<configuration>
 							<publishingServerId>central</publishingServerId>