Merge pull request #54 from 4PointSolutions/20251022_SampleProjects_TestContainers

Modify sample apps to support real AEM instances (including Test Containers images)

Author: rmcdouga

…b/workflows/spring-sample-web-app-ci.yml …/workflows/spring-sample-web-apps-ci.yml.github/workflows/spring-sample-web-app-ci.yml renamed to .github/workflows/spring-sample-web-apps-ci.yml .github/workflows/spring-sample-web-app-ci.yml renamed to .github/workflows/spring-sample-web-apps-ci.yml

@@ -33,12 +33,12 @@ jobs:
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file
 
-    - name: Build Sample Web App with Maven
-      run: mvn -B install -s $GITHUB_WORKSPACE/settings.xml --file spring/fluentforms-sample-web-app
+    - name: Build Sample Jersey Web App with Maven
+      run: mvn -B install -s $GITHUB_WORKSPACE/settings.xml --file spring/fluentforms-sample-web-jersey-app
       env:
         GITHUB_TOKEN: ${{ github.token }}
 
-    - name: Build Sample Web App with Maven
+    - name: Build Sample Web MVC App with Maven
       run: mvn -B install -s $GITHUB_WORKSPACE/settings.xml --file spring/fluentforms-sample-webmvc-app
       env:
         GITHUB_TOKEN: ${{ github.token }}

spring/fluentforms-sample-web-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/FluentFormsResourcesTest.java

@@ -11,11 +11,12 @@
 	<artifactId>fluentforms-sample-web-app</artifactId>
 	<version>0.0.4-SNAPSHOT</version>
 	<name>Fluent Forms Spring Boot Sample Web Application</name>
-	<description>Sample Spring Boot Web Application that utilizes the Fluent Forms Spring Boot Starters</description>
+	<description>Sample Spring Boot Web Application (using Jersey JAX-RS) that utilizes the Fluent Forms Spring Boot Starters</description>
 
 	<properties>
 		<java.version>17</java.version>
-		<wiremock.version>4.0.0-beta.15</wiremock.version>
+		<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>
 		<fp.hamcrest.matchers.version>0.0.4-SNAPSHOT</fp.hamcrest.matchers.version>
@@ -82,6 +83,12 @@
 			<version>${wiremock.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.wiremock.integrations</groupId>
+			<artifactId>wiremock-spring-boot</artifactId>
+			<version>${wiremock-spring-boot.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.4point.testing</groupId>
 			<artifactId>4point-hamcrest-matchers</artifactId>
@@ -93,6 +100,16 @@
 			<artifactId>htmlunit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>