Merge branch 'main' into 7098-application-container

Author: KyleAure

README.md

@@ -8,7 +8,7 @@
 
 ![Testcontainers logo](docs/logo.png)
 
-# [Read the documentation here](http://www.testcontainers.org)
+# [Read the documentation here](https://java.testcontainers.org)
 
 ## License
 

core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java

@@ -269,7 +269,7 @@ public boolean test(DockerClientProviderStrategy dockerClientProviderStrategy) {
                     "Could not find a valid Docker environment. Please check configuration. Attempted configurations were:\n" +
                     configurationFailures.stream().map(it -> "\t" + it).collect(Collectors.joining("\n")) +
                     "As no valid configuration was found, execution cannot continue.\n" +
-                    "See https://www.testcontainers.org/on_failure.html for more details."
+                    "See https://java.testcontainers.org/on_failure.html for more details."
                 );
 
                 FAIL_FAST_ALWAYS.set(true);

docs/error_missing_container_runtime_environment.md

@@ -13,4 +13,4 @@ Here is a list of supported container runtime environments:
 * [Testcontainers Cloud](https://www.testcontainers.cloud?utm_medium=direct&utm_source=testcontainers.com&utm_content=docs&utm_term=on-failure)
 
 For more extensive information on supported container runtime environments, as well as known limitations of alternative container runtime environments,
-please refer to [this page](https://www.testcontainers.org/supported_docker_environment/) in our documentation.
+please refer to [this page](https://java.testcontainers.org/supported_docker_environment/) in our documentation.

gradle/publishing.gradle

@@ -30,7 +30,7 @@ publishing {
 
                     name project.description
                     description 'Isolated container management for Java code testing'
-                    url 'https://testcontainers.org'
+                    url 'https://java.testcontainers.org'
                     issueManagement {
                         system 'GitHub'
                         url 'https://github.com/testcontainers/testcontainers-java/issues'

modules/selenium/build.gradle

@@ -3,11 +3,11 @@ description = "Testcontainers :: Selenium"
 dependencies {
     api project(':testcontainers')
 
-    provided 'org.seleniumhq.selenium:selenium-remote-driver:4.6.0'
-    provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.6.0'
-    testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:4.6.0'
-    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver:4.8.3'
-    testImplementation 'org.seleniumhq.selenium:selenium-support:4.6.0'
+    provided 'org.seleniumhq.selenium:selenium-remote-driver:4.10.0'
+    provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.10.0'
+    testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:4.10.0'
+    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver:4.10.0'
+    testImplementation 'org.seleniumhq.selenium:selenium-support:4.10.0'
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':nginx')

modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java

@@ -8,9 +8,7 @@
 
 public class SpecificImageNameWebDriverContainerTest extends BaseWebDriverContainerTest {
 
-    private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse(
-        "selenium/standalone-firefox:2.53.1-beryllium"
-    );
+    private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox:4.10.0");
 
     @Rule
     public BrowserWebDriverContainer<?> firefox = new BrowserWebDriverContainer<>(FIREFOX_IMAGE)

modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java

@@ -1,7 +1,6 @@
 package org.testcontainers.solace;
 
 import org.apache.qpid.jms.JmsConnectionFactory;
-import org.assertj.core.api.Assertions;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -19,6 +18,8 @@
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SolaceContainerAMQPTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerAMQPTest.class);
@@ -42,8 +43,8 @@ public void testSolaceContainer() throws JMSException {
                 solaceContainer.getOrigin(Service.AMQP)
             );
             // }
-            Assertions.assertThat(session).isNotNull();
-            Assertions.assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            assertThat(session).isNotNull();
+            assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
             session.close();
         }
     }
@@ -86,7 +87,7 @@ private String consumeMessageFromSolace(Session session) {
                 }
             });
             publishMessageToSolace(session, topic);
-            Assertions.assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+            assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
             messageConsumer.close();
             return result[0];
         } catch (Exception e) {

modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java

@@ -1,6 +1,5 @@
 package org.testcontainers.solace;
 
-import org.assertj.core.api.Assertions;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
 import org.eclipse.paho.client.mqttv3.MqttClient;
@@ -15,6 +14,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SolaceContainerMQTTTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerMQTTTest.class);
@@ -36,8 +37,8 @@ public void testSolaceContainer() {
                 solaceContainer.getPassword(),
                 solaceContainer.getOrigin(Service.MQTT)
             );
-            Assertions.assertThat(client).isNotNull();
-            Assertions.assertThat(consumeMessageFromSolace(client)).isEqualTo(MESSAGE);
+            assertThat(client).isNotNull();
+            assertThat(consumeMessageFromSolace(client)).isEqualTo(MESSAGE);
         }
     }
 
@@ -86,7 +87,7 @@ public void deliveryComplete(IMqttDeliveryToken token) {}
             );
             client.subscribe(TOPIC_NAME, 0);
             publishMessageToSolace(client);
-            Assertions.assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+            assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
             return result[0];
         } catch (Exception e) {
             throw new RuntimeException("Cannot receive message from solace", e);

modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java

@@ -12,12 +12,13 @@
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
-import org.assertj.core.api.Assertions;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SolaceContainerRESTTest {
 
     private static final String MESSAGE = "HelloWorld";
@@ -45,7 +46,7 @@ private void testPublishMessageToSolace(SolaceContainer solaceContainer, Service
         if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
             Assert.fail("Cannot send message to solace - " + EntityUtils.toString(response.getEntity()));
         }
-        Assertions.assertThat(EntityUtils.toString(response.getEntity())).isEmpty();
+        assertThat(EntityUtils.toString(response.getEntity())).isEmpty();
     }
 
     private HttpClient createClient(SolaceContainer solaceContainer) {

modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java

@@ -11,7 +11,6 @@
 import com.solacesystems.jcsmp.XMLMessageConsumer;
 import com.solacesystems.jcsmp.XMLMessageListener;
 import com.solacesystems.jcsmp.XMLMessageProducer;
-import org.assertj.core.api.Assertions;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -21,6 +20,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SolaceContainerSMFTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerSMFTest.class);
@@ -41,8 +42,8 @@ public void testSolaceContainerWithSimpleAuthentication() {
         ) {
             solaceContainer.start();
             JCSMPSession session = createSessionWithBasicAuth(solaceContainer);
-            Assertions.assertThat(session).isNotNull();
-            Assertions.assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            assertThat(session).isNotNull();
+            assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
             session.closeSession();
         }
     }
@@ -61,8 +62,8 @@ public void testSolaceContainerWithCertificates() {
         ) {
             solaceContainer.start();
             JCSMPSession session = createSessionWithCertificates(solaceContainer);
-            Assertions.assertThat(session).isNotNull();
-            Assertions.assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            assertThat(session).isNotNull();
+            assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
             session.closeSession();
         }
     }
@@ -157,7 +158,7 @@ public void onException(JCSMPException e) {
             session.addSubscription(TOPIC);
             cons.start();
             publishMessageToSolace(session);
-            Assertions.assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+            assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
             return result[0];
         } catch (Exception e) {
             throw new RuntimeException("Cannot receive message from solace", e);