Merge pull request #226 from xdev-software/develop

AB-xdev · web-flow · commit c415a9bb5830 · 2025-11-26T15:54:48.000Z
Release
diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml
@@ -122,9 +122,7 @@
 		<module name="StaticVariableName"/>
 		<module name="StringLiteralEquality"/>
 		<module name="SuppressWarningsHolder"/>
-		<module name="TodoComment">
-			<property name="severity" value="info"/>
-		</module>
+		<module name="TodoComment"/>
 		<module name="TypecastParenPad"/>
 		<module name="TypeName"/>
 		<module name="UnnecessaryParentheses"/>
diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml
diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml
@@ -13,13 +13,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - run: mv .github/.lycheeignore .lycheeignore
 
       - name: Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@885c65f3dc543b57c898c8099f4e08c8afd178a2 # v2
+        uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0 # v2
         with:
           fail: false # Don't fail on broken links, create an issue instead
 
diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
@@ -31,7 +31,7 @@ jobs:
         java: [17, 21, 25]
         distribution: [temurin]
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up JDK
       uses: actions/setup-java@v5
@@ -77,7 +77,7 @@ jobs:
         java: [17]
         distribution: [temurin]
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up JDK
       uses: actions/setup-java@v5
@@ -113,7 +113,7 @@ jobs:
         java: [17]
         distribution: [temurin]
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up JDK
       uses: actions/setup-java@v5
@@ -145,7 +145,7 @@ jobs:
 
     - name: Upload report
       if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: pmd-report
         if-no-files-found: ignore
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up JDK
       uses: actions/setup-java@v5
@@ -63,7 +63,7 @@ jobs:
     outputs:
       upload_url: ${{ steps.create-release.outputs.upload_url }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Configure Git
       run: |
@@ -91,7 +91,7 @@ jobs:
 
     - name: Create Release
       id: create-release
-      uses: shogo82148/actions-create-release@7b89596097b26731bda0852f1504f813499079ee # v1
+      uses: shogo82148/actions-create-release@28d99e2a5b407558d17c15d0384fc0d7fb625b4c # v1
       with:
         tag_name: v${{ steps.version.outputs.release }}
         release_name: v${{ steps.version.outputs.release }}
@@ -115,7 +115,7 @@ jobs:
     needs: [prepare-release]
     timeout-minutes: 60
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Init Git and pull
       run: |
@@ -163,7 +163,7 @@ jobs:
     needs: [prepare-release]
     timeout-minutes: 15
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Init Git and pull
       run: |
@@ -202,7 +202,7 @@ jobs:
     needs: [publish-maven]
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Init Git and pull
       run: |
diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           sparse-checkout: .github/labels.yml
 
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up JDK
       uses: actions/setup-java@v5
diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml
@@ -36,7 +36,7 @@ jobs:
       update_branch_merged_commit: ${{ steps.manage-branches.outputs.update_branch_merged_commit }}
       create_update_branch_merged_pr: ${{ steps.manage-branches.outputs.create_update_branch_merged_pr }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Required because otherwise there are always changes detected when executing diff/rev-list
           fetch-depth: 0
@@ -183,7 +183,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Required because otherwise there are always changes detected when executing diff/rev-list
           fetch-depth: 0
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ hs_err_pid*
 !.idea/saveactions_settings.xml
 !.idea/checkstyle-idea.xml
 !.idea/externalDependencies.xml
+!.idea/pmd-x.xml
 !.idea/PMDPlugin.xml
 
 !.idea/inspectionProfiles/
diff --git a/.idea/pmd-x.xml b/.idea/pmd-x.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.4.0
+* `getNoVncAddress` now returns an auto-login url
+  * The original behavior is still available with `getNoVncAddressRaw`
+
 # 1.3.0
 * Update to Testcontainers v2
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>testcontainers-selenium-root</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -45,7 +45,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>12.0.1</version>
+								<version>12.1.2</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -83,12 +83,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.17.0</version>
+								<version>7.18.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.17.0</version>
+								<version>7.18.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/testcontainers-selenium-demo/pom.xml b/testcontainers-selenium-demo/pom.xml
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>testcontainers-selenium-root</artifactId>
-		<version>1.3.1-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>testcontainers-selenium-demo</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>
@@ -34,7 +34,7 @@
 			<dependency>
 				<groupId>org.seleniumhq.selenium</groupId>
 				<artifactId>selenium-dependencies-bom</artifactId>
-				<version>4.36.0</version>
+				<version>4.38.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/testcontainers-selenium/pom.xml b/testcontainers-selenium/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>testcontainers-selenium</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>testcontainers-selenium</name>
@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>2.0.0</version>
+			<version>2.0.2</version>
 		</dependency>
 
 		<!-- Testcontainers is using outdated v1 -->
@@ -70,15 +70,15 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-api</artifactId>
-			<version>4.36.0</version>
+			<version>4.38.0</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<!-- Tests -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -90,7 +90,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-remote-driver</artifactId>
-			<version>4.36.0</version>
+			<version>4.38.0</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- Tracing is not needed -->
@@ -108,13 +108,13 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-support</artifactId>
-			<version>4.36.0</version>
+			<version>4.38.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-firefox-driver</artifactId>
-			<version>4.36.0</version>
+			<version>4.38.0</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- No unused, beta-grade, RUST blobs -->
@@ -127,7 +127,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-chrome-driver</artifactId>
-			<version>4.36.0</version>
+			<version>4.38.0</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- No unused, beta-grade, RUST blobs -->
@@ -320,7 +320,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>12.0.1</version>
+								<version>12.1.2</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -358,12 +358,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.17.0</version>
+								<version>7.18.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.17.0</version>
+								<version>7.18.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java b/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java
@@ -428,6 +428,19 @@ public String getVncAddress()
 	}
 	
 	public String getNoVncAddress()
+	{
+		final String baseAddress = this.getNoVncAddressRaw();
+		return baseAddress != null
+			? baseAddress + this.getNoVncAutoLoginQueryParameterString()
+			: null;
+	}
+	
+	protected String getNoVncAutoLoginQueryParameterString()
+	{
+		return "?autoconnect=true&password=" + DEFAULT_VNC_PASSWORD;
+	}
+	
+	public String getNoVncAddressRaw()
 	{
 		return !this.disableVNC && this.enableNoVNC
 			? "http://" + this.getHost() + ":" + this.getMappedPort(NO_VNC_PORT)
