Merge branch 'develop-acs25' into stable-acs25

pom.xml

@@ -105,7 +105,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.5.0</version>
 				<configuration>
 					<filesets>
 						<fileset>
@@ -120,7 +120,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.8.1</version>
 				<executions>
 					<execution>
 						<id>download-api-explorer</id>
@@ -218,7 +218,7 @@
 			<plugin>
 				<groupId>com.inteligr8</groupId>
 				<artifactId>regex-maven-plugin</artifactId>
-				<version>1.0.5</version>
+				<version>1.0.6</version>
 				<executions>
 					<execution>
 						<id>fix-baseUrl</id>
@@ -292,12 +292,38 @@
 							</regexes>
 						</configuration>
 					</execution>
+					<execution>
+						<id>fix-NodeBodyUpdateProperties</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>replace-file</goal>
+						</goals>
+						<configuration>
+							<filesets>
+								<fileset>
+									<directory>${basedir}/src/gen/java/com/inteligr8/alfresco/acs/model</directory>
+									<outputDirectory>${basedir}/src/gen/java/com/inteligr8/alfresco/acs/model</outputDirectory>
+								</fileset>
+							</filesets>
+							<allowMultiLineMatch>true</allowMultiLineMatch>
+							<regexes>
+								<regex>
+									<pattern>Map&lt;String, String&gt; properties</pattern>
+									<replacement>Map&lt;String, Object&gt; properties</replacement>
+								</regex>
+								<regex>
+									<pattern>Map&lt;String, String&gt; getProperties</pattern>
+									<replacement>Map&lt;String, Object&gt; getProperties</replacement>
+								</regex>
+							</regexes>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
 				<groupId>net.revelc.code</groupId>
 				<artifactId>impsort-maven-plugin</artifactId>
-				<version>1.6.2</version>
+				<version>1.9.0</version>
 				<executions>
 					<execution>
 						<id>organize-imports</id>
@@ -318,7 +344,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.6.1</version>
 				<executions>
 					<execution>
 						<id>add-gensrc</id>