chore(deps): Update recaptcha demosite dependencies.

Author: Cory-Kramer

recaptcha_enterprise/demosite/pom.xml

@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.example.recaptchaenterprise</groupId>
   <artifactId>demosite</artifactId>
@@ -37,7 +36,7 @@
         <groupId>com.google.cloud</groupId>
         <scope>import</scope>
         <type>pom</type>
-        <version>26.32.0</version>
+        <version>26.75.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -46,11 +45,18 @@
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <app.mainclass>app.SpringbootMain</app.mainclass>
-    <spring.boot.version>2.7.18</spring.boot.version>
+    <spring.boot.version>4.1.0-M4</spring.boot.version>
+    <jacoco.version>0.8.12</jacoco.version>
   </properties>
 
   <dependencies>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+
+
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-recaptchaenterprise</artifactId>
@@ -60,7 +66,7 @@
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20231013</version>
+      <version>20251224</version>
     </dependency>
 
 
@@ -89,10 +95,15 @@
       <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.4.0</version>
+      <version>1.4.5</version>
       <scope>test</scope>
     </dependency>
     <!-- end_test_dependencies -->
@@ -178,6 +189,25 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>${jacoco.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

recaptcha_enterprise/demosite/src/test/java/ScoreKeyIT.java

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-package app;
-
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
@@ -38,7 +36,6 @@
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.SearchContext;
@@ -51,10 +48,8 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.util.UriComponentsBuilder;
 
-@RunWith(SpringJUnit4ClassRunner.class)
 @EnableAutoConfiguration
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @Ignore
@@ -69,16 +64,16 @@ public class ScoreKeyIT {
   // CSS selector of reCAPTCHA button in /home page. Used to execute Javascript actions.
   private static final String HOME_BUTTON_SELECTOR = "#example > button";
 
-  // CSS selector of reCAPTCHA button in all pages, except /home. Used to execute Javascript actions.
+  // CSS selector of reCAPTCHA button in all pages, except /home. Used to execute Javascript
+  // actions.
   private static final String BUTTON_SELECTOR = "button";
 
   // CSS selector of reCAPTCHA result in page. Used to execute Javascript actions.
   private static final String RESULT_SELECTOR = "#result pre";
 
   private static final String SHADOW_HOST_SELECTOR = "recaptcha-demo";
   private static WebDriver browser;
-  @LocalServerPort
-  private int randomServerPort;
+  @LocalServerPort private int randomServerPort;
 
   private ByteArrayOutputStream stdOut;
 
@@ -95,7 +90,7 @@ public static void setUp() throws IOException, InterruptedException {
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
 
     // Create reCAPTCHA Score key.
-    RECAPTCHA_SITE_KEY = app.Util.createSiteKey(PROJECT_ID, DOMAIN_NAME, IntegrationType.SCORE);
+    RECAPTCHA_SITE_KEY = Util.createSiteKey(PROJECT_ID, DOMAIN_NAME, IntegrationType.SCORE);
     TimeUnit.SECONDS.sleep(5);
 
     // Set Selenium Driver to Chrome.
@@ -110,7 +105,7 @@ public static void cleanUp()
     ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
     System.setOut(new PrintStream(stdOut));
 
-    app.Util.deleteSiteKey(PROJECT_ID, RECAPTCHA_SITE_KEY);
+    Util.deleteSiteKey(PROJECT_ID, RECAPTCHA_SITE_KEY);
     assertThat(stdOut.toString()).contains("reCAPTCHA Site key successfully deleted !");
 
     browser.quit();
@@ -133,22 +128,20 @@ public void afterEach() {
 
   // Construct the page URL with necessary context parameters.
   public static String makeRequest(String url, String siteKey) throws MalformedURLException {
-    return
-        UriComponentsBuilder.fromUriString(url)
-            .queryParam("project_id", PROJECT_ID)
-            .queryParam("site_key", siteKey)
-            .build()
-            .encode()
-            .toUri()
-            .toURL()
-            .toString();
+    return UriComponentsBuilder.fromUriString(url)
+        .queryParam("project_id", PROJECT_ID)
+        .queryParam("site_key", siteKey)
+        .build()
+        .encode()
+        .toUri()
+        .toURL()
+        .toString();
   }
 
   // Retrieve page and click the button specified by the element to obtain
   // response and redirect URL.
-  public ImmutableMap<String, String> browserTest(String pageUrl, String buttonXPath,
-      String resultXPath,
-      boolean scoreOnPageLoad)
+  public ImmutableMap<String, String> browserTest(
+      String pageUrl, String buttonXPath, String resultXPath, boolean scoreOnPageLoad)
       throws JSONException, InterruptedException {
     browser.get(pageUrl);
 

recaptcha_enterprise/demosite/src/test/java/Util.java

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-package app;
-
 import com.google.cloud.recaptchaenterprise.v1.RecaptchaEnterpriseServiceClient;
 import com.google.recaptchaenterprise.v1.CreateKeyRequest;
 import com.google.recaptchaenterprise.v1.DeleteKeyRequest;
@@ -46,8 +44,8 @@ public static String createSiteKey(String projectID, String domainName, Integrat
       // For different types, see: https://cloud.google.com/recaptcha-enterprise/docs/keys
       Key scoreKey =
           Key.newBuilder()
-              .setDisplayName("test-key-recaptcha-demosite-" +
-                  UUID.randomUUID().toString().split("-")[0])
+              .setDisplayName(
+                  "test-key-recaptcha-demosite-" + UUID.randomUUID().toString().split("-")[0])
               .setWebSettings(
                   WebKeySettings.newBuilder()
                       .addAllowedDomains(domainName)
@@ -91,5 +89,4 @@ public static void deleteSiteKey(String projectID, String recaptchaSiteKey)
       System.out.println("reCAPTCHA Site key successfully deleted !");
     }
   }
-
 }