This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch ee11 in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 4315462825ce685bae4fa76d38ed8e8cc2ada6ba Merge: d681462 27302f7 Author: Markus Jung <[email protected]> AuthorDate: Sun Jul 19 01:53:16 2026 +0200 Merge branch 'ee11' into claude/tck-module-setup-check-0c52f9 Jenkinsfile | 59 +++++++++------------- environment/tomee/conf/tomee.xml | 9 ++-- pom.xml | 4 ++ runner-standalone/README.md | 7 ++- runner-standalone/data/pom.xml | 21 -------- .../{tomee-conf-filtered => tomee-conf}/tomee.xml | 6 +-- .../standalone/di/DependencyInjectionTckTest.java | 9 ++-- runner-standalone/pages/pom.xml | 21 -------- .../pages/src/tomee-conf-filtered/tomee.xml | 26 ---------- runner-standalone/pom.xml | 10 ++-- runner-webprofile/README.md | 3 +- runner-webprofile/platform-suite-webprofile.tsv | 19 ++----- runner-webprofile/platform-suite.tsv | 2 +- runner-webprofile/run-platform-suite.sh | 13 ++++- runner-webprofile/run/pom.xml | 12 ++++- 15 files changed, 71 insertions(+), 150 deletions(-) diff --cc runner-standalone/data/src/tomee-conf/tomee.xml index abc8467,b67fbb7..0261eab --- a/runner-standalone/data/src/tomee-conf/tomee.xml +++ b/runner-standalone/data/src/tomee-conf/tomee.xml @@@ -1,20 -1,9 +1,20 @@@ <?xml version="1.0" encoding="UTF-8"?> - <!-- Port-aware test-only TomEE resources for the Jakarta Data TCK; ${tck.derby.port} - is substituted while staging the overlay. Replaces the shared + <!-- Test-only TomEE resources for the Jakarta Data TCK; replaces the shared overlay tomee.xml so the TCK's jdbc/DataTCK datasource is available in - addition to the standard TCK datasources. --> + addition to the standard TCK datasources. ${tck.derby.port} is + substituted while staging the overlay. --> <openejb> + <!-- The generated persistence unit's <jta-data-source> is + java:comp/DefaultDataSource. Define it explicitly on embedded Derby + (engine jar staged into tomee-overlay/lib by the runner) so the + auto-link resolves here instead of falling through to the first + network-Derby DataSource below. It is listed first so TomEE's + first-matching-DataSource auto-link also picks it. --> + <Resource id="DefaultDataSource" type="DataSource"> + JdbcDriver org.apache.derby.jdbc.EmbeddedDriver + JdbcUrl jdbc:derby:${project.build.directory}/derby/dataTckDB;create=true + </Resource> + <Resource id="jdbc/DB1" type="DataSource"> JdbcDriver org.apache.derby.jdbc.ClientDriver JdbcUrl jdbc:derby://localhost:${tck.derby.port}/derbyDB;create=true
