🔀 Merge branch 'master' into 20251026_Replace_Jersey_With_WebMVC

rmcdouga · rmcdouga · commit c7e222cf73ef · 2025-11-27T09:58:58.000-05:00
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Fluent Forms CI](https://github.com/4PointSolutions/FluentFormsAPI/actions/workflows/fluentforms-ci.yml/badge.svg)](https://github.com/4PointSolutions/FluentFormsAPI/actions/workflows/fluentforms-ci.yml)
 [![REST Services CI](https://github.com/4PointSolutions/FluentFormsAPI/actions/workflows/rest-services-ci.yml/badge.svg)](https://github.com/4PointSolutions/FluentFormsAPI/actions/workflows/rest-services-ci.yml)
 [![Spring Boot Starter CI](https://github.com/4PointSolutions/FluentFormsAPI/actions/workflows/spring-boot-starter-ci.yml/badge.svg)](https://github.com/4PointSolutions/FluentFormsAPI/actions/workflows/spring-boot-starter-ci.yml)
-[![Spring Sample Web App CI](https://github.com/4PointSolutions/FluentFormsAPI/actions/workflows/spring-sample-web-app-ci.yml/badge.svg)](https://github.com/4PointSolutions/FluentFormsAPI/actions/workflows/spring-sample-web-app-ci.yml)
+[![Spring Sample Web App CI](https://github.com/4PointSolutions/FluentFormsAPI/actions/workflows/spring-sample-web-apps-ci.yml/badge.svg)](https://github.com/4PointSolutions/FluentFormsAPI/actions/workflows/spring-sample-web-apps-ci.yml)
 
 The FluentForms API project is a set of Java libraries that allow remote access to 
 [Adobe Experience Manager Forms](https://experienceleague.adobe.com/docs/experience-manager-65/content/forms/getting-started/introduction-aem-forms.html?lang=en) (a.k.a. AEM Forms) 
diff --git a/fluentforms/core/pom.xml b/fluentforms/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com._4point.aem</groupId>
         <artifactId>fluentforms</artifactId>
-        <version>0.0.4-SNAPSHOT</version>
+        <version>0.0.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>fluentforms.core</artifactId>
diff --git a/fluentforms/examples/pom.xml b/fluentforms/examples/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com._4point.aem</groupId>
 		<artifactId>fluentforms</artifactId>
-		<version>0.0.4-SNAPSHOT</version>
+		<version>0.0.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>fluentforms.examples</artifactId>
 	<name>FluentForms Examples</name>
@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>com._4point.aem</groupId>
 			<artifactId>fluentforms.core</artifactId>
-			<version>0.0.4-SNAPSHOT</version>
+			<version>0.0.5-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/fluentforms/pom.xml b/fluentforms/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com._4point.aem</groupId>
     <artifactId>fluentforms</artifactId>
     <packaging>pom</packaging>
-    <version>0.0.4-SNAPSHOT</version>
+    <version>0.0.5-SNAPSHOT</version>
     <description>fluent-forms-api</description>
 
 	<!--
diff --git a/rest-services/client/pom.xml b/rest-services/client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com._4point.aem.docservices</groupId>
         <artifactId>rest-services</artifactId>
-        <version>0.0.4-SNAPSHOT</version>
+        <version>0.0.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>rest-services.client</artifactId>
diff --git a/rest-services/it.tests/pom.xml b/rest-services/it.tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com._4point.aem.docservices</groupId>
 		<artifactId>rest-services</artifactId>
-		<version>0.0.4-SNAPSHOT</version>
+		<version>0.0.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>rest-services.it.tests</artifactId>
 	<name>Integration Tests</name>
diff --git a/rest-services/jersey-client/pom.xml b/rest-services/jersey-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com._4point.aem.docservices</groupId>
 		<artifactId>rest-services</artifactId>
-		<version>0.0.4-SNAPSHOT</version>
+		<version>0.0.5-SNAPSHOT</version>
 	</parent>
 	<groupId>com._4point.aem.docservices.rest-services</groupId>
 	<artifactId>rest-services.jersey-client</artifactId>
diff --git a/rest-services/pom.xml b/rest-services/pom.xml
@@ -14,7 +14,7 @@
 	<groupId>com._4point.aem.docservices</groupId>
 	<artifactId>rest-services</artifactId>
 	<packaging>pom</packaging>
-	<version>0.0.4-SNAPSHOT</version>
+	<version>0.0.5-SNAPSHOT</version>
 	<description>AEM Document Services REST Services</description>
 
 	<!--
@@ -83,8 +83,8 @@
 		<jersey.version>3.1.10</jersey.version>
 		<jaxb.version>4.0.2</jaxb.version>
 		<sling.servlet-helpers.version>1.4.6</sling.servlet-helpers.version>
-		<fluentforms.version>0.0.4-SNAPSHOT</fluentforms.version>
-		<rest-services.version>0.0.4-SNAPSHOT</rest-services.version>
+		<fluentforms.version>0.0.5-SNAPSHOT</fluentforms.version>
+		<rest-services.version>0.0.5-SNAPSHOT</rest-services.version>
 
 		<!-- Testing dependencies -->
         <mockito.version>5.18.0</mockito.version>
diff --git a/rest-services/server/pom.xml b/rest-services/server/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com._4point.aem.docservices</groupId>
         <artifactId>rest-services</artifactId>
-        <version>0.0.4-SNAPSHOT</version>
+        <version>0.0.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>rest-services.server</artifactId>
diff --git a/spring/fluentforms-sample-cli-app/pom.xml b/spring/fluentforms-sample-cli-app/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com._4point.aem.fluentforms</groupId>
 	<artifactId>fluentforms-sample-cli-app</artifactId>
-	<version>0.0.4-SNAPSHOT</version>
+	<version>0.0.5-SNAPSHOT</version>
 	<name>Simple Sample App</name>
 
 	<distributionManagement>
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>com._4point.aem.fluentforms</groupId>
 			<artifactId>fluentforms-spring-boot-starter</artifactId>
-			<version>0.0.4-SNAPSHOT</version>
+			<version>0.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring/fluentforms-sample-web-jersey-app/pom.xml b/spring/fluentforms-sample-web-jersey-app/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com._4point.aem.fluentforms</groupId>
 	<artifactId>fluentforms-sample-web-app</artifactId>
-	<version>0.0.4-SNAPSHOT</version>
+	<version>0.0.5-SNAPSHOT</version>
 	<name>Fluent Forms Spring Boot Sample Web Application</name>
 	<description>Sample Spring Boot Web Application (using Jersey JAX-RS) that utilizes the Fluent Forms Spring Boot Starters</description>
 
diff --git a/spring/fluentforms-sample-web-jersey-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/WireMockAemProxyEndpointTest.java b/spring/fluentforms-sample-web-jersey-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/WireMockAemProxyEndpointTest.java
@@ -32,7 +32,9 @@
 @EnabledIf("com._4point.aem.fluentforms.sampleapp.resources.TestConstants#runWiremockTests")
 @WireMockTest()
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, 
-				classes = FluentFormsSpringApplication.class
+				classes = FluentFormsSpringApplication.class,
+				// Wiremock produces a lot of output, the following entries reduce that output.  They can be removed for debugging.
+				properties = {"logging.level.org.wiremock.spring=WARN", "logging.level.WireMock.wiremock=WARN"}
 				)
 @EnableWireMock(@ConfigureWireMock(
 					portProperties = "fluentforms.aem.port"
diff --git a/spring/fluentforms-sample-web-jersey-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/WireMockFluentFormsResourcesTest.java b/spring/fluentforms-sample-web-jersey-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/WireMockFluentFormsResourcesTest.java
@@ -22,7 +22,9 @@
 @EnabledIf("com._4point.aem.fluentforms.sampleapp.resources.TestConstants#runWiremockTests")
 @WireMockTest()
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, 
-				classes = FluentFormsSpringApplication.class
+				classes = FluentFormsSpringApplication.class,
+				// Wiremock produces a lot of output, the following entries reduce that output.  They can be removed for debugging.
+				properties = {"logging.level.org.wiremock.spring=WARN", "logging.level.WireMock.wiremock=WARN"}
 				)
 @EnableWireMock(@ConfigureWireMock(
 					portProperties = "fluentforms.aem.port"
diff --git a/spring/fluentforms-sample-webmvc-app/pom.xml b/spring/fluentforms-sample-webmvc-app/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com._4point.aem.fluentforms</groupId>
 	<artifactId>fluentforms-sample-webmvc-app</artifactId>
-	<version>0.0.4-SNAPSHOT</version>
+	<version>0.0.5-SNAPSHOT</version>
 	<name>Fluent Forms Spring Boot Sample Web MVC Application</name>
 	<description>Sample Spring Boot Web MVC Application that utilizes the Fluent Forms Spring Boot Starters</description>
 
@@ -19,7 +19,7 @@
 		<wiremock.version>3.13.1</wiremock.version>
 		<wiremock-spring-boot.version>3.10.6</wiremock-spring-boot.version>
 		<htmlunit.version>4.16.0</htmlunit.version>
-		<fluentforms.spring.boot.starter.version>0.0.4-SNAPSHOT</fluentforms.spring.boot.starter.version>
+		<fluentforms.spring.boot.starter.version>0.0.5-SNAPSHOT</fluentforms.spring.boot.starter.version>
 		<fp.hamcrest.matchers.version>0.0.4-SNAPSHOT</fp.hamcrest.matchers.version>
 	</properties>
 
diff --git a/spring/fluentforms-sample-webmvc-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/WireMockAemProxyEndpointTest.java b/spring/fluentforms-sample-webmvc-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/WireMockAemProxyEndpointTest.java
@@ -27,7 +27,9 @@
 @EnabledIf("com._4point.aem.fluentforms.sampleapp.resources.TestConstants#runWiremockTests")
 @WireMockTest()
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, 
-				classes = FluentFormsSpringApplication.class
+				classes = FluentFormsSpringApplication.class,
+				// Wiremock produces a lot of output, the following entries reduce that output.  They can be removed for debugging.
+				properties = {"logging.level.org.wiremock.spring=WARN", "logging.level.WireMock.wiremock=WARN"}
 				)
 @EnableWireMock(@ConfigureWireMock(
 					portProperties = "fluentforms.aem.port"
diff --git a/spring/fluentforms-sample-webmvc-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/WireMockFluentFormsResourcesTest.java b/spring/fluentforms-sample-webmvc-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/WireMockFluentFormsResourcesTest.java
@@ -22,7 +22,10 @@
 @EnabledIf("com._4point.aem.fluentforms.sampleapp.resources.TestConstants#runWiremockTests")
 @WireMockTest()
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, 
-				classes = FluentFormsSpringApplication.class
+				classes = FluentFormsSpringApplication.class,
+				// Wiremock produces a lot of output, the following entries reduce that output.  They can be removed for debugging.
+				properties = {"logging.level.org.wiremock.spring=WARN", "logging.level.WireMock.wiremock=WARN"}
+
 				)
 @EnableWireMock(@ConfigureWireMock(
 					portProperties = "fluentforms.aem.port"
diff --git a/spring/fluentforms-spring-boot-autoconfigure/pom.xml b/spring/fluentforms-spring-boot-autoconfigure/pom.xml
@@ -10,14 +10,14 @@
 	</parent>
 	<groupId>com._4point.aem.fluentforms</groupId>
 	<artifactId>fluentforms-spring-boot-autoconfigure</artifactId>
-	<version>0.0.4-SNAPSHOT</version>
+	<version>0.0.5-SNAPSHOT</version>
 	<name>FluentForms AutoConfigure Project</name>
 
 	<properties>
 		<java.version>17</java.version>
 		<jasypt.spring.boot.version>3.0.5</jasypt.spring.boot.version>
 		<jasypt.maven.plugin.version>3.0.5</jasypt.maven.plugin.version>
-		<fluentforms.version>0.0.4-SNAPSHOT</fluentforms.version>
+		<fluentforms.version>0.0.5-SNAPSHOT</fluentforms.version>
 		<fp.hamcrest.matchers.version>0.0.4-SNAPSHOT</fp.hamcrest.matchers.version>
 		<wiremock.version>4.0.0-beta.16</wiremock.version>
 		<pitest.maven.plugin.version>1.20.2</pitest.maven.plugin.version>
diff --git a/spring/fluentforms-spring-boot-starter/pom.xml b/spring/fluentforms-spring-boot-starter/pom.xml
@@ -10,15 +10,15 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>fluentforms-spring-boot-starter</artifactId>
-	<version>0.0.4-SNAPSHOT</version>
+	<version>0.0.5-SNAPSHOT</version>
 	<name>FluentForms Spring Boot Starter</name>
 	<description>Spring Boot starter for FluentForms library</description>
 	<properties>
 		<java.version>17</java.version>
 		<jasypt.spring.boot.version>3.0.5</jasypt.spring.boot.version>
 		<jasypt.maven.plugin.version>3.0.5</jasypt.maven.plugin.version>
-		<fluentforms.version>0.0.4-SNAPSHOT</fluentforms.version>
-		<fluentforms-autoconfigure.version>0.0.4-SNAPSHOT</fluentforms-autoconfigure.version>
+		<fluentforms.version>0.0.5-SNAPSHOT</fluentforms.version>
+		<fluentforms-autoconfigure.version>0.0.5-SNAPSHOT</fluentforms-autoconfigure.version>
 	</properties>
 
 	<distributionManagement>
