This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 8e56c4afcf01b235a37e69ffaa33b5f11b5e3597 Author: Andrus Adamchik <[email protected]> AuthorDate: Sun May 17 09:20:45 2026 -0400 "-tc" suffix no longer makes sense for test profiles. Removing --- .github/workflows/verify-deploy-on-push.yml | 4 ++-- .github/workflows/verify-on-pr.yml | 4 ++-- CLAUDE.md | 8 ++++---- .../cayenne/unit/datasource/DataSourceConfigLoader.java | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/verify-deploy-on-push.yml b/.github/workflows/verify-deploy-on-push.yml index 9217d8d62..707cc92b9 100644 --- a/.github/workflows/verify-deploy-on-push.yml +++ b/.github/workflows/verify-deploy-on-push.yml @@ -29,7 +29,7 @@ jobs: strategy: matrix: jdk: [21, 25] - db-profile: [hsql, h2, derby, mysql-tc, postgres-tc, sqlserver-tc] + db-profile: [hsql, h2, derby, mysql, postgres, sqlserver] fail-fast: false # finish all jobs anyway env: @@ -74,4 +74,4 @@ jobs: if: contains(env.POM_VERSION, '-SNAPSHOT') env: MAVEN_USERNAME: ${{ secrets.NEXUS_USER }} - MAVEN_PASSWORD: ${{ secrets.NEXUS_PW }} \ No newline at end of file + MAVEN_PASSWORD: ${{ secrets.NEXUS_PW }} diff --git a/.github/workflows/verify-on-pr.yml b/.github/workflows/verify-on-pr.yml index 9120cdef4..12a28683a 100644 --- a/.github/workflows/verify-on-pr.yml +++ b/.github/workflows/verify-on-pr.yml @@ -29,7 +29,7 @@ jobs: strategy: matrix: jdk: [21] - db-profile: [hsql, h2, derby, mysql-tc, postgres-tc, sqlserver-tc] + db-profile: [hsql, h2, derby, mysql, postgres, sqlserver] fail-fast: true env: @@ -47,4 +47,4 @@ jobs: cache: 'maven' - name: mvn verify ${{ matrix.db-profile }} - run: mvn verify -q -DcayenneTestConnection=${{ matrix.db-profile }} -DcayenneLogLevel=ERROR \ No newline at end of file + run: mvn verify -q -DcayenneTestConnection=${{ matrix.db-profile }} -DcayenneLogLevel=ERROR diff --git a/CLAUDE.md b/CLAUDE.md index e6b605318..5525ae86c 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -38,9 +38,9 @@ mvn verify # Run against a specific database mvn verify -DcayenneTestConnection=h2 mvn verify -DcayenneTestConnection=derby -mvn verify -DcayenneTestConnection=mysql-tc # via TestContainers -mvn verify -DcayenneTestConnection=postgres-tc # via TestContainers -mvn verify -DcayenneTestConnection=sqlserver-tc # via TestContainers +mvn verify -DcayenneTestConnection=mysql # via TestContainers +mvn verify -DcayenneTestConnection=postgres # via TestContainers +mvn verify -DcayenneTestConnection=sqlserver # via TestContainers # Skip tests mvn verify -DskipITs # skip integration tests, still run unit tests @@ -97,7 +97,7 @@ pins versions only — each consuming `<dependency>` declares its own scope expl GitHub Actions runs on push to master/STABLE-* branches: - JDK: 21, 25 -- Databases: hsql, h2, derby, mysql-tc, postgres-tc, sqlserver-tc +- Databases: hsql, h2, derby, mysql, postgres, sqlserver ## Issue Tracker diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/datasource/DataSourceConfigLoader.java b/cayenne/src/test/java/org/apache/cayenne/unit/datasource/DataSourceConfigLoader.java index 4ee714fed..20f0c8fb6 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/datasource/DataSourceConfigLoader.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/datasource/DataSourceConfigLoader.java @@ -51,12 +51,12 @@ public class DataSourceConfigLoader { case "h2" -> H2DataSource.start(); case "derby" -> DerbyDataSource.start(); case "sqlite" -> SQLiteDataSource.start(); - case "mysql-tc" -> MysqlDataSource.start(); - case "mariadb-tc" -> MariaDbDataSource.start(); - case "postgres-tc" -> PostgresDataSource.start(); - case "sqlserver-tc" -> SqlServerDataSource.start(); - case "oracle-tc" -> OracleDataSource.start(); - case "db2-tc" -> Db2DataSource.start(); + case "mysql" -> MysqlDataSource.start(); + case "mariadb" -> MariaDbDataSource.start(); + case "postgres" -> PostgresDataSource.start(); + case "sqlserver" -> SqlServerDataSource.start(); + case "oracle" -> OracleDataSource.start(); + case "db2" -> Db2DataSource.start(); default -> null; }; }
