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 c95b49b9f667e3586fa785b6e9df0997770fe536 Author: Markus Jung <[email protected]> AuthorDate: Sat Jul 18 20:19:44 2026 +0200 Drop dead configuration knobs and make --metadata-only real --- README.md | 4 +++- environment/verify-inputs.sh | 11 ++++++++++- environment/versions.env | 7 +++---- pom.xml | 2 -- runner-standalone/pom.xml | 4 ++-- runner-standalone/security/pom.xml | 5 +++-- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 068a0ae..757bb0a 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,9 @@ uses the current `11.0.0-SNAPSHOT`; CI does not pin or checksum those changing bytes. A timestamped version and checksum should only be added when the harness needs a stable qualification candidate. -Verify the immutable TCK BOM metadata without downloading TomEE: +Verify the immutable TCK BOM metadata only (a plain +`sh environment/verify-inputs.sh` also downloads and verifies the pinned +Derby jars): ```sh sh environment/verify-inputs.sh --metadata-only diff --git a/environment/verify-inputs.sh b/environment/verify-inputs.sh index b213d95..f504fd3 100755 --- a/environment/verify-inputs.sh +++ b/environment/verify-inputs.sh @@ -6,7 +6,12 @@ SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) # shellcheck disable=SC1091 . "$SCRIPT_DIR/versions.env" -if [ -n "${1:-}" ] && [ "${1:-}" != "--metadata-only" ]; then +# --metadata-only verifies just the TCK BOM; the full mode also downloads +# and verifies the Derby jars. +metadata_only=false +if [ "${1:-}" = "--metadata-only" ]; then + metadata_only=true +elif [ -n "${1:-}" ]; then echo "usage: $0 [--metadata-only]" >&2 exit 2 fi @@ -41,6 +46,10 @@ trap 'rm -rf "$tmp_dir"' EXIT HUP INT TERM curl -fsSL "$JAKARTA_TCK_BOM_URL" -o "$tmp_dir/artifacts-bom.pom" assert_hash 256 "$JAKARTA_TCK_BOM_SHA256" "$tmp_dir/artifacts-bom.pom" +if [ "$metadata_only" = true ]; then + exit 0 +fi + derby_base="https://repo1.maven.org/maven2/org/apache/derby"; curl -fsSL "$derby_base/derbyclient/$DERBY_VERSION/derbyclient-$DERBY_VERSION.jar" -o "$tmp_dir/derbyclient.jar" curl -fsSL "$derby_base/derbynet/$DERBY_VERSION/derbynet-$DERBY_VERSION.jar" -o "$tmp_dir/derbynet.jar" diff --git a/environment/versions.env b/environment/versions.env index 62ca44c..97cb46f 100644 --- a/environment/versions.env +++ b/environment/versions.env @@ -3,16 +3,15 @@ # Keep the Maven properties in the root pom.xml aligned with these values. # Development snapshots are intentionally not recorded here. -JAKARTA_EE_VERSION=11.0.0 -JAKARTA_TCK_VERSION=11.0.3 -JAKARTA_TCK_ARQUILLIAN_VERSION=11.1.3 JAKARTA_TCK_BOM_URL=https://repo1.maven.org/maven2/jakarta/tck/artifacts-bom/11.0.3/artifacts-bom-11.0.3.pom JAKARTA_TCK_BOM_SHA256=985dcc0dc5dd3ce99b24e910b089dfdefdb60bfac29750c2e314837b79edd55c # Standalone TCK distribution zips consumed by runner-standalone/. The # JSON-P and JSON-B runners resolve the TCK jars from Maven Central, which # are byte-identical to the artifacts in these official zips; the checksums -# stay recorded here as the EFTL reference evidence. +# stay recorded here as the EFTL reference evidence. The debugging pin is +# enforced at download time by runner-standalone/debugging-install/pom.xml; +# keep the two in sync. JSONP_TCK_ZIP_URL=https://download.eclipse.org/jakartaee/jsonp/2.1/jakarta-jsonp-tck-2.1.1.zip JSONP_TCK_ZIP_SHA256=949f203de84deffa8c7892b555918e42f1dd220ccb7b6800741ea58af62737c1 JSONB_TCK_ZIP_URL=https://download.eclipse.org/jakartaee/jsonb/3.0/jakarta-jsonb-tck-3.0.0.zip diff --git a/pom.xml b/pom.xml index f79c1cd..512c149 100644 --- a/pom.xml +++ b/pom.xml @@ -30,9 +30,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <maven.compiler.release>17</maven.compiler.release> - <jakarta.ee.version>11.0.0</jakarta.ee.version> <jakarta.tck.version>11.0.3</jakarta.tck.version> - <tck.version>${jakarta.tck.version}</tck.version> <jakarta.tck.arquillian.version>11.1.3</jakarta.tck.arquillian.version> <arquillian.version>1.9.4.Final</arquillian.version> <junit.version>5.11.4</junit.version> diff --git a/runner-standalone/pom.xml b/runner-standalone/pom.xml index 7c706ba..075cd81 100644 --- a/runner-standalone/pom.xml +++ b/runner-standalone/pom.xml @@ -62,8 +62,8 @@ </modules> <properties> - <!-- TCK execution is opt-in; the default reactor must stay fast. --> - <tck.standalone>false</tck.standalone> + <!-- TCK execution is opt-in (-Dtck.standalone=true activates the + standalone-tck profile); the default reactor must stay fast. --> <tck.standalone.skip>true</tck.standalone.skip> <!-- Modules that only run local signature checks set this to true. --> <tck.standalone.container.skip>${tck.standalone.skip}</tck.standalone.container.skip> diff --git a/runner-standalone/security/pom.xml b/runner-standalone/security/pom.xml index 936b191..159120c 100644 --- a/runner-standalone/security/pom.xml +++ b/runner-standalone/security/pom.xml @@ -35,8 +35,9 @@ <security.tck.url>https://download.eclipse.org/jakartaee/security/4.0/jakarta-security-tck-${security.tck.version}.zip</security.tck.url> <tck.dir>${project.build.directory}/security-tck-${security.tck.version}/tck</tck.dir> <!-- The security TCK exercises full-profile features; TomEE Plus is the - distribution apache/tomee validates it against. --> - <security.tomee.classifier>plus</security.tomee.classifier> + distribution apache/tomee validates it against. The plus classifier + is set in src/test/resources/arquillian.xml and + tomee-remote-profile.xml. --> <!-- The artifact whose -tomcat repackaging TomEE ships as lib/jakartaee-api-*-tomcat.jar; its jakarta.security.enterprise classes are byte-identical to the distribution jar. Keep in sync
