diff --git a/pom.xml b/pom.xml index 0ae6e526..a882f66e 100644 --- a/pom.xml +++ b/pom.xml @@ -111,6 +111,12 @@ + + + **/*IT.java + **/*WT.java + + diff --git a/testcontainers-reuse-existing-containers/.java-version b/testcontainers-reuse-existing-containers/.java-version deleted file mode 100644 index 2dbc24b3..00000000 --- a/testcontainers-reuse-existing-containers/.java-version +++ /dev/null @@ -1 +0,0 @@ -11.0 diff --git a/testcontainers-reuse-existing-containers/pom.xml b/testcontainers-reuse-existing-containers/pom.xml index cae3c763..d1c553be 100644 --- a/testcontainers-reuse-existing-containers/pom.xml +++ b/testcontainers-reuse-existing-containers/pom.xml @@ -15,10 +15,6 @@ testcontainers-reuse-existing-containers Reuse existing Containers with Testcontainers - - 1.16.2 - - org.springframework.boot @@ -52,12 +48,7 @@ - - - org.springframework.boot - spring-boot-maven-plugin - - + diff --git a/testcontainers-reuse-existing-containers/src/main/java/de/rieckpil/blog/Todo.java b/testcontainers-reuse-existing-containers/src/main/java/de/rieckpil/blog/Todo.java index 1f08d3dd..b66f7574 100644 --- a/testcontainers-reuse-existing-containers/src/main/java/de/rieckpil/blog/Todo.java +++ b/testcontainers-reuse-existing-containers/src/main/java/de/rieckpil/blog/Todo.java @@ -1,6 +1,6 @@ package de.rieckpil.blog; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.LocalDateTime; @Entity diff --git a/write-concise-web-tests-with-selenide/pom.xml b/write-concise-web-tests-with-selenide/pom.xml index 90edb25c..7aabaeb1 100644 --- a/write-concise-web-tests-with-selenide/pom.xml +++ b/write-concise-web-tests-with-selenide/pom.xml @@ -56,21 +56,6 @@ - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.0.0-M5 - - - **/*WT.java - - - - + diff --git a/write-concise-web-tests-with-selenide/src/test/java/de/rieckpil/blog/BookStoreTestcontainersWT.java b/write-concise-web-tests-with-selenide/src/test/java/de/rieckpil/blog/BookStoreTestcontainersWT.java index 4fc14c0d..3f93cdcd 100644 --- a/write-concise-web-tests-with-selenide/src/test/java/de/rieckpil/blog/BookStoreTestcontainersWT.java +++ b/write-concise-web-tests-with-selenide/src/test/java/de/rieckpil/blog/BookStoreTestcontainersWT.java @@ -12,7 +12,7 @@ import org.openqa.selenium.remote.RemoteWebDriver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.core.env.Environment; import org.testcontainers.Testcontainers; import org.testcontainers.containers.BrowserWebDriverContainer; @@ -30,7 +30,7 @@ class BookStoreTestcontainersWT { System.getProperty("os.arch").equals("aarch64") ? DockerImageName.parse("seleniarm/standalone-chromium") .asCompatibleSubstituteFor("selenium/standalone-chrome") - : DockerImageName.parse("selenium/standalone-chrome:4.3.0-20220726") + : DockerImageName.parse("selenium/standalone-chrome") ) .withCapabilities(new ChromeOptions() .addArguments("--no-sandbox") diff --git a/write-concise-web-tests-with-selenide/src/test/java/de/rieckpil/blog/BookStoreWT.java b/write-concise-web-tests-with-selenide/src/test/java/de/rieckpil/blog/BookStoreWT.java index a2f11565..cc49b406 100644 --- a/write-concise-web-tests-with-selenide/src/test/java/de/rieckpil/blog/BookStoreWT.java +++ b/write-concise-web-tests-with-selenide/src/test/java/de/rieckpil/blog/BookStoreWT.java @@ -11,7 +11,7 @@ import org.openqa.selenium.By; import org.openqa.selenium.chrome.ChromeOptions; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import static com.codeborne.selenide.Selenide.*; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment; diff --git a/write-concise-web-tests-with-selenide/src/test/java/de/rieckpil/blog/BookStoreYouTubeWT.java b/write-concise-web-tests-with-selenide/src/test/java/de/rieckpil/blog/BookStoreYouTubeWT.java index fdb2c1b2..9c03cadc 100644 --- a/write-concise-web-tests-with-selenide/src/test/java/de/rieckpil/blog/BookStoreYouTubeWT.java +++ b/write-concise-web-tests-with-selenide/src/test/java/de/rieckpil/blog/BookStoreYouTubeWT.java @@ -12,7 +12,7 @@ import org.openqa.selenium.remote.RemoteWebDriver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.core.env.Environment; import org.testcontainers.containers.BrowserWebDriverContainer; import org.testcontainers.junit.jupiter.Testcontainers;