Merge branch 'main' into add-scylladb

Author: mkorolyov

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -38,7 +38,8 @@ body:
         - MySQL
         - Neo4j
         - NGINX
-        - Oracle-XE
+        - Oracle Free
+        - Oracle XE
         - OrientDB
         - PostgreSQL
         - Presto

.github/ISSUE_TEMPLATE/enhancement.yaml

@@ -38,7 +38,8 @@ body:
         - MySQL
         - Neo4j
         - NGINX
-        - Oracle-XE
+        - Oracle Free
+        - Oracle XE
         - OrientDB
         - PostgreSQL
         - Presto

.github/ISSUE_TEMPLATE/feature.yaml

@@ -38,7 +38,8 @@ body:
         - MySQL
         - Neo4j
         - NGINX
-        - Oracle-XE
+        - Oracle Free
+        - Oracle XE
         - OrientDB
         - PostgreSQL
         - QuestDB

.github/actions/setup-junit-report/action.yml

@@ -0,0 +1,11 @@
+name: Set up JUnit Report
+description: Sets up JUnit Report
+runs:
+  using: "composite"
+  steps:
+    - name: Publish Test Report
+      uses: mikepenz/action-junit-report@v3
+      if: always() # always run even if the previous step fails
+      with:
+        report_paths: '**/build/test-results/test/TEST-*.xml'
+        annotate_only: true

.github/dependabot.yml

@@ -194,6 +194,10 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/oracle-free"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gradle"
     directory: "/modules/oracle-xe"
     schedule:
@@ -252,6 +256,9 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.seleniumhq.selenium:selenium-bom"
+        update-types: [ "version-update:semver-minor" ]
   - package-ecosystem: "gradle"
     directory: "/modules/solace"
     schedule:

.github/labeler.yml

@@ -1,103 +1,202 @@
 "area/docker-compose":
-  - core/src/main/java/org/testcontainers/containers/ComposeContainer.java
-  - core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
-  - core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
-  - core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
+  - changed-files:
+    - any-glob-to-any-file:
+      - core/src/main/java/org/testcontainers/containers/ComposeContainer.java
+      - core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
+      - core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+      - core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
 "github_actions":
-  - .github/workflows/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - .github/workflows/*
 "gradle-wrapper":
-  - gradle/wrapper/*
-  - gradlew
-  - gradlew.bat
+  - changed-files:
+    - any-glob-to-any-file:
+      - gradle/wrapper/*
+      - gradlew
+      - gradlew.bat
 "modules/azure":
-  - modules/azure/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/azure/**/*
 "modules/cassandra":
-  - modules/cassandra/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/cassandra/**/*
 "modules/clickhouse":
-  - modules/clickhouse/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/clickhouse/**/*
 "modules/cockroachdb":
-  - modules/cockroachdb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/cockroachdb/**/*
 "modules/consul":
-  - modules/consul/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/consul/**/*
 "modules/couchbase":
-  - modules/couchbase/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/couchbase/**/*
 "modules/cratedb":
-  - modules/cratedb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/cratedb/**/*
 "modules/db2":
-  - modules/db2/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/db2/**/*
 "modules/dynalite":
-  - modules/dynalite/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/dynalite/**/*
 "modules/elasticsearch":
-  - modules/elasticsearch/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/elasticsearch/**/*
 "modules/gcloud":
-  - modules/gcloud/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/gcloud/**/*
 "modules/hivemq":
-  - modules/hivemq/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/hivemq/**/*
 "modules/influx":
-  - modules/influxdb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/influxdb/**/*
 "modules/jdbc":
-  - modules/jdbc/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/jdbc/**/*
 "modules/jupiter":
-  - modules/junit-jupiter/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/junit-jupiter/**/*
 "modules/k3s":
-  - modules/k3s/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/k3s/**/*
 "modules/kafka":
-  - modules/kafka/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/kafka/**/*
 "modules/localstack":
-  - modules/localstack/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/localstack/**/*
 "modules/mariadb":
-  - modules/mariadb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/mariadb/**/*
 "modules/minio":
-  - modules/minio/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/minio/**/*
 "modules/mockserver":
-  - modules/mockserver/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/mockserver/**/*
 "modules/mongodb":
-  - modules/mongodb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/mongodb/**/*
 "modules/sql-server":
-  - modules/mssqlserver/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/mssqlserver/**/*
 "modules/mysql":
-  - modules/mysql/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/mysql/**/*
 "modules/neo4j":
-  - modules/neo4j/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/neo4j/**/*
 "modules/nginx":
-  - modules/nginx/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/nginx/**/*
 "modules/oracle":
-  - modules/oracle-xe/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/oracle-free/**/*
+      - modules/oracle-xe/**/*
 "modules/orientdb":
-  - modules/orientdb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/orientdb/**/*
 "modules/postgres":
-  - modules/postgresql/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/postgresql/**/*
 "modules/presto":
-  - modules/presto/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/presto/**/*
 "modules/pulsar":
-  - modules/pulsar/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/pulsar/**/*
 "modules/questdb":
-  - modules/questdb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/questdb/**/*
 "modules/r2dbc":
-  - modules/r2dbc/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/r2dbc/**/*
 "modules/rabbitmq":
-  - modules/rabbitmq/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/rabbitmq/**/*
 "modules/redpanda":
-  - modules/redpanda/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/redpanda/**/*
 "modules/scylladb":
-  - modules/scylladb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/scylladb/**/*
 "modules/selenium":
-  - modules/selenium/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/selenium/**/*
 "modules/solace":
-  - modules/solace/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/solace/**/*
 "modules/solr":
-  - modules/solr/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/solr/**/*
 "modules/spock":
-  - modules/spock/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/spock/**/*
 "modules/tidb":
-  - modules/tidb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/tidb/**/*
 "modules/toxiproxy":
-  - modules/toxiproxy/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/toxiproxy/**/*
 "modules/trino":
-  - modules/trino/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/trino/**/*
 "modules/vault":
-  - modules/vault/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/vault/**/*
 "modules/yugabytedb":
-  - modules/yugabytedb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/yugabytedb/**/*
 "type/docs":
-  - docs/**/*.md
+  - changed-files:
+    - any-glob-to-any-file:
+      - docs/**/*.md

.github/pull_request_template.md

@@ -3,10 +3,18 @@ Thanks for contributing to Testcontainers. Please review the following notes bef
 submitting a pull request.
 
 New Modules:
-Make sure to add it to `bug_report.yaml`, `enhancement.yaml` and `feature.yaml`.
-Also, add it to `dependabot.yml` and `labeler.yml`.
 
-Before committing, please run `./gradlew checkstyleMain checkstyleTest spotlessApply` and fix any issues that occur.
+If you are contributing a new module, please add your module name to the following files:
+
+* `./.github/ISSUE_TEMPLATE/bug_report.yaml`
+* `./.github/ISSUE_TEMPLATE/enhancement.yaml`
+* `./.github/ISSUE_TEMPLATE/feature.yaml`
+* `./.github/dependabot.yml`
+* `./.github/labeler.yml`
+
+Also make sure that your new module has the appropriate documentation under `./docs/modules/`
+
+Before committing any change, please run `./gradlew checkstyleMain checkstyleTest spotlessApply` and fix any issues that occur.
 
 Dependency Upgrades:
 Please do not open a pull request to update only a version dependency. Existing process will perform

.github/settings.yml

@@ -163,6 +163,9 @@ labels:
   - name: modules/mariadb
     color: '#006b75'
 
+  - name: modules/minio
+    color: '#006b75'
+
   - name: modules/mockserver
     color: '#006b75'
 
@@ -232,6 +235,9 @@ labels:
   - name: modules/vault
     color: '#006b75'
 
+  - name: modules/yugabytedb
+    color: '#006b75'
+
   - name: os/linux
     color: '#1d76db'
 

.github/workflows/ci-rootless.yml

@@ -43,6 +43,8 @@ permissions:
 jobs:
   test:
     runs-on: ubuntu-22.04
+    permissions:
+      checks: write
     steps:
       - uses: actions/checkout@v4
       - name: Setup rootless Docker
@@ -53,3 +55,4 @@ jobs:
         uses: gradle/gradle-build-action@v2
       - name: Build with Gradle
         run: ./gradlew --no-daemon --scan testcontainers:test --tests '*GenericContainerRuleTest'
+      - uses: ./.github/actions/setup-junit-report