Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
e28c251
Detect ZIP slip
AB-xdev Oct 15, 2025
8f55cca
Merge branch 'master' into update-from-template-xdev-software/java-se…
xdev-gh-bot Oct 15, 2025
ce3728f
Merge branch 'master' into update-from-template-xdev-software/java-te…
xdev-gh-bot Oct 15, 2025
4a3dac7
Merge pull request #213 from xdev-software/master
AB-xdev Oct 16, 2025
a9247ef
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Oct 20, 2025
1e70e4d
Update dependency com.puppycrawl.tools:checkstyle to v12.1.0
xdev-renovate Oct 20, 2025
ab5065e
Merge pull request #216 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Oct 20, 2025
db9dae9
Update shogo82148/actions-create-release digest to 28d99e2
xdev-renovate Oct 23, 2025
95c9943
Merge pull request #217 from xdev-software/renovate/shogo82148-action…
AB-xdev Oct 23, 2025
a9b4edb
Update actions/upload-artifact action to v5
xdev-renovate Oct 25, 2025
e9d2f5e
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Oct 27, 2025
0f07ec7
Update dependency com.puppycrawl.tools:checkstyle to v12.1.1
xdev-renovate Oct 27, 2025
931d810
Update org.seleniumhq.selenium to v4.38.0
xdev-renovate Oct 27, 2025
a762aff
Merge pull request #218 from xdev-software/renovate/actions-upload-ar…
AB-xdev Oct 27, 2025
ca9a75f
Merge pull request #219 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Oct 27, 2025
1ebe470
Add `UnnecessaryWarningSuppression`
AB-xdev Oct 29, 2025
8083575
Formatting
AB-xdev Oct 29, 2025
6b3fcb8
Merge branch 'master' into update-from-template-xdev-software/java-se…
xdev-gh-bot Oct 29, 2025
6bf0ba8
Merge branch 'master' into update-from-template-xdev-software/java-te…
xdev-gh-bot Oct 29, 2025
f0350dd
Update lycheeverse/lychee-action digest to a8c4c7c
xdev-renovate Oct 30, 2025
f5923ef
Update net.sourceforge.pmd to v7.18.0
xdev-renovate Nov 1, 2025
c0b3534
Update dependency org.junit.jupiter:junit-jupiter to v6.0.1
xdev-renovate Nov 1, 2025
e39176b
Merge pull request #10 from xdev-software/renovate/lycheeverse-lychee…
AB-xdev Nov 3, 2025
4ebf84d
Updated to PMD 7.18
AB-xdev Nov 3, 2025
52e2773
Merge pull request #222 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Nov 3, 2025
53e5c31
Don't allow TODO comments
AB-xdev Nov 3, 2025
039ed9b
Merge branch 'master' into update-from-template-xdev-software/base-te…
xdev-gh-bot Nov 3, 2025
0bdf14a
Merge branch 'master' into update-from-template-xdev-software/java-se…
xdev-gh-bot Nov 3, 2025
1ca46a8
Merge branch 'master' into update-from-template-xdev-software/java-te…
xdev-gh-bot Nov 3, 2025
4342c35
Small descriptive improvements
AB-xdev Nov 7, 2025
e59f3a0
Merge branch 'master' into update-from-template-xdev-software/java-se…
xdev-gh-bot Nov 7, 2025
47db532
Merge branch 'master' into update-from-template-xdev-software/java-te…
xdev-gh-bot Nov 7, 2025
053d604
Add initial PMD X plugin configuration
AB-xdev Nov 10, 2025
5e4a080
Merge branch 'master' into update-from-template-xdev-software/java-se…
xdev-gh-bot Nov 10, 2025
8678dd7
Merge branch 'master' into update-from-template-xdev-software/java-te…
xdev-gh-bot Nov 10, 2025
7b3d463
Update dependency com.puppycrawl.tools:checkstyle to v12.1.2
xdev-renovate Nov 12, 2025
ff90957
Update dependency org.testcontainers:testcontainers to v2.0.2
xdev-renovate Nov 14, 2025
47b7924
Merge pull request #226 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Nov 20, 2025
8f90514
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev Nov 20, 2025
6f0d274
Merge pull request #215 from xdev-software/renovate/org.seleniumhq.se…
AB-xdev Nov 20, 2025
6aa12ad
Merge pull request #214 from xdev-software/renovate/org.testcontainer…
AB-xdev Nov 20, 2025
b653ca0
Merge pull request #221 from xdev-software/renovate/org.junit.jupiter…
AB-xdev Nov 20, 2025
6ff3125
Update actions/checkout action to v6
xdev-renovate Nov 21, 2025
25f9289
Update actions/checkout action to v6
xdev-renovate Nov 21, 2025
e39c89d
Merge pull request #11 from xdev-software/renovate/actions-checkout-6.x
AB-xdev Nov 21, 2025
70abc6f
Merge pull request #227 from xdev-software/renovate/actions-checkout-6.x
AB-xdev Nov 21, 2025
c117cd7
Merge branch 'master' into update-from-template-xdev-software/base-te…
xdev-gh-bot Nov 21, 2025
6f6dfdb
Merge branch 'master' into update-from-template-xdev-software/java-te…
xdev-gh-bot Nov 21, 2025
683fde9
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Nov 24, 2025
e241740
Make `getNoVncAddress` now return an auto-login url
AB-xdev Nov 26, 2025
cd6fd70
Create dedicated method for params
AB-xdev Nov 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
202 changes: 116 additions & 86 deletions .config/pmd/java/ruleset.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .github/workflows/broken-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/check-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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 }}
Expand All @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-from-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
27 changes: 27 additions & 0 deletions .idea/pmd-x.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions testcontainers-selenium-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
22 changes: 11 additions & 11 deletions testcontainers-selenium/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 -->
Expand All @@ -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>
Expand All @@ -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 -->
Expand All @@ -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 -->
Expand All @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down