Release 1.0 data finalization
Browse files- SRS revisions: dubbo (24), go-zero (8), ripgrep (1) — adversarial-audit era
contract cleanups.
- Environment-repair dockerfiles now matching the rebuilt v1.0 images:
dubbo M001.2/M004/M006/M017 (+ evaluation_post_snapshot.sh Maven closure,
test-compat harness), element 599112e/feature_enhancements/maintenance_ui_ux
(Dockerfile.v1.0 + apply_patches), nushell G01_48bca0a/core_development.4.
- go-zero evaluation hook: dockerfiles/evaluation_post_snapshot.sh (go.mod
backfill v3: require diff/align + go-directive alignment, legacy-gated)
wired via config yaml evaluation_post_snapshot_script.
- Residue-prune metadata (navidrome/go-zero), filter lists, classification
and test_config updates; README.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Kv8v4m6ePchrw4dxfYarSk
- BurntSushi_ripgrep_14.1.1_15.0.0/srs/milestone_seed_119407d_1_sub-02/SRS.md +2 -0
- README.md +2 -2
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/dockerfiles/Dockerfile.test-compat +61 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/dockerfiles/M001.2/Dockerfile +14 -9
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/dockerfiles/M004/Dockerfile +7 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/dockerfiles/M006/Dockerfile +7 -4
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/dockerfiles/M006/test_config.json +2 -1
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/dockerfiles/M017/Dockerfile +4 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/dockerfiles/M025/test_config.json +1 -1
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/dockerfiles/dubbo_test_compatibility.sh +109 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/dockerfiles/evaluation_post_snapshot.sh +139 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M001.1/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M001.2/SRS.md +7 -1
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M002/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M003.1/SRS.md +7 -4
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M003.2/SRS.md +3 -19
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M003.3/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M004/SRS.md +7 -1
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M005.1/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M005.2/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M006/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M007/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M010/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M011/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M012/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M013/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M014/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M015/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M016.1/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M017/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M018/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M019/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M020/SRS.md +7 -1
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M021/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M022/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M024/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/srs/M025/SRS.md +6 -0
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/test_results/M001.2/M001.2_filter_list.json +0 -4
- apache_dubbo_dubbo-3.3.3_dubbo-3.3.6/test_results/M006/M006_filter_list.json +2 -1
- config/apache_dubbo_dubbo-3.3.3_dubbo-3.3.6.yaml +43 -0
- config/nushell_nushell_0.106.0_0.108.0.yaml +14 -0
- config/zeromicro_go-zero_v1.6.0_v1.9.3.yaml +11 -0
- element-hq_element-web_v1.11.95_v1.11.97/dockerfiles/feature_enhancements/Dockerfile.v1.0 +33 -0
- element-hq_element-web_v1.11.95_v1.11.97/dockerfiles/feature_enhancements/apply_patches.sh +24 -0
- element-hq_element-web_v1.11.95_v1.11.97/dockerfiles/feature_enhancements/test_config.json +11 -4
- element-hq_element-web_v1.11.95_v1.11.97/dockerfiles/maintenance_ui_ux/Dockerfile.v1.0 +33 -0
- element-hq_element-web_v1.11.95_v1.11.97/dockerfiles/maintenance_ui_ux/apply_patches.sh +24 -0
- element-hq_element-web_v1.11.95_v1.11.97/dockerfiles/maintenance_ui_ux/test_config.json +11 -4
- element-hq_element-web_v1.11.95_v1.11.97/dockerfiles/milestone_seed_599112e_1/Dockerfile +38 -48
- element-hq_element-web_v1.11.95_v1.11.97/dockerfiles/milestone_seed_599112e_1/apply_patches.sh +19 -0
|
@@ -49,12 +49,14 @@ This specification defines requirements for restructuring the hyperlink alias sy
|
|
| 49 |
**Requirements**:
|
| 50 |
- Create a public `HyperlinkAlias` struct type that encapsulates alias metadata, including the alias name, the format pattern string (the URL template that the alias expands to, e.g. a scheme like `vscode://file/{path}:{line}:{column}`), a human-readable description, and an optional display priority
|
| 51 |
- The type must provide accessor methods for retrieving alias properties
|
|
|
|
| 52 |
- The format pattern is used internally for alias resolution: when a user specifies an alias name via `--hyperlink-format`, it resolves to that alias's format pattern
|
| 53 |
- The type must be cloneable and debuggable
|
| 54 |
- The type must support `const` construction for static alias definitions
|
| 55 |
|
| 56 |
**Acceptance**:
|
| 57 |
- When accessing a `HyperlinkAlias` instance, the `name()` method returns the alias identifier
|
|
|
|
| 58 |
- When an alias is resolved during format string parsing, its format pattern is used to construct the `HyperlinkFormat`
|
| 59 |
- When the `HyperlinkAlias` type is used in external crates, it is accessible from the printer crate's public API
|
| 60 |
|
|
|
|
| 49 |
**Requirements**:
|
| 50 |
- Create a public `HyperlinkAlias` struct type that encapsulates alias metadata, including the alias name, the format pattern string (the URL template that the alias expands to, e.g. a scheme like `vscode://file/{path}:{line}:{column}`), a human-readable description, and an optional display priority
|
| 51 |
- The type must provide accessor methods for retrieving alias properties
|
| 52 |
+
- The format-pattern accessor is an exact internal integration contract: an inherent `const fn format(&self) -> &'static str` must exist and return the alias's format pattern. It must be visible from `crates/printer/src/hyperlink/mod.rs` (for example, use `pub(super)` when `HyperlinkAlias` is defined in `hyperlink/aliases.rs`). Alternative accessor names such as `format_pattern()` do not replace this required `format()` method
|
| 53 |
- The format pattern is used internally for alias resolution: when a user specifies an alias name via `--hyperlink-format`, it resolves to that alias's format pattern
|
| 54 |
- The type must be cloneable and debuggable
|
| 55 |
- The type must support `const` construction for static alias definitions
|
| 56 |
|
| 57 |
**Acceptance**:
|
| 58 |
- When accessing a `HyperlinkAlias` instance, the `name()` method returns the alias identifier
|
| 59 |
+
- When module-local validation calls `alias.format()`, it returns the alias's `&'static str` URL template and that template parses successfully as a `HyperlinkFormat`
|
| 60 |
- When an alias is resolved during format string parsing, its format pattern is used to construct the `HyperlinkFormat`
|
| 61 |
- When the `HyperlinkAlias` type is used in external crates, it is accessible from the printer crate's public API
|
| 62 |
|
|
@@ -128,8 +128,8 @@ Then follow the [SWE-Milestone setup guide](https://github.com/DeepCommit-ai/SWE
|
|
| 128 |
## Citation
|
| 129 |
|
| 130 |
```bibtex
|
| 131 |
-
@misc{
|
| 132 |
-
title={
|
| 133 |
author={Gangda Deng and Zhaoling Chen and Zhongming Yu and Haoyang Fan and Yuhong Liu and Yuxin Yang and Dhruv Parikh and Rajgopal Kannan and Le Cong and Mengdi Wang and Qian Zhang and Viktor Prasanna and Xiangru Tang and Xingyao Wang},
|
| 134 |
year={2026},
|
| 135 |
eprint={2603.13428},
|
|
|
|
| 128 |
## Citation
|
| 129 |
|
| 130 |
```bibtex
|
| 131 |
+
@misc{deng2026swemilestoneevaluatingaiagents,
|
| 132 |
+
title={SWE-Milestone: Evaluating AI Agents on Continuous Software Evolution},
|
| 133 |
author={Gangda Deng and Zhaoling Chen and Zhongming Yu and Haoyang Fan and Yuhong Liu and Yuxin Yang and Dhruv Parikh and Rajgopal Kannan and Le Cong and Mengdi Wang and Qian Zhang and Viktor Prasanna and Xiangru Tang and Xingyao Wang},
|
| 134 |
year={2026},
|
| 135 |
eprint={2603.13428},
|
|
@@ -0,0 +1,61 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
ARG MILESTONE_IMAGE=ubuntu:22.04
|
| 2 |
+
FROM ${MILESTONE_IMAGE}
|
| 3 |
+
|
| 4 |
+
ARG MILESTONE_ID
|
| 5 |
+
|
| 6 |
+
WORKDIR /testbed
|
| 7 |
+
SHELL ["/bin/bash", "-c"]
|
| 8 |
+
|
| 9 |
+
COPY dockerfiles/dubbo_test_compatibility.sh /usr/local/bin/dubbo_test_compatibility.sh
|
| 10 |
+
RUN chmod 0755 /usr/local/bin/dubbo_test_compatibility.sh
|
| 11 |
+
|
| 12 |
+
# Patch both evaluator states. Existing ENV-PATCH commits are amended so the
|
| 13 |
+
# milestone tag still has the raw START/END state as its direct parent, which
|
| 14 |
+
# is the topology used by the evaluator's manifest three-way merge. If an
|
| 15 |
+
# image has an unprepared raw tag, create one explicit ENV-PATCH commit.
|
| 16 |
+
RUN set -euo pipefail; \
|
| 17 |
+
git_bin=git; \
|
| 18 |
+
if [[ -x /usr/bin/git.real ]]; then git_bin=/usr/bin/git.real; fi; \
|
| 19 |
+
"$git_bin" config --global --add safe.directory /testbed; \
|
| 20 |
+
"$git_bin" config --global user.email "build@evoclaw.local"; \
|
| 21 |
+
"$git_bin" config --global user.name "EvoClaw Benchmark"; \
|
| 22 |
+
for suffix in end start; do \
|
| 23 |
+
tag="milestone-${MILESTONE_ID}-${suffix}"; \
|
| 24 |
+
raw_prefix="$(if [[ "$suffix" == "end" ]]; then echo "End"; else echo "Start"; fi) state for ${MILESTONE_ID}"; \
|
| 25 |
+
"$git_bin" checkout -f "$tag"; \
|
| 26 |
+
head_subject="$("$git_bin" log -1 --format=%s HEAD)"; \
|
| 27 |
+
parent="$("$git_bin" rev-parse HEAD^ 2>/dev/null || true)"; \
|
| 28 |
+
mode=""; \
|
| 29 |
+
if [[ -n "$parent" ]] && \
|
| 30 |
+
{ [[ "$head_subject" == "[ENV-PATCH"* ]] || \
|
| 31 |
+
[[ "$head_subject" == "Apply compilation patches"* ]]; }; then \
|
| 32 |
+
mode="amend"; \
|
| 33 |
+
elif [[ "$head_subject" == "$raw_prefix"* ]]; then \
|
| 34 |
+
mode="create"; \
|
| 35 |
+
else \
|
| 36 |
+
echo "ERROR: unsupported prepared-tag topology for $tag" >&2; \
|
| 37 |
+
echo " HEAD: $head_subject" >&2; \
|
| 38 |
+
echo " parent: ${parent:-none}" >&2; \
|
| 39 |
+
exit 48; \
|
| 40 |
+
fi; \
|
| 41 |
+
MILESTONE_ID="${MILESTONE_ID}" /usr/local/bin/dubbo_test_compatibility.sh; \
|
| 42 |
+
compat_targets=( \
|
| 43 |
+
dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/utils/ObservationConventionUtils.java \
|
| 44 |
+
); \
|
| 45 |
+
if [[ "${MILESTONE_ID}" == "M016.1" ]]; then \
|
| 46 |
+
compat_targets+=( \
|
| 47 |
+
dubbo-plugin/dubbo-mutiny/src/test/java/org/apache/dubbo/mutiny/MutinyClientCallsTest.java \
|
| 48 |
+
); \
|
| 49 |
+
fi; \
|
| 50 |
+
if ! "$git_bin" diff --quiet -- "${compat_targets[@]}"; then \
|
| 51 |
+
"$git_bin" add -- "${compat_targets[@]}"; \
|
| 52 |
+
if [[ "$mode" == "amend" ]]; then \
|
| 53 |
+
"$git_bin" commit --amend --no-verify -m "[ENV-PATCH-v1.0] Stabilize evaluator-owned compatibility tests"; \
|
| 54 |
+
else \
|
| 55 |
+
"$git_bin" commit --no-verify -m "[ENV-PATCH-v1.0] Stabilize evaluator-owned compatibility tests"; \
|
| 56 |
+
fi; \
|
| 57 |
+
"$git_bin" tag -f "$tag"; \
|
| 58 |
+
fi; \
|
| 59 |
+
done; \
|
| 60 |
+
"$git_bin" checkout -f "milestone-${MILESTONE_ID}-start"; \
|
| 61 |
+
test -z "$("$git_bin" status --porcelain)"
|
|
@@ -1,5 +1,6 @@
|
|
| 1 |
-
# Build
|
| 2 |
-
|
|
|
|
| 3 |
|
| 4 |
WORKDIR /testbed
|
| 5 |
# Use the testbed from base image directly (it already contains milestone tags)
|
|
@@ -17,18 +18,14 @@ RUN echo '#!/bin/bash' > /usr/local/bin/apply_patches.sh && \
|
|
| 17 |
echo 'cd /testbed' >> /usr/local/bin/apply_patches.sh && \
|
| 18 |
echo '' >> /usr/local/bin/apply_patches.sh && \
|
| 19 |
echo '# Handle dubbo-spring6-security module' >> /usr/local/bin/apply_patches.sh && \
|
| 20 |
-
echo 'if [ ! -
|
| 21 |
echo ' echo ">>> Removing dubbo-spring6-security references (START state)"' >> /usr/local/bin/apply_patches.sh && \
|
| 22 |
echo ' sed -i "/<module>dubbo-plugin\\/dubbo-spring6-security<\\/module>/d" pom.xml' >> /usr/local/bin/apply_patches.sh && \
|
| 23 |
echo ' if [ -f "dubbo-distribution/dubbo-all/pom.xml" ]; then' >> /usr/local/bin/apply_patches.sh && \
|
| 24 |
-
echo ' perl -i -0777 -pe "s
|
| 25 |
echo ' fi' >> /usr/local/bin/apply_patches.sh && \
|
| 26 |
echo 'else' >> /usr/local/bin/apply_patches.sh && \
|
| 27 |
-
echo ' echo ">>>
|
| 28 |
-
echo ' sed -i "/<module>dubbo-plugin\\/dubbo-spring6-security<\\/module>/d" pom.xml' >> /usr/local/bin/apply_patches.sh && \
|
| 29 |
-
echo ' if [ -f "dubbo-distribution/dubbo-all/pom.xml" ]; then' >> /usr/local/bin/apply_patches.sh && \
|
| 30 |
-
echo ' perl -i -0777 -pe "s/<dependency>\\s*<groupId>org\\.apache\\.dubbo<\\/groupId>\\s*<artifactId>dubbo-spring6-security<\\/artifactId>\\s*<\\/dependency>\\s*//gs" dubbo-distribution/dubbo-all/pom.xml' >> /usr/local/bin/apply_patches.sh && \
|
| 31 |
-
echo ' fi' >> /usr/local/bin/apply_patches.sh && \
|
| 32 |
echo 'fi' >> /usr/local/bin/apply_patches.sh && \
|
| 33 |
echo '' >> /usr/local/bin/apply_patches.sh && \
|
| 34 |
echo '# Fix dubbo-security/pom.xml to use new bouncycastle artifact names' >> /usr/local/bin/apply_patches.sh && \
|
|
@@ -40,6 +37,14 @@ RUN echo '#!/bin/bash' > /usr/local/bin/apply_patches.sh && \
|
|
| 40 |
echo ' perl -i -0777 -pe "s/<dependency>\\s*<groupId>org\\.bouncycastle<\\/groupId>\\s*<artifactId>bcprov-ext-jdk1[58]on<\\/artifactId>\\s*<\\/dependency>\\s*//s" dubbo-plugin/dubbo-security/pom.xml' >> /usr/local/bin/apply_patches.sh && \
|
| 41 |
echo 'fi' >> /usr/local/bin/apply_patches.sh && \
|
| 42 |
echo '' >> /usr/local/bin/apply_patches.sh && \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
echo '# Comment out testAllLogMethod in LoggerTest.java (idempotent)' >> /usr/local/bin/apply_patches.sh && \
|
| 44 |
echo 'LOGGER_TEST="dubbo-common/src/test/java/org/apache/dubbo/common/logger/LoggerTest.java"' >> /usr/local/bin/apply_patches.sh && \
|
| 45 |
echo 'if ! sed -n "48p" "$LOGGER_TEST" | grep -q "^/\\*$"; then' >> /usr/local/bin/apply_patches.sh && \
|
|
|
|
| 1 |
+
# Build from the canonical pinned base image. The historical
|
| 2 |
+
# baseline_rerun_stage4_002_fix2 tag is no longer published/reproducible.
|
| 3 |
+
FROM swe-milestone/apache_dubbo_dubbo-3.3.3_dubbo-3.3.6__base:v1.0
|
| 4 |
|
| 5 |
WORKDIR /testbed
|
| 6 |
# Use the testbed from base image directly (it already contains milestone tags)
|
|
|
|
| 18 |
echo 'cd /testbed' >> /usr/local/bin/apply_patches.sh && \
|
| 19 |
echo '' >> /usr/local/bin/apply_patches.sh && \
|
| 20 |
echo '# Handle dubbo-spring6-security module' >> /usr/local/bin/apply_patches.sh && \
|
| 21 |
+
echo 'if [ ! -f "dubbo-plugin/dubbo-spring6-security/pom.xml" ]; then' >> /usr/local/bin/apply_patches.sh && \
|
| 22 |
echo ' echo ">>> Removing dubbo-spring6-security references (START state)"' >> /usr/local/bin/apply_patches.sh && \
|
| 23 |
echo ' sed -i "/<module>dubbo-plugin\\/dubbo-spring6-security<\\/module>/d" pom.xml' >> /usr/local/bin/apply_patches.sh && \
|
| 24 |
echo ' if [ -f "dubbo-distribution/dubbo-all/pom.xml" ]; then' >> /usr/local/bin/apply_patches.sh && \
|
| 25 |
+
echo ' perl -i -0777 -pe "s#<dependency>\\s*<groupId>org\\.apache\\.dubbo</groupId>\\s*<artifactId>dubbo-spring6-security</artifactId>.*?</dependency>\\s*##gs; s#\\s*<include>org\\.apache\\.dubbo:dubbo-spring6-security</include>##g" dubbo-distribution/dubbo-all/pom.xml' >> /usr/local/bin/apply_patches.sh && \
|
| 26 |
echo ' fi' >> /usr/local/bin/apply_patches.sh && \
|
| 27 |
echo 'else' >> /usr/local/bin/apply_patches.sh && \
|
| 28 |
+
echo ' echo ">>> Keeping dubbo-spring6-security in the END reactor"' >> /usr/local/bin/apply_patches.sh && \
|
|
|
|
|
|
|
|
|
|
|
|
|
| 29 |
echo 'fi' >> /usr/local/bin/apply_patches.sh && \
|
| 30 |
echo '' >> /usr/local/bin/apply_patches.sh && \
|
| 31 |
echo '# Fix dubbo-security/pom.xml to use new bouncycastle artifact names' >> /usr/local/bin/apply_patches.sh && \
|
|
|
|
| 37 |
echo ' perl -i -0777 -pe "s/<dependency>\\s*<groupId>org\\.bouncycastle<\\/groupId>\\s*<artifactId>bcprov-ext-jdk1[58]on<\\/artifactId>\\s*<\\/dependency>\\s*//s" dubbo-plugin/dubbo-security/pom.xml' >> /usr/local/bin/apply_patches.sh && \
|
| 38 |
echo 'fi' >> /usr/local/bin/apply_patches.sh && \
|
| 39 |
echo '' >> /usr/local/bin/apply_patches.sh && \
|
| 40 |
+
echo '# Keep an agent-overlaid dependency BOM compatible with the M001.2 BouncyCastle migration' >> /usr/local/bin/apply_patches.sh && \
|
| 41 |
+
echo 'BOUNCYCASTLE_BOM="dubbo-dependencies-bom/pom.xml"' >> /usr/local/bin/apply_patches.sh && \
|
| 42 |
+
echo 'if [ -f "$BOUNCYCASTLE_BOM" ]; then' >> /usr/local/bin/apply_patches.sh && \
|
| 43 |
+
echo ' sed -i -E "s#<bouncycastle-bcprov_version>[^<]+</bouncycastle-bcprov_version>#<bouncycastle-bcprov_version>1.81</bouncycastle-bcprov_version>#g" "$BOUNCYCASTLE_BOM"' >> /usr/local/bin/apply_patches.sh && \
|
| 44 |
+
echo ' sed -i "s/bcprov-jdk15on/bcprov-jdk18on/g; s/bcpkix-jdk15on/bcpkix-jdk18on/g" "$BOUNCYCASTLE_BOM"' >> /usr/local/bin/apply_patches.sh && \
|
| 45 |
+
echo ' perl -i -0777 -pe "s#<dependency>\\s*<groupId>org\\.bouncycastle</groupId>\\s*<artifactId>bcprov-ext-jdk1[58]on</artifactId>.*?</dependency>\\s*##s" "$BOUNCYCASTLE_BOM"' >> /usr/local/bin/apply_patches.sh && \
|
| 46 |
+
echo 'fi' >> /usr/local/bin/apply_patches.sh && \
|
| 47 |
+
echo '' >> /usr/local/bin/apply_patches.sh && \
|
| 48 |
echo '# Comment out testAllLogMethod in LoggerTest.java (idempotent)' >> /usr/local/bin/apply_patches.sh && \
|
| 49 |
echo 'LOGGER_TEST="dubbo-common/src/test/java/org/apache/dubbo/common/logger/LoggerTest.java"' >> /usr/local/bin/apply_patches.sh && \
|
| 50 |
echo 'if ! sed -n "48p" "$LOGGER_TEST" | grep -q "^/\\*$"; then' >> /usr/local/bin/apply_patches.sh && \
|
|
@@ -42,6 +42,13 @@ sed -i 's/bcprov-jdk15on/bcprov-jdk18on/g' dubbo-plugin/dubbo-security/pom.xml
|
|
| 42 |
sed -i 's/bcpkix-jdk15on/bcpkix-jdk18on/g' dubbo-plugin/dubbo-security/pom.xml
|
| 43 |
# Remove bcprov-ext-jdk dependency
|
| 44 |
perl -i -0pe 's/\s*<dependency>\s*<groupId>org\.bouncycastle<\/groupId>\s*<artifactId>bcprov-ext-jdk\d+on<\/artifactId>\s*<\/dependency>//gs' dubbo-plugin/dubbo-security/pom.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 45 |
|
| 46 |
# ===== Remove dubbo-spring6-security module =====
|
| 47 |
sed -i '/<module>dubbo-plugin\/dubbo-spring6-security<\/module>/d' pom.xml 2>/dev/null || true
|
|
|
|
| 42 |
sed -i 's/bcpkix-jdk15on/bcpkix-jdk18on/g' dubbo-plugin/dubbo-security/pom.xml
|
| 43 |
# Remove bcprov-ext-jdk dependency
|
| 44 |
perl -i -0pe 's/\s*<dependency>\s*<groupId>org\.bouncycastle<\/groupId>\s*<artifactId>bcprov-ext-jdk\d+on<\/artifactId>\s*<\/dependency>//gs' dubbo-plugin/dubbo-security/pom.xml
|
| 45 |
+
# Keep this evaluator-owned POM self-contained. Agent snapshots may
|
| 46 |
+
# legitimately overlay an older BOM which does not manage the jdk18 artifacts.
|
| 47 |
+
for artifact in bcprov-jdk18on bcpkix-jdk18on; do
|
| 48 |
+
if ! grep -A1 "<artifactId>${artifact}</artifactId>" dubbo-plugin/dubbo-security/pom.xml | grep -q '<version>'; then
|
| 49 |
+
sed -i "/<artifactId>${artifact}<\/artifactId>/a\\ <version>1.81</version>" dubbo-plugin/dubbo-security/pom.xml
|
| 50 |
+
fi
|
| 51 |
+
done
|
| 52 |
|
| 53 |
# ===== Remove dubbo-spring6-security module =====
|
| 54 |
sed -i '/<module>dubbo-plugin\/dubbo-spring6-security<\/module>/d' pom.xml 2>/dev/null || true
|
|
@@ -57,10 +57,13 @@ if [ -f dubbo-plugin/dubbo-security/pom.xml ]; then
|
|
| 57 |
sed -i 's/bcprov-jdk15on/bcprov-jdk18on/g' dubbo-plugin/dubbo-security/pom.xml 2>/dev/null || true
|
| 58 |
sed -i 's/bcpkix-jdk15on/bcpkix-jdk18on/g' dubbo-plugin/dubbo-security/pom.xml 2>/dev/null || true
|
| 59 |
sed -i 's/bcprov-ext-jdk15on/bcprov-ext-jdk18on/g' dubbo-plugin/dubbo-security/pom.xml 2>/dev/null || true
|
| 60 |
-
#
|
| 61 |
-
|
| 62 |
-
|
| 63 |
-
|
|
|
|
|
|
|
|
|
|
| 64 |
fi
|
| 65 |
|
| 66 |
# ===== Remove dubbo-spring6-security module =====
|
|
|
|
| 57 |
sed -i 's/bcprov-jdk15on/bcprov-jdk18on/g' dubbo-plugin/dubbo-security/pom.xml 2>/dev/null || true
|
| 58 |
sed -i 's/bcpkix-jdk15on/bcpkix-jdk18on/g' dubbo-plugin/dubbo-security/pom.xml 2>/dev/null || true
|
| 59 |
sed -i 's/bcprov-ext-jdk15on/bcprov-ext-jdk18on/g' dubbo-plugin/dubbo-security/pom.xml 2>/dev/null || true
|
| 60 |
+
# Keep this evaluator-owned POM self-contained. Agent snapshots may
|
| 61 |
+
# legitimately overlay an older BOM which does not manage jdk18 artifacts.
|
| 62 |
+
for artifact in bcprov-jdk18on bcpkix-jdk18on bcprov-ext-jdk18on; do
|
| 63 |
+
if ! grep -A1 "<artifactId>${artifact}</artifactId>" dubbo-plugin/dubbo-security/pom.xml | grep -q '<version>'; then
|
| 64 |
+
sed -i "/<artifactId>${artifact}<\/artifactId>/a\\ <version>1.81</version>" dubbo-plugin/dubbo-security/pom.xml 2>/dev/null || true
|
| 65 |
+
fi
|
| 66 |
+
done
|
| 67 |
fi
|
| 68 |
|
| 69 |
# ===== Remove dubbo-spring6-security module =====
|
|
@@ -3,6 +3,7 @@
|
|
| 3 |
"name": "default",
|
| 4 |
"test_states": ["start", "end"],
|
| 5 |
"test_cmd": "mvn test -Dmaven.test.failure.ignore=true -Dsurefire.timeout={timeout} -Pskip-spotless -Dcheckstyle.skip=true -Drat.skip=true 2>&1 | tee /output/{output_file}",
|
| 6 |
-
"description": "Run all Maven tests with default configuration"
|
|
|
|
| 7 |
}
|
| 8 |
]
|
|
|
|
| 3 |
"name": "default",
|
| 4 |
"test_states": ["start", "end"],
|
| 5 |
"test_cmd": "mvn test -Dmaven.test.failure.ignore=true -Dsurefire.timeout={timeout} -Pskip-spotless -Dcheckstyle.skip=true -Drat.skip=true 2>&1 | tee /output/{output_file}",
|
| 6 |
+
"description": "Run all Maven tests with default configuration",
|
| 7 |
+
"run_timeout_seconds": 3600
|
| 8 |
}
|
| 9 |
]
|
|
@@ -26,6 +26,10 @@ RUN cat > /tmp/dubbo-spring6-security-pom.xml << 'POMEOF'
|
|
| 26 |
<maven.compiler.source>17</maven.compiler.source>
|
| 27 |
<maven.compiler.target>17</maven.compiler.target>
|
| 28 |
<skip_maven_deploy>false</skip_maven_deploy>
|
|
|
|
|
|
|
|
|
|
|
|
|
| 29 |
<spring.oauth2.server>1.5.1</spring.oauth2.server>
|
| 30 |
</properties>
|
| 31 |
|
|
|
|
| 26 |
<maven.compiler.source>17</maven.compiler.source>
|
| 27 |
<maven.compiler.target>17</maven.compiler.target>
|
| 28 |
<skip_maven_deploy>false</skip_maven_deploy>
|
| 29 |
+
<!-- Keep the evaluator-added module independent of an agent-overlaid root POM. -->
|
| 30 |
+
<spring-6.version>6.2.8</spring-6.version>
|
| 31 |
+
<spring-security-6.version>6.5.1</spring-security-6.version>
|
| 32 |
+
<spring-boot-3.version>3.5.0</spring-boot-3.version>
|
| 33 |
<spring.oauth2.server>1.5.1</spring.oauth2.server>
|
| 34 |
</properties>
|
| 35 |
|
|
@@ -2,7 +2,7 @@
|
|
| 2 |
{
|
| 3 |
"name": "default",
|
| 4 |
"test_states": ["start", "end"],
|
| 5 |
-
"test_cmd": "
|
| 6 |
"description": "Run all tests with Maven"
|
| 7 |
}
|
| 8 |
]
|
|
|
|
| 2 |
{
|
| 3 |
"name": "default",
|
| 4 |
"test_states": ["start", "end"],
|
| 5 |
+
"test_cmd": "mvn test -Dmaven.test.failure.ignore=true -Dsurefire.timeout={timeout} -Pskip-spotless -Dcheckstyle.skip=true -Drat.skip=true 2>&1 | tee /output/{output_file}",
|
| 6 |
"description": "Run all tests with Maven"
|
| 7 |
}
|
| 8 |
]
|
|
@@ -0,0 +1,109 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
#!/usr/bin/env bash
|
| 2 |
+
set -euo pipefail
|
| 3 |
+
|
| 4 |
+
cd /testbed
|
| 5 |
+
|
| 6 |
+
observation_utils="dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/utils/ObservationConventionUtils.java"
|
| 7 |
+
mutiny_client_calls_test="dubbo-plugin/dubbo-mutiny/src/test/java/org/apache/dubbo/mutiny/MutinyClientCallsTest.java"
|
| 8 |
+
|
| 9 |
+
if [[ ! -f "$observation_utils" ]]; then
|
| 10 |
+
echo "ERROR: Micrometer test compatibility target is missing: $observation_utils" >&2
|
| 11 |
+
exit 44
|
| 12 |
+
fi
|
| 13 |
+
|
| 14 |
+
# Micrometer 1.13.x stores KeyValues in a private `keyValues` field, while
|
| 15 |
+
# 1.14+ uses a private `sortedSet` field plus a logical length. The benchmark
|
| 16 |
+
# test must observe KeyValues through its stable public Iterable contract
|
| 17 |
+
# instead of depending on either implementation detail.
|
| 18 |
+
if grep -Eq 'KeyValues\.class\.getDeclaredField\("(keyValues|sortedSet)"\)' "$observation_utils"; then
|
| 19 |
+
sed -E -i \
|
| 20 |
+
-e '/^import java\.lang\.reflect\.Field;$/d' \
|
| 21 |
+
-e '/Field f = KeyValues\.class\.getDeclaredField/,+2d' \
|
| 22 |
+
-e 's/for \(KeyValue keyValue : kv\)/for (KeyValue keyValue : keyValues)/' \
|
| 23 |
+
"$observation_utils"
|
| 24 |
+
fi
|
| 25 |
+
|
| 26 |
+
# Removing the java.lang.reflect import leaves two adjacent blank lines
|
| 27 |
+
# between the Dubbo and Micrometer import groups. Normalize only that exact
|
| 28 |
+
# boundary; changing broader whitespace here could hide unrelated formatting
|
| 29 |
+
# defects in the benchmark source.
|
| 30 |
+
sed -i \
|
| 31 |
+
'/^import org\.apache\.dubbo\.rpc\.Invoker;$/ {
|
| 32 |
+
N
|
| 33 |
+
N
|
| 34 |
+
N
|
| 35 |
+
s/\n\n\nimport io\.micrometer\.common\.KeyValue;/\n\nimport io.micrometer.common.KeyValue;/
|
| 36 |
+
}' \
|
| 37 |
+
"$observation_utils"
|
| 38 |
+
|
| 39 |
+
# Fail closed if the upstream helper changes shape. A silent no-op would
|
| 40 |
+
# reproduce the version-specific false failures this patch is meant to remove.
|
| 41 |
+
if grep -q 'KeyValues\.class\.getDeclaredField' "$observation_utils"; then
|
| 42 |
+
echo "ERROR: ObservationConventionUtils still reflects into KeyValues" >&2
|
| 43 |
+
exit 45
|
| 44 |
+
fi
|
| 45 |
+
if grep -q '^import java\.lang\.reflect\.Field;' "$observation_utils"; then
|
| 46 |
+
echo "ERROR: stale java.lang.reflect.Field import remains" >&2
|
| 47 |
+
exit 46
|
| 48 |
+
fi
|
| 49 |
+
if ! grep -Fq 'for (KeyValue keyValue : keyValues)' "$observation_utils"; then
|
| 50 |
+
echo "ERROR: ObservationConventionUtils does not use the public KeyValues iterator" >&2
|
| 51 |
+
exit 47
|
| 52 |
+
fi
|
| 53 |
+
import_window=$(
|
| 54 |
+
sed -n \
|
| 55 |
+
'/^import org\.apache\.dubbo\.rpc\.Invoker;$/,/^import io\.micrometer\.common\.KeyValue;$/p' \
|
| 56 |
+
"$observation_utils"
|
| 57 |
+
)
|
| 58 |
+
expected_import_window=$'import org.apache.dubbo.rpc.Invoker;\n\nimport io.micrometer.common.KeyValue;'
|
| 59 |
+
if [[ "$import_window" != "$expected_import_window" ]]; then
|
| 60 |
+
echo "ERROR: ObservationConventionUtils import boundary is not Spotless-compatible" >&2
|
| 61 |
+
printf '%s\n' "$import_window" >&2
|
| 62 |
+
exit 48
|
| 63 |
+
fi
|
| 64 |
+
|
| 65 |
+
echo ">>> Dubbo test compatibility patch applied successfully"
|
| 66 |
+
|
| 67 |
+
# M016.1 owns a negative-path test that deliberately feeds an exception into
|
| 68 |
+
# the candidate implementation. An implementation that drops that exception
|
| 69 |
+
# leaves Mutiny's indefinite await blocked forever. Surefire's fork timeout is
|
| 70 |
+
# not a reliable assertion boundary: depending on fork shutdown timing it can
|
| 71 |
+
# either omit this test report and continue, or hang the whole reactor until the
|
| 72 |
+
# evaluator's outer timeout. Bound the evaluator-owned await instead, so a
|
| 73 |
+
# correct implementation still observes "boom" immediately while an incorrect
|
| 74 |
+
# implementation becomes a deterministic failing test after ten seconds.
|
| 75 |
+
if [[ "${MILESTONE_ID:-}" == "M016.1" ]]; then
|
| 76 |
+
if [[ ! -f "$mutiny_client_calls_test" ]]; then
|
| 77 |
+
echo "ERROR: Mutiny compatibility target is missing: $mutiny_client_calls_test" >&2
|
| 78 |
+
exit 49
|
| 79 |
+
fi
|
| 80 |
+
|
| 81 |
+
mutiny_method=$(
|
| 82 |
+
sed -n \
|
| 83 |
+
'/void testOneToOneThrowsErrorWithMutinyAwait()/,/^[[:space:]]*@Test/p' \
|
| 84 |
+
"$mutiny_client_calls_test"
|
| 85 |
+
)
|
| 86 |
+
if grep -Fq 'response.await().indefinitely();' <<<"$mutiny_method"; then
|
| 87 |
+
sed -i \
|
| 88 |
+
'/void testOneToOneThrowsErrorWithMutinyAwait()/,/^[[:space:]]*@Test/ {
|
| 89 |
+
s/response\.await()\.indefinitely();/response.await().atMost(Duration.ofSeconds(10));/
|
| 90 |
+
}' \
|
| 91 |
+
"$mutiny_client_calls_test"
|
| 92 |
+
fi
|
| 93 |
+
|
| 94 |
+
mutiny_method=$(
|
| 95 |
+
sed -n \
|
| 96 |
+
'/void testOneToOneThrowsErrorWithMutinyAwait()/,/^[[:space:]]*@Test/p' \
|
| 97 |
+
"$mutiny_client_calls_test"
|
| 98 |
+
)
|
| 99 |
+
if ! grep -Fq 'response.await().atMost(Duration.ofSeconds(10));' <<<"$mutiny_method"; then
|
| 100 |
+
echo "ERROR: Mutiny negative-path await is not bounded" >&2
|
| 101 |
+
exit 50
|
| 102 |
+
fi
|
| 103 |
+
if grep -Fq 'response.await().indefinitely();' <<<"$mutiny_method"; then
|
| 104 |
+
echo "ERROR: Mutiny negative-path test still contains an indefinite await" >&2
|
| 105 |
+
exit 51
|
| 106 |
+
fi
|
| 107 |
+
|
| 108 |
+
echo ">>> Dubbo M016.1 Mutiny negative-path wait bounded successfully"
|
| 109 |
+
fi
|
|
@@ -0,0 +1,139 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
#!/usr/bin/env bash
|
| 2 |
+
set -euo pipefail
|
| 3 |
+
|
| 4 |
+
cd /testbed
|
| 5 |
+
|
| 6 |
+
# Keep this script limited to build/test environment closure. It must never
|
| 7 |
+
# alter production Java sources or the benchmark's authoritative test sources.
|
| 8 |
+
SPRING6_POM="dubbo-plugin/dubbo-spring6-security/pom.xml"
|
| 9 |
+
BASE_SECURITY_POM="dubbo-plugin/dubbo-spring-security/pom.xml"
|
| 10 |
+
BASE_SECURITY_TEST="dubbo-plugin/dubbo-spring-security/src/test/java/org/apache/dubbo/spring/security/jackson/ObjectMapperCodecTest.java"
|
| 11 |
+
SPRING6_SECURITY_TEST="dubbo-plugin/dubbo-spring6-security/src/test/java/org/apache/dubbo/spring/security/oauth2/DeserializationTest.java"
|
| 12 |
+
SECURITY_POM="dubbo-plugin/dubbo-security/pom.xml"
|
| 13 |
+
DEPENDENCY_BOM="dubbo-dependencies-bom/pom.xml"
|
| 14 |
+
|
| 15 |
+
if [[ -f pom.xml && -f "$SPRING6_POM" ]]; then
|
| 16 |
+
if ! perl -0777 -ne '
|
| 17 |
+
exit(m{<profile>(?:(?!</profile>).)*?<id>jdk-version-ge-17</id>
|
| 18 |
+
(?:(?!</profile>).)*?<module>dubbo-plugin/dubbo-spring6-security</module>
|
| 19 |
+
(?:(?!</profile>).)*?</profile>}sx ? 0 : 1)
|
| 20 |
+
' pom.xml; then
|
| 21 |
+
perl -0777 -i -pe '
|
| 22 |
+
$changed = s{(<profile>(?:(?!</profile>).)*?<id>jdk-version-ge-17</id>
|
| 23 |
+
(?:(?!</profile>).)*?<modules>)}
|
| 24 |
+
{$1 . "\n <module>dubbo-plugin/dubbo-spring6-security</module>"}sex;
|
| 25 |
+
die "jdk-version-ge-17 profile/modules block missing\n" unless $changed;
|
| 26 |
+
' pom.xml
|
| 27 |
+
fi
|
| 28 |
+
fi
|
| 29 |
+
|
| 30 |
+
# The evaluator restores the authoritative END tests but intentionally does
|
| 31 |
+
# not overwrite agent manifests with END POMs. Keep that source-authority
|
| 32 |
+
# boundary while supplying the test-only dependency closure required by the
|
| 33 |
+
# restored ObjectMapperCodecTest. Raw M001.2 END declares this exact
|
| 34 |
+
# dependency; adding it at test scope neither changes the produced artifact nor
|
| 35 |
+
# restores any ground-truth implementation.
|
| 36 |
+
if [[ -f "$BASE_SECURITY_POM" && -f "$BASE_SECURITY_TEST" ]] &&
|
| 37 |
+
grep -q 'org.springframework.security.oauth2.client' "$BASE_SECURITY_TEST" &&
|
| 38 |
+
! grep -q '<artifactId>spring-security-oauth2-client</artifactId>' "$BASE_SECURITY_POM"; then
|
| 39 |
+
perl -0777 -i -pe '
|
| 40 |
+
$dependency = qq{
|
| 41 |
+
<!-- evaluator-owned dependency closure for restored END tests -->
|
| 42 |
+
<dependency>
|
| 43 |
+
<groupId>org.springframework.security</groupId>
|
| 44 |
+
<artifactId>spring-security-oauth2-client</artifactId>
|
| 45 |
+
<scope>test</scope>
|
| 46 |
+
<optional>true</optional>
|
| 47 |
+
</dependency>
|
| 48 |
+
};
|
| 49 |
+
# Consume the indentation of the original closing tag. Leaving those
|
| 50 |
+
# spaces behind creates a whitespace-only line that Dubbo Spotless
|
| 51 |
+
# rejects late in the reactor, skipping every following module.
|
| 52 |
+
$changed = s{(?:^[ \t]*\n)*^[ \t]*</dependencies>}
|
| 53 |
+
{$dependency . " </dependencies>"}me;
|
| 54 |
+
die "base Spring Security dependencies block missing\n" unless $changed;
|
| 55 |
+
' "$BASE_SECURITY_POM"
|
| 56 |
+
fi
|
| 57 |
+
|
| 58 |
+
# M001.2's legacy image hook migrates dubbo-security from the unavailable
|
| 59 |
+
# jdk15on BouncyCastle artifacts to jdk18on. Snapshot manifest restoration
|
| 60 |
+
# happens after that hook and can put the agent BOM back, leaving the
|
| 61 |
+
# evaluator-modified consumer without version management. Reapply the matching
|
| 62 |
+
# BOM half of the image-owned migration; never add or change Java code.
|
| 63 |
+
if [[ -f "$SECURITY_POM" && -f "$DEPENDENCY_BOM" ]] &&
|
| 64 |
+
grep -q '<artifactId>bcprov-jdk18on</artifactId>' "$SECURITY_POM"; then
|
| 65 |
+
sed -i -E \
|
| 66 |
+
's#<bouncycastle-bcprov_version>[^<]+</bouncycastle-bcprov_version>#<bouncycastle-bcprov_version>1.81</bouncycastle-bcprov_version>#g' \
|
| 67 |
+
"$DEPENDENCY_BOM"
|
| 68 |
+
# Some cumulative agent snapshots carry a second legacy property. The
|
| 69 |
+
# image hook rewrites those managed artifactIds to jdk18on as well, so a
|
| 70 |
+
# stale 1.70 value would create a duplicate, unresolvable jdk18on entry.
|
| 71 |
+
sed -i -E \
|
| 72 |
+
's#<bouncycastle-jdk15on_version>[^<]+</bouncycastle-jdk15on_version>#<bouncycastle-jdk15on_version>1.81</bouncycastle-jdk15on_version>#g' \
|
| 73 |
+
"$DEPENDENCY_BOM"
|
| 74 |
+
sed -i \
|
| 75 |
+
's/bcprov-jdk15on/bcprov-jdk18on/g; s/bcpkix-jdk15on/bcpkix-jdk18on/g' \
|
| 76 |
+
"$DEPENDENCY_BOM"
|
| 77 |
+
perl -0777 -i -pe '
|
| 78 |
+
s{<dependency>\s*<groupId>org\.bouncycastle</groupId>\s*
|
| 79 |
+
<artifactId>bcprov-ext-jdk1[58]on</artifactId>.*?</dependency>\s*}{}gsx
|
| 80 |
+
' "$DEPENDENCY_BOM"
|
| 81 |
+
|
| 82 |
+
# The agent may legitimately retain a 3.3.3 root POM while the
|
| 83 |
+
# milestone-owned hook above migrates this consumer to jdk18on. Maven
|
| 84 |
+
# resolves imported BOMs while building the project model, before the
|
| 85 |
+
# reactor's rewritten BOM can repair that cross-vintage import. Pin the
|
| 86 |
+
# exact version owned by the same environment migration on the two
|
| 87 |
+
# migrated consumer edges so model construction remains self-consistent.
|
| 88 |
+
perl -0777 -i -pe '
|
| 89 |
+
s{(<dependency>\s*<groupId>org\.bouncycastle</groupId>\s*
|
| 90 |
+
<artifactId>(?:bcprov|bcpkix)-jdk18on</artifactId>)
|
| 91 |
+
(?!\s*<version>)}
|
| 92 |
+
{$1 . "\n <version>1.81</version>"}gsex
|
| 93 |
+
' "$SECURITY_POM"
|
| 94 |
+
fi
|
| 95 |
+
|
| 96 |
+
# DeserializationTest is an authoritative END test grafted by the evaluator.
|
| 97 |
+
# Its Spring test harness and Dubbo bootstrap are supplied by test-scoped
|
| 98 |
+
# dependencies in the raw M001.2 END POM. Preserve the agent's production POM
|
| 99 |
+
# while restoring only those test harness edges when the snapshot omitted them.
|
| 100 |
+
if [[ -f "$SPRING6_POM" && -f "$SPRING6_SECURITY_TEST" ]]; then
|
| 101 |
+
spring6_test_dependencies=""
|
| 102 |
+
if grep -q 'org.springframework.boot.test.context.SpringBootTest' "$SPRING6_SECURITY_TEST" &&
|
| 103 |
+
! grep -q '<artifactId>spring-boot-starter-test</artifactId>' "$SPRING6_POM"; then
|
| 104 |
+
spring6_test_dependencies+=$'\n <!-- evaluator-owned Spring Boot harness for restored END tests -->
|
| 105 |
+
<dependency>
|
| 106 |
+
<groupId>org.springframework.boot</groupId>
|
| 107 |
+
<artifactId>spring-boot-starter-test</artifactId>
|
| 108 |
+
<version>${spring-boot-3.version}</version>
|
| 109 |
+
<scope>test</scope>
|
| 110 |
+
<optional>true</optional>
|
| 111 |
+
<exclusions>
|
| 112 |
+
<exclusion>
|
| 113 |
+
<groupId>ch.qos.logback</groupId>
|
| 114 |
+
<artifactId>logback-classic</artifactId>
|
| 115 |
+
</exclusion>
|
| 116 |
+
</exclusions>
|
| 117 |
+
</dependency>\n'
|
| 118 |
+
fi
|
| 119 |
+
if grep -q 'org.apache.dubbo.config.bootstrap.DubboBootstrap' "$SPRING6_SECURITY_TEST" &&
|
| 120 |
+
! grep -q '<artifactId>dubbo-config-spring6</artifactId>' "$SPRING6_POM"; then
|
| 121 |
+
spring6_test_dependencies+=$'\n <!-- evaluator-owned Dubbo bootstrap harness for restored END tests -->
|
| 122 |
+
<dependency>
|
| 123 |
+
<groupId>org.apache.dubbo</groupId>
|
| 124 |
+
<artifactId>dubbo-config-spring6</artifactId>
|
| 125 |
+
<version>${project.parent.version}</version>
|
| 126 |
+
<scope>test</scope>
|
| 127 |
+
<optional>true</optional>
|
| 128 |
+
</dependency>\n'
|
| 129 |
+
fi
|
| 130 |
+
if [[ -n "$spring6_test_dependencies" ]]; then
|
| 131 |
+
SPRING6_TEST_DEPENDENCIES="$spring6_test_dependencies" perl -0777 -i -pe '
|
| 132 |
+
$changed = s{(?:^[ \t]*\n)*^[ \t]*</dependencies>(?!.*</dependencies>)}
|
| 133 |
+
{$ENV{SPRING6_TEST_DEPENDENCIES} . " </dependencies>"}mse;
|
| 134 |
+
die "Spring 6 Security dependencies block missing\n" unless $changed;
|
| 135 |
+
' "$SPRING6_POM"
|
| 136 |
+
fi
|
| 137 |
+
fi
|
| 138 |
+
|
| 139 |
+
echo ">>> Evaluation Maven closure applied successfully"
|
|
@@ -194,6 +194,12 @@ The implementation must support the following usage patterns commonly encountere
|
|
| 194 |
|
| 195 |
---
|
| 196 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 197 |
# Environment Dependency Changes (relative to Base Env)
|
| 198 |
|
| 199 |
Add test-scoped dependency for Spring Authorization Server types (RegisteredClient, OAuth2ClientAuthenticationToken, ClientSettings, TokenSettings, etc.) to enable serialization testing.
|
|
|
|
| 194 |
|
| 195 |
---
|
| 196 |
|
| 197 |
+
## Repository-wide Formatting Contract
|
| 198 |
+
|
| 199 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 200 |
+
|
| 201 |
+
---
|
| 202 |
+
|
| 203 |
# Environment Dependency Changes (relative to Base Env)
|
| 204 |
|
| 205 |
Add test-scoped dependency for Spring Authorization Server types (RegisteredClient, OAuth2ClientAuthenticationToken, ClientSettings, TokenSettings, etc.) to enable serialization testing.
|
|
@@ -33,7 +33,7 @@ This milestone addresses two related concerns in the Apache Dubbo framework:
|
|
| 33 |
- The new module must require JDK 17 as the minimum compilation target
|
| 34 |
- The new module should depend on `dubbo-spring-security` to reuse common serialization infrastructure
|
| 35 |
- All OAuth2-related code (the `oauth2` package) must be moved from `dubbo-spring-security` to the new module
|
| 36 |
-
- The base `dubbo-spring-security` module must remove OAuth2 dependencies and must continue working for users on older Spring versions without OAuth2 features
|
| 37 |
- The new module must register its OAuth2 serialization support through Dubbo's SPI extension mechanism, allowing dynamic registration when the module is present on the classpath
|
| 38 |
- The new module must be properly integrated into the project build system:
|
| 39 |
- Added to the BOM for dependency management
|
|
@@ -71,6 +71,12 @@ This milestone addresses two related concerns in the Apache Dubbo framework:
|
|
| 71 |
|
| 72 |
---
|
| 73 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 74 |
# Environment Dependency Changes (relative to Base Env)
|
| 75 |
|
| 76 |
No changes detected.
|
|
|
|
| 33 |
- The new module must require JDK 17 as the minimum compilation target
|
| 34 |
- The new module should depend on `dubbo-spring-security` to reuse common serialization infrastructure
|
| 35 |
- All OAuth2-related code (the `oauth2` package) must be moved from `dubbo-spring-security` to the new module
|
| 36 |
+
- The base `dubbo-spring-security` module must remove OAuth2 dependencies from its production dependency surface and must continue working for users on older Spring versions without OAuth2 features. Dependencies needed only to compile and run the base module's existing non-`oauth2`-package tests may remain with Maven `test` scope; those tests must remain compilable and passing.
|
| 37 |
- The new module must register its OAuth2 serialization support through Dubbo's SPI extension mechanism, allowing dynamic registration when the module is present on the classpath
|
| 38 |
- The new module must be properly integrated into the project build system:
|
| 39 |
- Added to the BOM for dependency management
|
|
|
|
| 71 |
|
| 72 |
---
|
| 73 |
|
| 74 |
+
## Repository-wide Formatting Contract
|
| 75 |
+
|
| 76 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 77 |
+
|
| 78 |
+
---
|
| 79 |
+
|
| 80 |
# Environment Dependency Changes (relative to Base Env)
|
| 81 |
|
| 82 |
No changes detected.
|
|
@@ -134,6 +134,12 @@ tests with real network connections, which are beyond the scope of the current t
|
|
| 134 |
|
| 135 |
---
|
| 136 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 137 |
# Environment Dependency Changes (relative to Base Env)
|
| 138 |
|
| 139 |
No changes detected.
|
|
|
|
| 134 |
|
| 135 |
---
|
| 136 |
|
| 137 |
+
## Repository-wide Formatting Contract
|
| 138 |
+
|
| 139 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 140 |
+
|
| 141 |
+
---
|
| 142 |
+
|
| 143 |
# Environment Dependency Changes (relative to Base Env)
|
| 144 |
|
| 145 |
No changes detected.
|
|
@@ -53,10 +53,7 @@ This milestone establishes the module configuration and code generation template
|
|
| 53 |
|
| 54 |
### Testing Approach
|
| 55 |
|
| 56 |
-
The Mustache templates and pom.xml configuration are indirectly verified through the code generation test
|
| 57 |
-
|
| 58 |
-
#### Code Generation Test
|
| 59 |
-
- `testMessageGenerator` - Tests the protobuf code generation pipeline which uses the Mustache templates
|
| 60 |
|
| 61 |
**Note**: Direct unit tests for Mustache template syntax or pom.xml structure are not provided. Validation is performed through:
|
| 62 |
1. Successful Maven build (pom.xml correctness)
|
|
@@ -64,6 +61,12 @@ The Mustache templates and pom.xml configuration are indirectly verified through
|
|
| 64 |
|
| 65 |
---
|
| 66 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 67 |
# Environment Dependency Changes (relative to Base Env)
|
| 68 |
|
| 69 |
## Java/Maven Dependencies
|
|
|
|
| 53 |
|
| 54 |
### Testing Approach
|
| 55 |
|
| 56 |
+
The Mustache templates and pom.xml configuration are indirectly verified through the code generation test.
|
|
|
|
|
|
|
|
|
|
| 57 |
|
| 58 |
**Note**: Direct unit tests for Mustache template syntax or pom.xml structure are not provided. Validation is performed through:
|
| 59 |
1. Successful Maven build (pom.xml correctness)
|
|
|
|
| 61 |
|
| 62 |
---
|
| 63 |
|
| 64 |
+
## Repository-wide Formatting Contract
|
| 65 |
+
|
| 66 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 67 |
+
|
| 68 |
+
---
|
| 69 |
+
|
| 70 |
# Environment Dependency Changes (relative to Base Env)
|
| 71 |
|
| 72 |
## Java/Maven Dependencies
|
|
@@ -67,6 +67,7 @@ This specification defines the requirements for implementing core reactive abstr
|
|
| 67 |
- When `onError` is called, the error is forwarded to the downstream observer
|
| 68 |
- When `onComplete` is called, the completion signal is forwarded to the downstream observer
|
| 69 |
- When `cancel` is called, the upstream subscription is cancelled
|
|
|
|
| 70 |
|
| 71 |
### FR3: Client-Side Publisher for Streaming Responses
|
| 72 |
|
|
@@ -133,26 +134,9 @@ This specification defines the requirements for implementing core reactive abstr
|
|
| 133 |
|
| 134 |
---
|
| 135 |
|
| 136 |
-
##
|
| 137 |
|
| 138 |
-
|
| 139 |
-
|
| 140 |
-
The Publisher/Subscriber classes in this milestone operate at the reactive stream abstraction layer.
|
| 141 |
-
The available test suite (`f2p_tests_list`) contains tests that do not directly exercise these classes:
|
| 142 |
-
|
| 143 |
-
**Available tests (not directly related)**:
|
| 144 |
-
- `RestProtocolTest::bean argument post test` - Tests REST parameter binding
|
| 145 |
-
- `RestProtocolTest::bean argument test` - Tests REST parameter binding
|
| 146 |
-
|
| 147 |
-
These tests verify REST protocol functionality and do not test the Mutiny Publisher/Subscriber abstractions.
|
| 148 |
-
|
| 149 |
-
### Verification Approach
|
| 150 |
-
|
| 151 |
-
The Publisher/Subscriber classes are verified through:
|
| 152 |
-
1. **Integration Testing** (M003.3): The downstream milestone M003.3 contains tests (`MutinyServerCallsTest`, `MutinyClientCallsTest`) that exercise these abstractions through the `MutinyClientCalls` and `MutinyServerCalls` utilities.
|
| 153 |
-
2. **Build Verification**: Successful compilation confirms API contract correctness.
|
| 154 |
-
|
| 155 |
-
**Note**: Direct unit tests for Publisher/Subscriber classes are not included in the current test suite. Full verification requires running M003.3 tests which depend on this milestone.
|
| 156 |
|
| 157 |
---
|
| 158 |
|
|
|
|
| 67 |
- When `onError` is called, the error is forwarded to the downstream observer
|
| 68 |
- When `onComplete` is called, the completion signal is forwarded to the downstream observer
|
| 69 |
- When `cancel` is called, the upstream subscription is cancelled
|
| 70 |
+
- The cancellation-state accessor is spelled `isCancelled()` (public, no-argument, boolean; double-'l') — deliberately differing from the Reactor subscriber's `isCanceled()` (single 'l')
|
| 71 |
|
| 72 |
### FR3: Client-Side Publisher for Streaming Responses
|
| 73 |
|
|
|
|
| 134 |
|
| 135 |
---
|
| 136 |
|
| 137 |
+
## Repository-wide Formatting Contract
|
| 138 |
|
| 139 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 140 |
|
| 141 |
---
|
| 142 |
|
|
@@ -171,6 +171,12 @@ This milestone implements comprehensive Mutiny reactive streaming support for Ap
|
|
| 171 |
|
| 172 |
---
|
| 173 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 174 |
# Environment Dependency Changes (relative to Base Env)
|
| 175 |
|
| 176 |
No changes detected.
|
|
|
|
| 171 |
|
| 172 |
---
|
| 173 |
|
| 174 |
+
## Repository-wide Formatting Contract
|
| 175 |
+
|
| 176 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 177 |
+
|
| 178 |
+
---
|
| 179 |
+
|
| 180 |
# Environment Dependency Changes (relative to Base Env)
|
| 181 |
|
| 182 |
No changes detected.
|
|
@@ -2,7 +2,7 @@
|
|
| 2 |
|
| 3 |
## Overview
|
| 4 |
|
| 5 |
-
This milestone addresses stream parameter handling in REST argument resolution, establishes Server-Sent Events (SSE) infrastructure, and enhances RadixTree with configurable duplicate value detection.
|
| 6 |
|
| 7 |
|
| 8 |
**Affected Modules**:
|
|
@@ -106,6 +106,12 @@ This milestone addresses stream parameter handling in REST argument resolution,
|
|
| 106 |
|
| 107 |
---
|
| 108 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 109 |
# Environment Dependency Changes (relative to Base Env)
|
| 110 |
|
| 111 |
No changes detected.
|
|
|
|
| 2 |
|
| 3 |
## Overview
|
| 4 |
|
| 5 |
+
This milestone addresses stream parameter handling in REST argument resolution, establishes Server-Sent Events (SSE) infrastructure, and enhances RadixTree with configurable duplicate value detection.
|
| 6 |
|
| 7 |
|
| 8 |
**Affected Modules**:
|
|
|
|
| 106 |
|
| 107 |
---
|
| 108 |
|
| 109 |
+
## Repository-wide Formatting Contract
|
| 110 |
+
|
| 111 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 112 |
+
|
| 113 |
+
---
|
| 114 |
+
|
| 115 |
# Environment Dependency Changes (relative to Base Env)
|
| 116 |
|
| 117 |
No changes detected.
|
|
@@ -174,6 +174,12 @@ affinityAware:
|
|
| 174 |
| affinityAware.ratio | number | No | Fallback threshold percentage (default: 0, range: 0-100) |
|
| 175 |
|
| 176 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 177 |
---
|
| 178 |
|
| 179 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 174 |
| affinityAware.ratio | number | No | Fallback threshold percentage (default: 0, range: 0-100) |
|
| 175 |
|
| 176 |
|
| 177 |
+
---
|
| 178 |
+
|
| 179 |
+
## Repository-wide Formatting Contract
|
| 180 |
+
|
| 181 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 182 |
+
|
| 183 |
---
|
| 184 |
|
| 185 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -105,6 +105,12 @@ This specification defines requirements for implementing configuration-based aff
|
|
| 105 |
- When the router chain is built, the service-level affinity router (order 130) is positioned before the application-level affinity router (order 135)
|
| 106 |
|
| 107 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 108 |
---
|
| 109 |
|
| 110 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 105 |
- When the router chain is built, the service-level affinity router (order 130) is positioned before the application-level affinity router (order 135)
|
| 106 |
|
| 107 |
|
| 108 |
+
---
|
| 109 |
+
|
| 110 |
+
## Repository-wide Formatting Contract
|
| 111 |
+
|
| 112 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 113 |
+
|
| 114 |
---
|
| 115 |
|
| 116 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -87,6 +87,12 @@ only has the request parameter types.
|
|
| 87 |
- The fix must not alter the routing behavior for paths that have only a single registration
|
| 88 |
|
| 89 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 90 |
---
|
| 91 |
|
| 92 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 87 |
- The fix must not alter the routing behavior for paths that have only a single registration
|
| 88 |
|
| 89 |
|
| 90 |
+
---
|
| 91 |
+
|
| 92 |
+
## Repository-wide Formatting Contract
|
| 93 |
+
|
| 94 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 95 |
+
|
| 96 |
---
|
| 97 |
|
| 98 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -70,6 +70,12 @@ to share the counter with other methods.
|
|
| 70 |
- Disabling TPS for a specific method shall only affect that method's counter, not other methods' counters
|
| 71 |
|
| 72 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 73 |
---
|
| 74 |
|
| 75 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 70 |
- Disabling TPS for a specific method shall only affect that method's counter, not other methods' counters
|
| 71 |
|
| 72 |
|
| 73 |
+
---
|
| 74 |
+
|
| 75 |
+
## Repository-wide Formatting Contract
|
| 76 |
+
|
| 77 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 78 |
+
|
| 79 |
---
|
| 80 |
|
| 81 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -87,6 +87,12 @@ This specification defines the requirements for upgrading the Bouncy Castle cryp
|
|
| 87 |
- Individual modules should inherit versions from the BOM without explicit version declarations
|
| 88 |
|
| 89 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 90 |
---
|
| 91 |
|
| 92 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 87 |
- Individual modules should inherit versions from the BOM without explicit version declarations
|
| 88 |
|
| 89 |
|
| 90 |
+
---
|
| 91 |
+
|
| 92 |
+
## Repository-wide Formatting Contract
|
| 93 |
+
|
| 94 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 95 |
+
|
| 96 |
---
|
| 97 |
|
| 98 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -197,6 +197,12 @@ The following test scenarios must pass:
|
|
| 197 |
5. Existing functionality without FQCN specification continues to operate normally
|
| 198 |
|
| 199 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 200 |
---
|
| 201 |
|
| 202 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 197 |
5. Existing functionality without FQCN specification continues to operate normally
|
| 198 |
|
| 199 |
|
| 200 |
+
---
|
| 201 |
+
|
| 202 |
+
## Repository-wide Formatting Contract
|
| 203 |
+
|
| 204 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 205 |
+
|
| 206 |
---
|
| 207 |
|
| 208 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -208,6 +208,12 @@ rapid service startup/shutdown or error conditions.
|
|
| 208 |
- `MetricsEventBus.error(MetricsEvent event)` must check `if (event instanceof TimeCounterEvent)` before casting to `TimeCounterEvent`
|
| 209 |
|
| 210 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 211 |
---
|
| 212 |
|
| 213 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 208 |
- `MetricsEventBus.error(MetricsEvent event)` must check `if (event instanceof TimeCounterEvent)` before casting to `TimeCounterEvent`
|
| 209 |
|
| 210 |
|
| 211 |
+
---
|
| 212 |
+
|
| 213 |
+
## Repository-wide Formatting Contract
|
| 214 |
+
|
| 215 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 216 |
+
|
| 217 |
---
|
| 218 |
|
| 219 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -84,6 +84,12 @@ This specification defines requirements for enhancing Dubbo's environment variab
|
|
| 84 |
- When requesting a property with an empty or null key, null is returned
|
| 85 |
|
| 86 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 87 |
---
|
| 88 |
|
| 89 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 84 |
- When requesting a property with an empty or null key, null is returned
|
| 85 |
|
| 86 |
|
| 87 |
+
---
|
| 88 |
+
|
| 89 |
+
## Repository-wide Formatting Contract
|
| 90 |
+
|
| 91 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 92 |
+
|
| 93 |
---
|
| 94 |
|
| 95 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -33,6 +33,12 @@ This specification defines the requirements for enabling automatic configuration
|
|
| 33 |
- The auto-configured property must be added to the `MapPropertySource` named `"defaultProperties"` (accessible via `propertySources.get("defaultProperties")`), not just to the environment, allowing it to be overridden by user-specified properties with higher precedence
|
| 34 |
|
| 35 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 36 |
---
|
| 37 |
|
| 38 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 33 |
- The auto-configured property must be added to the `MapPropertySource` named `"defaultProperties"` (accessible via `propertySources.get("defaultProperties")`), not just to the environment, allowing it to be overridden by user-specified properties with higher precedence
|
| 34 |
|
| 35 |
|
| 36 |
+
---
|
| 37 |
+
|
| 38 |
+
## Repository-wide Formatting Contract
|
| 39 |
+
|
| 40 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 41 |
+
|
| 42 |
---
|
| 43 |
|
| 44 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -114,6 +114,12 @@ This milestone consolidates third-party dependency version updates across multip
|
|
| 114 |
- All transitive dependency resolutions must complete without errors
|
| 115 |
|
| 116 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 117 |
---
|
| 118 |
|
| 119 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 114 |
- All transitive dependency resolutions must complete without errors
|
| 115 |
|
| 116 |
|
| 117 |
+
---
|
| 118 |
+
|
| 119 |
+
## Repository-wide Formatting Contract
|
| 120 |
+
|
| 121 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 122 |
+
|
| 123 |
---
|
| 124 |
|
| 125 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -178,6 +178,12 @@ This milestone addresses REST protocol bean argument binding issues and various
|
|
| 178 |
|
| 179 |
---
|
| 180 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 181 |
# Environment Dependency Changes (relative to Base Env)
|
| 182 |
|
| 183 |
No changes detected.
|
|
|
|
| 178 |
|
| 179 |
---
|
| 180 |
|
| 181 |
+
## Repository-wide Formatting Contract
|
| 182 |
+
|
| 183 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 184 |
+
|
| 185 |
+
---
|
| 186 |
+
|
| 187 |
# Environment Dependency Changes (relative to Base Env)
|
| 188 |
|
| 189 |
No changes detected.
|
|
@@ -204,6 +204,12 @@ its heartbeat field.
|
|
| 204 |
- In `CertManager.getProviderConnectionConfig()`, call the new overloaded methods passing the `remoteAddress` parameter
|
| 205 |
|
| 206 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 207 |
---
|
| 208 |
|
| 209 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 204 |
- In `CertManager.getProviderConnectionConfig()`, call the new overloaded methods passing the `remoteAddress` parameter
|
| 205 |
|
| 206 |
|
| 207 |
+
---
|
| 208 |
+
|
| 209 |
+
## Repository-wide Formatting Contract
|
| 210 |
+
|
| 211 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 212 |
+
|
| 213 |
---
|
| 214 |
|
| 215 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -84,6 +84,12 @@ The following REST protocol bean argument handling tests verify that the optimiz
|
|
| 84 |
**Note**: FR1, FR2, and FR3 are marked as EXTENDED because the available tests focus on REST protocol bean argument handling, which exercises the code paths indirectly but does not directly validate the specific performance optimizations described above
|
| 85 |
|
| 86 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 87 |
---
|
| 88 |
|
| 89 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 84 |
**Note**: FR1, FR2, and FR3 are marked as EXTENDED because the available tests focus on REST protocol bean argument handling, which exercises the code paths indirectly but does not directly validate the specific performance optimizations described above
|
| 85 |
|
| 86 |
|
| 87 |
+
---
|
| 88 |
+
|
| 89 |
+
## Repository-wide Formatting Contract
|
| 90 |
+
|
| 91 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 92 |
+
|
| 93 |
---
|
| 94 |
|
| 95 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -104,6 +104,12 @@ This milestone consolidates minor feature additions and enhancements to Apache D
|
|
| 104 |
- OS-type detection properties (e.g., os.detected.classifier) are available during the build lifecycle
|
| 105 |
|
| 106 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 107 |
---
|
| 108 |
|
| 109 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 104 |
- OS-type detection properties (e.g., os.detected.classifier) are available during the build lifecycle
|
| 105 |
|
| 106 |
|
| 107 |
+
---
|
| 108 |
+
|
| 109 |
+
## Repository-wide Formatting Contract
|
| 110 |
+
|
| 111 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 112 |
+
|
| 113 |
---
|
| 114 |
|
| 115 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -123,12 +123,18 @@ This milestone addresses test infrastructure dependency management issues across
|
|
| 123 |
- `dubbo-remoting-zookeeper-curator5` does not contain `dubbo-test-common` dependency
|
| 124 |
|
| 125 |
### Test Verification
|
| 126 |
-
- REST protocol tests in `dubbo-rpc/dubbo-rpc-triple` pass
|
| 127 |
- Bean argument tests with POST requests to `/buy` and `/buy2` endpoints
|
| 128 |
- Tests handling both array-style (`[Book]`, `[Book, count]`) and map-style (`{book: Book, count: int}`) request bodies
|
| 129 |
- Response deserialization to `Book` bean with correctly populated `name` attribute
|
| 130 |
|
| 131 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 132 |
---
|
| 133 |
|
| 134 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 123 |
- `dubbo-remoting-zookeeper-curator5` does not contain `dubbo-test-common` dependency
|
| 124 |
|
| 125 |
### Test Verification
|
| 126 |
+
- REST protocol tests in `dubbo-rpc/dubbo-rpc-triple` pass, specifically:
|
| 127 |
- Bean argument tests with POST requests to `/buy` and `/buy2` endpoints
|
| 128 |
- Tests handling both array-style (`[Book]`, `[Book, count]`) and map-style (`{book: Book, count: int}`) request bodies
|
| 129 |
- Response deserialization to `Book` bean with correctly populated `name` attribute
|
| 130 |
|
| 131 |
|
| 132 |
+
---
|
| 133 |
+
|
| 134 |
+
## Repository-wide Formatting Contract
|
| 135 |
+
|
| 136 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 137 |
+
|
| 138 |
---
|
| 139 |
|
| 140 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -66,6 +66,12 @@ These are non-functional changes that improve maintainability, reduce build comp
|
|
| 66 |
- The plugin builds and functions correctly with the corrected version configuration
|
| 67 |
|
| 68 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 69 |
---
|
| 70 |
|
| 71 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 66 |
- The plugin builds and functions correctly with the corrected version configuration
|
| 67 |
|
| 68 |
|
| 69 |
+
---
|
| 70 |
+
|
| 71 |
+
## Repository-wide Formatting Contract
|
| 72 |
+
|
| 73 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 74 |
+
|
| 75 |
---
|
| 76 |
|
| 77 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -83,6 +83,12 @@ may be closed before the data is actually sent.
|
|
| 83 |
- When log statements are executed in TriplePathResolver, the logger name reflects TriplePathResolver, not any other class
|
| 84 |
|
| 85 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 86 |
---
|
| 87 |
|
| 88 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 83 |
- When log statements are executed in TriplePathResolver, the logger name reflects TriplePathResolver, not any other class
|
| 84 |
|
| 85 |
|
| 86 |
+
---
|
| 87 |
+
|
| 88 |
+
## Repository-wide Formatting Contract
|
| 89 |
+
|
| 90 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 91 |
+
|
| 92 |
---
|
| 93 |
|
| 94 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -63,6 +63,12 @@ This milestone addresses configuration handling issues in Apache Dubbo, focusing
|
|
| 63 |
- `ReferenceBeanManager.getBeanNamesByKey()` must return `new CopyOnWriteArrayList<>()` as default when key not found (instead of `Collections.EMPTY_LIST`)
|
| 64 |
|
| 65 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 66 |
---
|
| 67 |
|
| 68 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 63 |
- `ReferenceBeanManager.getBeanNamesByKey()` must return `new CopyOnWriteArrayList<>()` as default when key not found (instead of `Collections.EMPTY_LIST`)
|
| 64 |
|
| 65 |
|
| 66 |
+
---
|
| 67 |
+
|
| 68 |
+
## Repository-wide Formatting Contract
|
| 69 |
+
|
| 70 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 71 |
+
|
| 72 |
---
|
| 73 |
|
| 74 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -177,6 +177,12 @@ Investigation shows dubbo-test-check is declared but unused in many plugin modul
|
|
| 177 |
- No test functionality should be affected by the dependency removal
|
| 178 |
|
| 179 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 180 |
---
|
| 181 |
|
| 182 |
# Environment Dependency Changes (relative to Base Env)
|
|
|
|
| 177 |
- No test functionality should be affected by the dependency removal
|
| 178 |
|
| 179 |
|
| 180 |
+
---
|
| 181 |
+
|
| 182 |
+
## Repository-wide Formatting Contract
|
| 183 |
+
|
| 184 |
+
Before creating the milestone completion tag, format every Java source change retained in the cumulative working tree—including changes from earlier milestones—with the repository's Spotless configuration. Run `mvn -o spotless:apply -Dspotless.check.skip=false` from the repository root, then require `mvn -o spotless:check -Dspotless.check.skip=false` to pass; do not bypass this check.
|
| 185 |
+
|
| 186 |
---
|
| 187 |
|
| 188 |
# Environment Dependency Changes (relative to Base Env)
|
|
@@ -29,13 +29,9 @@
|
|
| 29 |
"dubbo-rpc/dubbo-rpc-triple::org.apache.dubbo.rpc.protocol.tri.rest.support.basic.RestProtocolTest::bean argument test [path: /buy2, body: [book:org.apache.dubbo.rpc.protocol.tri.rest.service.Book@2c8b8de0, count:2], output: Dubbo, #3]"
|
| 30 |
],
|
| 31 |
"invalid_none_to_pass": [
|
| 32 |
-
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkArtifacts",
|
| 33 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboAllDependencies",
|
| 34 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboAllNettyShade",
|
| 35 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboAllShade",
|
| 36 |
-
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboBom",
|
| 37 |
-
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboDependenciesAll",
|
| 38 |
-
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkSpiFiles",
|
| 39 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboTransform"
|
| 40 |
],
|
| 41 |
"invalid_pass_to_pass": [
|
|
|
|
| 29 |
"dubbo-rpc/dubbo-rpc-triple::org.apache.dubbo.rpc.protocol.tri.rest.support.basic.RestProtocolTest::bean argument test [path: /buy2, body: [book:org.apache.dubbo.rpc.protocol.tri.rest.service.Book@2c8b8de0, count:2], output: Dubbo, #3]"
|
| 30 |
],
|
| 31 |
"invalid_none_to_pass": [
|
|
|
|
| 32 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboAllDependencies",
|
| 33 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboAllNettyShade",
|
| 34 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboAllShade",
|
|
|
|
|
|
|
|
|
|
| 35 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboTransform"
|
| 36 |
],
|
| 37 |
"invalid_pass_to_pass": [
|
|
@@ -6,7 +6,8 @@
|
|
| 6 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboAllNettyShade",
|
| 7 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboAllShade",
|
| 8 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboBom",
|
| 9 |
-
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboDependenciesAll"
|
|
|
|
| 10 |
],
|
| 11 |
"invalid_none_to_pass": [
|
| 12 |
"dubbo-rpc/dubbo-rpc-triple::org.apache.dubbo.rpc.protocol.tri.rest.support.basic.RestProtocolTest::bean argument test [path: /buy, body: [org.apache.dubbo.rpc.protocol.tri.rest.service.Book@cbf1997], output: Dubbo, #1]",
|
|
|
|
| 6 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboAllNettyShade",
|
| 7 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboAllShade",
|
| 8 |
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboBom",
|
| 9 |
+
"dubbo-test/dubbo-test-modules::org.apache.dubbo.dependency.FileTest::checkDubboDependenciesAll",
|
| 10 |
+
"dubbo-remoting/dubbo-remoting-netty::org.apache.dubbo.remoting.transport.netty.NettyClientTest::testClientClose"
|
| 11 |
],
|
| 12 |
"invalid_none_to_pass": [
|
| 13 |
"dubbo-rpc/dubbo-rpc-triple::org.apache.dubbo.rpc.protocol.tri.rest.support.basic.RestProtocolTest::bean argument test [path: /buy, body: [org.apache.dubbo.rpc.protocol.tri.rest.service.Book@cbf1997], output: Dubbo, #1]",
|
|
@@ -40,3 +40,46 @@ exclude:
|
|
| 40 |
- "**/target/**"
|
| 41 |
|
| 42 |
main_branch: "3.3"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
- "**/target/**"
|
| 41 |
|
| 42 |
main_branch: "3.3"
|
| 43 |
+
|
| 44 |
+
# Compile the complete Maven test source tree before grading. This activates
|
| 45 |
+
# evaluator.py's END -> START product-base fallback; END tests remain the
|
| 46 |
+
# authoritative test universe in either branch.
|
| 47 |
+
build_command: >-
|
| 48 |
+
mvn test-compile -DskipTests -Pskip-spotless -Dcheckstyle.skip=true
|
| 49 |
+
-Drat.skip=true -Dmaven.javadoc.skip=true -Dlicense.skip=true
|
| 50 |
+
|
| 51 |
+
# START fallback keeps END-owned tests, but the broad discovery pattern
|
| 52 |
+
# `dubbo-demo/**` must not make every demo production source evaluator-owned.
|
| 53 |
+
# Pure tests and the dedicated dubbo-test harness remain authoritative; any
|
| 54 |
+
# END-changed demo src/main fixture must be named explicitly or evaluation
|
| 55 |
+
# fails closed instead of silently constructing a hybrid tree.
|
| 56 |
+
evaluation_fallback_test_graft:
|
| 57 |
+
mode: scoped
|
| 58 |
+
authoritative_patterns:
|
| 59 |
+
- "**/src/test/**"
|
| 60 |
+
- "**/test/**"
|
| 61 |
+
- "**/*Test.java"
|
| 62 |
+
- "**/*Tests.java"
|
| 63 |
+
- "**/*IT.java"
|
| 64 |
+
- "**/*TestCase.java"
|
| 65 |
+
- "**/*Test.groovy"
|
| 66 |
+
- "**/*Spec.groovy"
|
| 67 |
+
- "dubbo-test/**"
|
| 68 |
+
fixture_paths:
|
| 69 |
+
M003.1:
|
| 70 |
+
- "dubbo-demo/dubbo-demo-spring-boot-idl/dubbo-demo-spring-boot-idl-provider/src/main/proto/message.proto"
|
| 71 |
+
fail_closed_unlisted_patterns:
|
| 72 |
+
- "dubbo-demo/**/src/main/**"
|
| 73 |
+
|
| 74 |
+
# Benchmark-owned Maven reactor closure. The evaluator hashes and records this
|
| 75 |
+
# script in evaluation_result.json and fails closed on errors.
|
| 76 |
+
evaluation_post_snapshot_script: "dockerfiles/evaluation_post_snapshot.sh"
|
| 77 |
+
|
| 78 |
+
# M025's legacy image hook replaces the entire dependency BOM with a prepared
|
| 79 |
+
# base copy. That wholesale replacement is not a separable environment delta,
|
| 80 |
+
# so retain the exact agent snapshot for this one manifest. The evaluator
|
| 81 |
+
# validates that the path is an upsert in the hash-bound snapshot and records
|
| 82 |
+
# the exception in evaluation_result.json.
|
| 83 |
+
evaluation_manifest_agent_authoritative:
|
| 84 |
+
M025:
|
| 85 |
+
- "dubbo-dependencies-bom/pom.xml"
|
|
@@ -30,6 +30,20 @@ test_framework: cargo
|
|
| 30 |
base_image_name: nushell_nushell_0.106.0_0.108.0/base:latest
|
| 31 |
build_command: cargo build --profile ci --workspace --exclude nu_plugin_*
|
| 32 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 33 |
# Struct field compatibility fixes
|
| 34 |
# When agent code doesn't have certain fields, but GT test code references them,
|
| 35 |
# we need to remove those references to avoid E0560 compilation errors.
|
|
|
|
| 30 |
base_image_name: nushell_nushell_0.106.0_0.108.0/base:latest
|
| 31 |
build_command: cargo build --profile ci --workspace --exclude nu_plugin_*
|
| 32 |
|
| 33 |
+
# These prepared milestone images rewrite the root Cargo dependency graph in
|
| 34 |
+
# ways that are not a separable environment-only delta. Keep the submitted
|
| 35 |
+
# Cargo manifest and lockfile as one exact dependency state instead of
|
| 36 |
+
# constructing a mixed graph with a line-oriented three-way merge. Entries
|
| 37 |
+
# are conditional: an untouched path is a no-op, and every applied exception
|
| 38 |
+
# is recorded in evaluation_result.json.
|
| 39 |
+
evaluation_manifest_agent_authoritative:
|
| 40 |
+
milestone_core_development.1:
|
| 41 |
+
- "Cargo.toml"
|
| 42 |
+
- "Cargo.lock"
|
| 43 |
+
milestone_G02_a647707:
|
| 44 |
+
- "Cargo.toml"
|
| 45 |
+
- "Cargo.lock"
|
| 46 |
+
|
| 47 |
# Struct field compatibility fixes
|
| 48 |
# When agent code doesn't have certain fields, but GT test code references them,
|
| 49 |
# we need to remove those references to avoid E0560 compilation errors.
|
|
@@ -16,6 +16,17 @@ main_branch: master
|
|
| 16 |
base_image_name: zeromicro_go-zero_v1.6.0_v1.9.3/base:latest
|
| 17 |
build_command: go build -v ./...
|
| 18 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 19 |
# Test framework configuration for test ID normalization
|
| 20 |
# go_test: Enables normalization of random subtest IDs (e.g., stringx.Rand(), stringx.RandId())
|
| 21 |
test_framework: go_test
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 16 |
base_image_name: zeromicro_go-zero_v1.6.0_v1.9.3/base:latest
|
| 17 |
build_command: go build -v ./...
|
| 18 |
|
| 19 |
+
# Preserve the agent's exact Go module graph and evaluate it against the
|
| 20 |
+
# captured offline cache. Compatibility scoring for partial package reports
|
| 21 |
+
# is controlled separately by build_failure_fail_closed.
|
| 22 |
+
evaluation_go_module_closure: true
|
| 23 |
+
evaluation_go_module_dirs:
|
| 24 |
+
- .
|
| 25 |
+
|
| 26 |
# Test framework configuration for test ID normalization
|
| 27 |
# go_test: Enables normalization of random subtest IDs (e.g., stringx.Rand(), stringx.RandId())
|
| 28 |
test_framework: go_test
|
| 29 |
+
|
| 30 |
+
# Evaluator-owned post-snapshot hook (legacy-snapshot go.mod backfill for
|
| 31 |
+
# grafted END tests; no-op for fresh snapshots). See the script header.
|
| 32 |
+
evaluation_post_snapshot_script: "dockerfiles/evaluation_post_snapshot.sh"
|
|
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
# v1.0 incremental patch — feature_enhancements (F-2a follow-up)
|
| 2 |
+
#
|
| 3 |
+
# Pathology: the playwright e2e mode needs the host Docker socket
|
| 4 |
+
# (testcontainers) AND runs a webServer on a hardcoded host port 8080 under
|
| 5 |
+
# --network host. The e2e evaluator historically never mounted the socket
|
| 6 |
+
# (root cause of the ~81x27 poisoned failures), and once it does, the fixed
|
| 7 |
+
# port makes evaluations mutually exclusive per host and dead on any host
|
| 8 |
+
# where 8080 is already taken.
|
| 9 |
+
#
|
| 10 |
+
# Fix: install the eval-time hook (see apply_patches.sh) that makes the
|
| 11 |
+
# webServer command and baseURL honor SWE_MILESTONE_EVAL_PORT, which the
|
| 12 |
+
# evaluator injects per evaluation together with the socket mount. Image
|
| 13 |
+
# testbed trees are untouched; the hook edits only the eval-time working
|
| 14 |
+
# tree, and the port number is not part of tested semantics.
|
| 15 |
+
#
|
| 16 |
+
# Build: docker build -f Dockerfile.v1.0 \
|
| 17 |
+
# -t swe-milestone/element-hq_element-web_v1.11.95_v1.11.97__feature_enhancements:v1.0 .
|
| 18 |
+
# (previous content preserved as :v0.9 before retag)
|
| 19 |
+
FROM swe-milestone/element-hq_element-web_v1.11.95_v1.11.97__feature_enhancements:v0.9
|
| 20 |
+
|
| 21 |
+
COPY apply_patches.sh /usr/local/bin/apply_patches.sh
|
| 22 |
+
RUN chmod +x /usr/local/bin/apply_patches.sh && \
|
| 23 |
+
cd /testbed && \
|
| 24 |
+
grep -q 'npx serve -p 8080 -L ./webapp' playwright.config.ts && \
|
| 25 |
+
echo "VERIFY OK: hook installed; config still pristine in image"
|
| 26 |
+
|
| 27 |
+
# The shipped image carries only chromium, but classification scored
|
| 28 |
+
# [Firefox]/[WebKit] entries — the classification environment had all three
|
| 29 |
+
# browsers. Install the missing two so evaluation can reproduce the oracle
|
| 30 |
+
# environment (fast-failing launches were being scored as test failures).
|
| 31 |
+
RUN cd /testbed && npx playwright install --with-deps firefox webkit && \
|
| 32 |
+
ls /root/.cache/ms-playwright/ | grep -E "firefox|webkit" && \
|
| 33 |
+
echo "VERIFY OK: firefox+webkit installed"
|
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
#!/bin/bash
|
| 2 |
+
# [ENV-PATCH v1.0] per-eval port isolation for the playwright e2e webServer.
|
| 3 |
+
#
|
| 4 |
+
# The evaluator hook runs this inside /testbed after the snapshot overlay.
|
| 5 |
+
# playwright.config.ts hardcodes `npx serve -p 8080` (CI branch) and defaults
|
| 6 |
+
# baseURL to localhost:8080 — a fixed host port under --network host, so a
|
| 7 |
+
# busy 8080 (or any concurrent eval) deadlocks the webServer wait. Rewrite
|
| 8 |
+
# both spots to honor SWE_MILESTONE_EVAL_PORT (injected per evaluation by the
|
| 9 |
+
# evaluator alongside the docker socket). Guarded + idempotent; no-op when
|
| 10 |
+
# the env var is absent at test time (falls back to 8080); oracle files in
|
| 11 |
+
# the image are untouched — this edits only the eval-time working tree.
|
| 12 |
+
set -u
|
| 13 |
+
cd /testbed 2>/dev/null || exit 0
|
| 14 |
+
f=playwright.config.ts
|
| 15 |
+
[ -f "$f" ] || exit 0
|
| 16 |
+
if grep -q 'npx serve -p 8080 -L ./webapp' "$f"; then
|
| 17 |
+
sed -i 's|npx serve -p 8080 -L ./webapp|npx serve -p ${SWE_MILESTONE_EVAL_PORT:-8080} -L ./webapp|' "$f"
|
| 18 |
+
echo "[apply_patches v1.0] webServer port now honors SWE_MILESTONE_EVAL_PORT"
|
| 19 |
+
fi
|
| 20 |
+
if grep -q 'process.env\["BASE_URL"\] ?? "http://localhost:8080"' "$f"; then
|
| 21 |
+
sed -i 's|process.env\["BASE_URL"\] ?? "http://localhost:8080"|process.env["BASE_URL"] ?? `http://localhost:${process.env.SWE_MILESTONE_EVAL_PORT ?? "8080"}`|' "$f"
|
| 22 |
+
echo "[apply_patches v1.0] baseURL default now honors SWE_MILESTONE_EVAL_PORT"
|
| 23 |
+
fi
|
| 24 |
+
exit 0
|
|
@@ -1,17 +1,24 @@
|
|
| 1 |
[
|
| 2 |
{
|
| 3 |
"name": "default",
|
| 4 |
-
"test_states": [
|
|
|
|
|
|
|
|
|
|
| 5 |
"test_cmd": "yarn test --json --outputFile=/output/{output_file} --testTimeout={timeout}000 --maxWorkers={workers}",
|
| 6 |
"framework": "jest",
|
| 7 |
"description": "Normal unit tests"
|
| 8 |
},
|
| 9 |
{
|
| 10 |
"name": "e2e",
|
| 11 |
-
"test_states": [
|
|
|
|
|
|
|
|
|
|
| 12 |
"test_cmd": "cd /testbed && yarn build && echo '{{}}' > webapp/config.json && CI=true npx playwright test playwright/e2e/right-panel/ --reporter=json --timeout=120000 > /output/{output_file}",
|
| 13 |
"framework": "playwright",
|
| 14 |
"description": "End-to-end tests using Playwright with testcontainers (2min timeout for container setup)",
|
| 15 |
-
"requires_docker_socket": true
|
|
|
|
| 16 |
}
|
| 17 |
-
]
|
|
|
|
| 1 |
[
|
| 2 |
{
|
| 3 |
"name": "default",
|
| 4 |
+
"test_states": [
|
| 5 |
+
"start",
|
| 6 |
+
"end"
|
| 7 |
+
],
|
| 8 |
"test_cmd": "yarn test --json --outputFile=/output/{output_file} --testTimeout={timeout}000 --maxWorkers={workers}",
|
| 9 |
"framework": "jest",
|
| 10 |
"description": "Normal unit tests"
|
| 11 |
},
|
| 12 |
{
|
| 13 |
"name": "e2e",
|
| 14 |
+
"test_states": [
|
| 15 |
+
"start",
|
| 16 |
+
"end"
|
| 17 |
+
],
|
| 18 |
"test_cmd": "cd /testbed && yarn build && echo '{{}}' > webapp/config.json && CI=true npx playwright test playwright/e2e/right-panel/ --reporter=json --timeout=120000 > /output/{output_file}",
|
| 19 |
"framework": "playwright",
|
| 20 |
"description": "End-to-end tests using Playwright with testcontainers (2min timeout for container setup)",
|
| 21 |
+
"requires_docker_socket": true,
|
| 22 |
+
"run_timeout_seconds": 14400
|
| 23 |
}
|
| 24 |
+
]
|
|
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
# v1.0 incremental patch — maintenance_ui_ux (F-2a follow-up)
|
| 2 |
+
#
|
| 3 |
+
# Pathology: the playwright e2e mode needs the host Docker socket
|
| 4 |
+
# (testcontainers) AND runs a webServer on a hardcoded host port 8080 under
|
| 5 |
+
# --network host. The e2e evaluator historically never mounted the socket
|
| 6 |
+
# (root cause of the ~81x27 poisoned failures), and once it does, the fixed
|
| 7 |
+
# port makes evaluations mutually exclusive per host and dead on any host
|
| 8 |
+
# where 8080 is already taken.
|
| 9 |
+
#
|
| 10 |
+
# Fix: install the eval-time hook (see apply_patches.sh) that makes the
|
| 11 |
+
# webServer command and baseURL honor SWE_MILESTONE_EVAL_PORT, which the
|
| 12 |
+
# evaluator injects per evaluation together with the socket mount. Image
|
| 13 |
+
# testbed trees are untouched; the hook edits only the eval-time working
|
| 14 |
+
# tree, and the port number is not part of tested semantics.
|
| 15 |
+
#
|
| 16 |
+
# Build: docker build -f Dockerfile.v1.0 \
|
| 17 |
+
# -t swe-milestone/element-hq_element-web_v1.11.95_v1.11.97__maintenance_ui_ux:v1.0 .
|
| 18 |
+
# (previous content preserved as :v0.9 before retag)
|
| 19 |
+
FROM swe-milestone/element-hq_element-web_v1.11.95_v1.11.97__maintenance_ui_ux:v0.9
|
| 20 |
+
|
| 21 |
+
COPY apply_patches.sh /usr/local/bin/apply_patches.sh
|
| 22 |
+
RUN chmod +x /usr/local/bin/apply_patches.sh && \
|
| 23 |
+
cd /testbed && \
|
| 24 |
+
grep -q 'npx serve -p 8080 -L ./webapp' playwright.config.ts && \
|
| 25 |
+
echo "VERIFY OK: hook installed; config still pristine in image"
|
| 26 |
+
|
| 27 |
+
# The shipped image carries only chromium, but classification scored
|
| 28 |
+
# [Firefox]/[WebKit] entries — the classification environment had all three
|
| 29 |
+
# browsers. Install the missing two so evaluation can reproduce the oracle
|
| 30 |
+
# environment (fast-failing launches were being scored as test failures).
|
| 31 |
+
RUN cd /testbed && npx playwright install --with-deps firefox webkit && \
|
| 32 |
+
ls /root/.cache/ms-playwright/ | grep -E "firefox|webkit" && \
|
| 33 |
+
echo "VERIFY OK: firefox+webkit installed"
|
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
#!/bin/bash
|
| 2 |
+
# [ENV-PATCH v1.0] per-eval port isolation for the playwright e2e webServer.
|
| 3 |
+
#
|
| 4 |
+
# The evaluator hook runs this inside /testbed after the snapshot overlay.
|
| 5 |
+
# playwright.config.ts hardcodes `npx serve -p 8080` (CI branch) and defaults
|
| 6 |
+
# baseURL to localhost:8080 — a fixed host port under --network host, so a
|
| 7 |
+
# busy 8080 (or any concurrent eval) deadlocks the webServer wait. Rewrite
|
| 8 |
+
# both spots to honor SWE_MILESTONE_EVAL_PORT (injected per evaluation by the
|
| 9 |
+
# evaluator alongside the docker socket). Guarded + idempotent; no-op when
|
| 10 |
+
# the env var is absent at test time (falls back to 8080); oracle files in
|
| 11 |
+
# the image are untouched — this edits only the eval-time working tree.
|
| 12 |
+
set -u
|
| 13 |
+
cd /testbed 2>/dev/null || exit 0
|
| 14 |
+
f=playwright.config.ts
|
| 15 |
+
[ -f "$f" ] || exit 0
|
| 16 |
+
if grep -q 'npx serve -p 8080 -L ./webapp' "$f"; then
|
| 17 |
+
sed -i 's|npx serve -p 8080 -L ./webapp|npx serve -p ${SWE_MILESTONE_EVAL_PORT:-8080} -L ./webapp|' "$f"
|
| 18 |
+
echo "[apply_patches v1.0] webServer port now honors SWE_MILESTONE_EVAL_PORT"
|
| 19 |
+
fi
|
| 20 |
+
if grep -q 'process.env\["BASE_URL"\] ?? "http://localhost:8080"' "$f"; then
|
| 21 |
+
sed -i 's|process.env\["BASE_URL"\] ?? "http://localhost:8080"|process.env["BASE_URL"] ?? `http://localhost:${process.env.SWE_MILESTONE_EVAL_PORT ?? "8080"}`|' "$f"
|
| 22 |
+
echo "[apply_patches v1.0] baseURL default now honors SWE_MILESTONE_EVAL_PORT"
|
| 23 |
+
fi
|
| 24 |
+
exit 0
|
|
@@ -1,17 +1,24 @@
|
|
| 1 |
[
|
| 2 |
{
|
| 3 |
"name": "default",
|
| 4 |
-
"test_states": [
|
|
|
|
|
|
|
|
|
|
| 5 |
"test_cmd": "yarn test --json --outputFile=/output/{output_file} --testTimeout={timeout}000 --maxWorkers={workers}",
|
| 6 |
"framework": "jest",
|
| 7 |
"description": "Normal unit tests"
|
| 8 |
},
|
| 9 |
{
|
| 10 |
"name": "e2e",
|
| 11 |
-
"test_states": [
|
|
|
|
|
|
|
|
|
|
| 12 |
"test_cmd": "cd /testbed && yarn build && echo '{{}}' > webapp/config.json && CI=true npx playwright test playwright/e2e/right-panel/ --reporter=json --timeout=120000 > /output/{output_file}",
|
| 13 |
"framework": "playwright",
|
| 14 |
"description": "End-to-end tests using Playwright with testcontainers (2min timeout for container setup)",
|
| 15 |
-
"requires_docker_socket": true
|
|
|
|
| 16 |
}
|
| 17 |
-
]
|
|
|
|
| 1 |
[
|
| 2 |
{
|
| 3 |
"name": "default",
|
| 4 |
+
"test_states": [
|
| 5 |
+
"start",
|
| 6 |
+
"end"
|
| 7 |
+
],
|
| 8 |
"test_cmd": "yarn test --json --outputFile=/output/{output_file} --testTimeout={timeout}000 --maxWorkers={workers}",
|
| 9 |
"framework": "jest",
|
| 10 |
"description": "Normal unit tests"
|
| 11 |
},
|
| 12 |
{
|
| 13 |
"name": "e2e",
|
| 14 |
+
"test_states": [
|
| 15 |
+
"start",
|
| 16 |
+
"end"
|
| 17 |
+
],
|
| 18 |
"test_cmd": "cd /testbed && yarn build && echo '{{}}' > webapp/config.json && CI=true npx playwright test playwright/e2e/right-panel/ --reporter=json --timeout=120000 > /output/{output_file}",
|
| 19 |
"framework": "playwright",
|
| 20 |
"description": "End-to-end tests using Playwright with testcontainers (2min timeout for container setup)",
|
| 21 |
+
"requires_docker_socket": true,
|
| 22 |
+
"run_timeout_seconds": 14400
|
| 23 |
}
|
| 24 |
+
]
|
|
@@ -1,53 +1,43 @@
|
|
| 1 |
-
#
|
| 2 |
-
FROM element-hq_element-web_v1.11.95_v1.11.97/base:latest
|
| 3 |
|
| 4 |
-
#
|
| 5 |
-
#
|
| 6 |
-
|
| 7 |
-
|
| 8 |
-
|
| 9 |
-
|
| 10 |
-
|
|
|
|
| 11 |
|
| 12 |
-
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
RUN mv /testbed/node_modules /tmp/node_modules_backup && \
|
| 16 |
-
cp -r /testbed/test /tmp/test_backup
|
| 17 |
-
RUN rm -rf /testbed
|
| 18 |
-
COPY . /testbed/
|
| 19 |
-
RUN mv /tmp/node_modules_backup /testbed/node_modules
|
| 20 |
|
| 21 |
-
#
|
| 22 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 23 |
|
| 24 |
-
#
|
| 25 |
-
#
|
| 26 |
-
|
|
|
|
|
|
|
|
|
|
| 27 |
|
| 28 |
-
#
|
| 29 |
-
#
|
| 30 |
-
|
| 31 |
-
|
| 32 |
-
cp -r /tmp/test_backup/setup/* /testbed/test/setup/ 2>/dev/null || true && \
|
| 33 |
-
cp /tmp/test_backup/setupTests.ts /testbed/test/ 2>/dev/null || true && \
|
| 34 |
-
cp /tmp/test_backup/globalSetup.ts /testbed/test/ 2>/dev/null || true && \
|
| 35 |
-
cp /tmp/test_backup/unit-tests/TestSdkContext.ts /testbed/test/unit-tests/ 2>/dev/null || true && \
|
| 36 |
-
cp /tmp/test_backup/@types/* /testbed/test/@types/ 2>/dev/null || true && \
|
| 37 |
-
mkdir -p /testbed/test/unit-tests/stores/room-list-v3/skip-list && \
|
| 38 |
-
cp -r /tmp/test_backup/unit-tests/stores/room-list-v3/skip-list/* /testbed/test/unit-tests/stores/room-list-v3/skip-list/ 2>/dev/null || true
|
| 39 |
-
|
| 40 |
-
# Set default git state to START
|
| 41 |
-
RUN cd /testbed && git checkout -f milestone-milestone_seed_599112e_1-start
|
| 42 |
-
|
| 43 |
-
# Re-apply test infrastructure from base image backup for start state
|
| 44 |
-
RUN mkdir -p /testbed/test/test-utils /testbed/test/setup /testbed/test/unit-tests /testbed/test/@types && \
|
| 45 |
-
cp -r /tmp/test_backup/test-utils/* /testbed/test/test-utils/ 2>/dev/null || true && \
|
| 46 |
-
cp -r /tmp/test_backup/setup/* /testbed/test/setup/ 2>/dev/null || true && \
|
| 47 |
-
cp /tmp/test_backup/setupTests.ts /testbed/test/ 2>/dev/null || true && \
|
| 48 |
-
cp /tmp/test_backup/globalSetup.ts /testbed/test/ 2>/dev/null || true && \
|
| 49 |
-
cp /tmp/test_backup/unit-tests/TestSdkContext.ts /testbed/test/unit-tests/ 2>/dev/null || true && \
|
| 50 |
-
cp /tmp/test_backup/@types/* /testbed/test/@types/ 2>/dev/null || true && \
|
| 51 |
-
mkdir -p /testbed/test/unit-tests/stores/room-list-v3/skip-list && \
|
| 52 |
-
cp -r /tmp/test_backup/unit-tests/stores/room-list-v3/skip-list/* /testbed/test/unit-tests/stores/room-list-v3/skip-list/ 2>/dev/null || true && \
|
| 53 |
-
rm -rf /tmp/test_backup
|
|
|
|
| 1 |
+
# syntax=docker/dockerfile:1.4
|
|
|
|
| 2 |
|
| 3 |
+
# Formal v1.0 repair overlay for milestone_seed_599112e_1.
|
| 4 |
+
#
|
| 5 |
+
# v0.93 is the frozen pre-release parent: it already contains Chromium,
|
| 6 |
+
# serve@14.2.5, and an ignored /testbed/config.json for Playwright web-server
|
| 7 |
+
# readiness. The repository-wide base-offline image owns the union Yarn cache.
|
| 8 |
+
ARG SOURCE_IMAGE=swe-milestone/element-hq_element-web_v1.11.95_v1.11.97__milestone_seed_599112e_1:v0.93
|
| 9 |
+
ARG CLOSURE_IMAGE=swe-milestone/element-hq_element-web_v1.11.95_v1.11.97__base-offline:v1.0
|
| 10 |
+
ARG BROWSER_IMAGE=evoclaw-immutable/milestone-parent:sha256-6c1d8b4cbcf21f26b762d7037605b3a478d6df3d6f5aa889037682b18328c0dc
|
| 11 |
|
| 12 |
+
FROM ${CLOSURE_IMAGE} AS closure
|
| 13 |
+
FROM ${BROWSER_IMAGE} AS browsers
|
| 14 |
+
FROM ${SOURCE_IMAGE}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 15 |
|
| 16 |
+
# END declares @element-hq/element-web-playwright-common@^1.1.5, but the
|
| 17 |
+
# original milestone image retained START's node_modules and therefore could
|
| 18 |
+
# not collect any Playwright suites. Materialize END's frozen lockfile from the
|
| 19 |
+
# sealed union cache, validate collection, then return the released image to
|
| 20 |
+
# the START tag expected by both the agent runner and baseline runner.
|
| 21 |
+
RUN --mount=type=bind,from=closure,source=/usr/local/share/.cache/yarn/v6,target=/usr/local/share/.cache/yarn/v6,readonly \
|
| 22 |
+
cd /testbed && \
|
| 23 |
+
git checkout -q -f milestone-milestone_seed_599112e_1-end && \
|
| 24 |
+
yarn install --offline --frozen-lockfile && \
|
| 25 |
+
node -e "const p=require('@element-hq/element-web-playwright-common/package.json'); if(p.version!=='1.1.5') process.exit(1)" && \
|
| 26 |
+
env -u CI npx playwright test --list --project=Chrome > /tmp/playwright-list.txt && \
|
| 27 |
+
grep -Eq '^Total: [1-9][0-9]* tests in [1-9][0-9]* files$' /tmp/playwright-list.txt && \
|
| 28 |
+
git checkout -q -f milestone-milestone_seed_599112e_1-start && \
|
| 29 |
+
test -s /testbed/config.json && \
|
| 30 |
+
command -v serve >/dev/null && \
|
| 31 |
+
rm -f /tmp/playwright-list.txt
|
| 32 |
|
| 33 |
+
# END's frozen lockfile resolves Playwright 1.51.1 / Chromium revision 1161,
|
| 34 |
+
# while the original milestone image only carried revision 1155. Reuse the
|
| 35 |
+
# already-validated browser payload from an immutable image in this same repo
|
| 36 |
+
# release line; no browser download is performed during this build.
|
| 37 |
+
COPY --from=browsers /root/.cache/ms-playwright/chromium-1161 /root/.cache/ms-playwright/chromium-1161
|
| 38 |
+
RUN test -x /root/.cache/ms-playwright/chromium-1161/chrome-linux/chrome
|
| 39 |
|
| 40 |
+
# Evaluator and baseline runs use host networking for testcontainers. Patch the
|
| 41 |
+
# upstream fixed port 8080 to the unique per-run port supplied by the harness.
|
| 42 |
+
COPY apply_patches.sh /usr/local/bin/apply_patches.sh
|
| 43 |
+
RUN chmod 0755 /usr/local/bin/apply_patches.sh
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
#!/bin/bash
|
| 2 |
+
# [ENV-PATCH v1.0] Per-run port isolation for the Playwright web server.
|
| 3 |
+
#
|
| 4 |
+
# Both the evaluator and the milestone baseline runner execute this hook after
|
| 5 |
+
# switching Git state. It changes environment wiring only; no oracle/test files
|
| 6 |
+
# are modified. The rewrite is guarded and idempotent.
|
| 7 |
+
set -u
|
| 8 |
+
cd /testbed 2>/dev/null || exit 0
|
| 9 |
+
f=playwright.config.ts
|
| 10 |
+
[ -f "$f" ] || exit 0
|
| 11 |
+
if grep -q 'npx serve -p 8080 -L ./webapp' "$f"; then
|
| 12 |
+
sed -i 's|npx serve -p 8080 -L ./webapp|npx serve -p ${SWE_MILESTONE_EVAL_PORT:-8080} -L ./webapp|' "$f"
|
| 13 |
+
echo "[apply_patches v1.0] webServer port now honors SWE_MILESTONE_EVAL_PORT"
|
| 14 |
+
fi
|
| 15 |
+
if grep -q 'process.env\["BASE_URL"\] ?? "http://localhost:8080"' "$f"; then
|
| 16 |
+
sed -i 's|process.env\["BASE_URL"\] ?? "http://localhost:8080"|process.env["BASE_URL"] ?? `http://localhost:${process.env.SWE_MILESTONE_EVAL_PORT ?? "8080"}`|' "$f"
|
| 17 |
+
echo "[apply_patches v1.0] baseURL default now honors SWE_MILESTONE_EVAL_PORT"
|
| 18 |
+
fi
|
| 19 |
+
exit 0
|