Merge branch 'develop' into develop-v26.2

pom.xml

@@ -42,10 +42,10 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		
-		<aps.majorVersion>24.4</aps.majorVersion>
+		<aps.majorVersion>26.2</aps.majorVersion>
 		<aps.version>${aps.majorVersion}.0</aps.version>
-		<!-- APS v24.4.0 uses CXF v4.0.5 -->
+		<!-- APS v26.2.0 uses CXF v4.2.2 -->
-		<cxf.version>4.0.5</cxf.version>
+		<cxf.version>4.2.2</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">
@@ -374,7 +396,7 @@
 	<repositories>
 		<repository>
 			<id>activiti-enterprise-releases</id>
-			<url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases/</url>
+			<url>https://artifacts.alfresco.com/nexus/repository/activiti-enterprise-releases/</url>
 		</repository>
 	</repositories>
 </project>