adityamparikh commented on PR #23: URL: https://github.com/apache/solr-mcp/pull/23#issuecomment-5341810384
Rebased onto `main` (`a84033b`) and now **green: 372 tests, 0 failures, 7 skipped** on Spring Boot 4.1.0 + Spring AI 2.0.0 GA. **I have not force-pushed this PR's branch.** Its head is `adityamparikh:sb4`, which is the long-lived integration branch — 9 local branches track it (`chore/bump-*-sb4`, `feat/enable-virtual-threads-sb4`, `sb4-extras`, …) and rewriting it would strand all of them. The rebased result is on `adityamparikh:sb4-rebased-20260819` instead; say the word and I'll either retarget this PR's head to it or fast-forward `sb4` deliberately. Four conflicts, all from the Spring AI 2.0 relocation meeting upstream's jspecify work: - `CollectionService`/`SearchService`: took the `org.springframework.ai.mcp.annotation.*` imports **and** kept `org.jspecify.annotations.Nullable` — the merged bodies use `@Nullable` throughout. - `SolrConfig`: dropped the Jackson 2 `ObjectMapper` import (Jackson 3's `tools.jackson.databind` supersedes it) but kept `java.net.URI`, which #176's path-normalisation fix needs. - `build.gradle.kts`: kept **both** Error Prone blocks — upstream's `compileTestJava` NullAway disable and this branch's AOT-sources disable are independent. - `SolrNativeHints`: kept both the SolrJ `EnvUtils` resource patterns and the `DefaultMetaProvider` registrations. **Two things the rebase broke semantically** — both merged cleanly and failed only under javac/JUnit, so they are worth naming: 1. This branch had expanded the wildcard `Assertions.*` static import into an explicit list; upstream then added tests using `assertThrows` (#166) and `assertFalse`, which were not in that list. Compile failure. 2. `SolrNativeHintsTest` (new upstream) asserts the `DefaultMetaProvider` hint under its **pre-2.x** name `org.springaicommunity.mcp.context.DefaultMetaProvider`. Spring AI 2.x relocated it to `org.springframework.ai.mcp.annotation.context`. Because the registration uses `registerTypeIfPresent` — a no-op when the class is absent — the old name passes *vacuously* on 1.x and fails outright here. The assertion now names the class actually on this classpath. Worth flagging to reviewers: that test is weaker than it looks on `main` today. Still parked behind the 1.0 release per the earlier discussion; this is just to keep it merge-ready. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
