chore(merge): resolve conflicts with upstream/main

Merge upstream/main into solrj-10 branch, keeping SolrJ 10 API changes
(HttpJdkSolrClient, ResponseParser package move, getContentTypes) while
adopting upstream cleanups (consolidated parameterized tests,
try-with-resources, removed standalone Solr code, spring-ai 1.1.3).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: adityamparikh <aditya.m.parikh@gmail.com>

Author: adityamparikh

.gitignore

@@ -40,3 +40,6 @@ out/
 .env
 .auth-token
 *.token
+
+### Claude Code worktrees ###
+.worktrees/

README.md

@@ -274,7 +274,7 @@ MCP tools.
 
 ### Quick Setup
 
-1. **Configure Auth0** (see detailed guide: [docs/AUTH0_SETUP.md](docs/AUTH0_SETUP.md))
+1. **Configure Auth0** (see detailed guide: [security-docs/AUTH0_SETUP.md](security-docs/AUTH0_SETUP.md))
     - Create an Auth0 Application (Machine to Machine)
     - Create an Auth0 API with your audience identifier
     - Note your Domain, Client ID, Client Secret, and Audience
@@ -304,7 +304,7 @@ MCP tools.
      http://localhost:8080/mcp
    ```
 
-For complete setup instructions, see [docs/AUTH0_SETUP.md](docs/AUTH0_SETUP.md)
+For complete setup instructions, see [security-docs/AUTH0_SETUP.md](security-docs/AUTH0_SETUP.md)
 
 ## Available MCP tools
 
@@ -378,7 +378,7 @@ The `solr://{collection}/schema` resource supports autocompletion for the `{coll
 
 ## Documentation
 
-- [Auth0 Setup (OAuth2 configuration)](docs/AUTH0_SETUP.md)
+- [Auth0 Setup (OAuth2 configuration)](security-docs/AUTH0_SETUP.md)
 
 ## Contributing
 

build.gradle.kts

@@ -417,6 +417,12 @@ jib {
         environment =
             mapOf(
                 // Disable Spring Boot Docker Compose support when running in container
+                // Docker Compose integration is disabled in the container image.
+                // It is only useful for local development (HTTP profile) where
+                // the host has Docker and a compose.yaml. Inside a container,
+                // Docker Compose cannot start sibling containers without a
+                // Docker socket mount, so it must be turned off.
+                // The application-stdio.properties also disables it for STDIO mode.
                 "SPRING_DOCKER_COMPOSE_ENABLED" to "false",
             )
 

dev-docs/DEVELOPMENT.md

@@ -65,9 +65,12 @@ java -jar build/libs/solr-mcp-1.0.0-SNAPSHOT.jar
 #### HTTP Mode
 
 ```bash
-./gradlew bootRun --args='--spring.profiles.active=http'
+PROFILES=http ./gradlew bootRun
 ```
 
+Spring Boot Docker Compose will automatically start the services declared in `compose.yaml`
+(Solr, ZooKeeper, and optionally LGTM for observability) before the application starts.
+
 The server will start on http://localhost:8080
 
 ### Environment Variables
@@ -131,7 +134,7 @@ The [MCP Inspector](https://github.com/modelcontextprotocol/inspector) provides
 
 ```bash
 # Start the server in HTTP mode
-./gradlew bootRun --args='--spring.profiles.active=http'
+PROFILES=http ./gradlew bootRun
 
 # In another terminal, start MCP Inspector
 npx @modelcontextprotocol/inspector

dev-docs/TROUBLESHOOTING.md

@@ -275,7 +275,7 @@ rm -rf .gradle
 
 1. **Verify server is running in HTTP mode**
    ```bash
-   ./gradlew bootRun --args='--spring.profiles.active=http'
+   PROFILES=http ./gradlew bootRun
    ```
 
 2. **Check port is correct**
@@ -408,7 +408,7 @@ If you're still having issues:
 ./gradlew bootRun 2>&1 | tee server.log
 
 # HTTP mode - Spring Boot logging
-./gradlew bootRun --args='--spring.profiles.active=http'
+PROFILES=http ./gradlew bootRun
 ```
 
 ### Solr Logs

gradle/libs.versions.toml

@@ -1,13 +1,13 @@
 [versions]
 # Build plugins
-spring-boot = "3.5.8"
+spring-boot = "3.5.11"
 spring-dependency-management = "1.1.7"
 errorprone-plugin = "4.2.0"
 jib = "3.4.5"
 spotless = "7.0.2"
 
 # Main dependencies
-spring-ai = "1.1.2"
+spring-ai = "1.1.3"
 solr = "10.0.0"
 commons-csv = "1.10.0"
 jspecify = "1.0.0"

docs/AUTH0_SETUP.md security-docs/AUTH0_SETUP.mddocs/AUTH0_SETUP.md renamed to security-docs/AUTH0_SETUP.md

@@ -287,15 +287,7 @@ OAUTH2_ISSUER_URI=https://your-tenant.auth0.com/
 The application must run in `http` profile to enable OAuth2 security:
 
 ```bash
-# Option 1: Using environment variable
-export PROFILES=http
-./gradlew bootRun
-
-# Option 2: Using Spring Boot argument
-./gradlew bootRun --args='--spring.profiles.active=http'
-
-# Option 3: Using Gradle property
-./gradlew bootRun -Dspring.profiles.active=http
+PROFILES=http ./gradlew bootRun
 ```
 
 ### Application Configuration Details

keycloak.md security-docs/keycloak.mdkeycloak.md renamed to security-docs/keycloak.md

@@ -74,7 +74,7 @@ docker run -d --name keycloak \
 
 # 3. Run Solr MCP Server with security enabled
 export PROFILES=http
-export SECURITY_ENABLED=true
+export HTTP_SECURITY_ENABLED=true
 export OAUTH2_ISSUER_URI=http://localhost:8180/realms/solr-mcp
 ./gradlew bootRun
 ```
@@ -168,7 +168,7 @@ The Solr MCP Server is pre-configured to work with any OAuth2/OIDC provider. Upd
 
 ```properties
 # Security toggle - set to true to enable OAuth2 authentication
-spring.security.enabled=${SECURITY_ENABLED:true}
+http.security.enabled=${HTTP_SECURITY_ENABLED:true}
 
 # Keycloak OAuth2 Configuration
 # Format: https://<keycloak-host>/realms/<realm-name>
@@ -183,7 +183,7 @@ No code changes are required—the existing `McpServerConfiguration` handles JWT
 
 ```bash
 export PROFILES=http
-export SECURITY_ENABLED=true
+export HTTP_SECURITY_ENABLED=true
 export OAUTH2_ISSUER_URI=http://localhost:8180/realms/solr-mcp
 ./gradlew bootRun
 ```
@@ -192,7 +192,7 @@ export OAUTH2_ISSUER_URI=http://localhost:8180/realms/solr-mcp
 
 ```bash
 export PROFILES=http
-export SECURITY_ENABLED=false
+export HTTP_SECURITY_ENABLED=false
 ./gradlew bootRun
 ```
 
@@ -422,7 +422,7 @@ import org.springframework.security.oauth2.server.resource.authentication.JwtAut
 import org.springframework.security.oauth2.server.resource.authentication.JwtGrantedAuthoritiesConverter;
 
 @Bean
-@ConditionalOnProperty(name = "spring.security.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(name = "http.security.enabled", havingValue = "true", matchIfMissing = true)
 public JwtAuthenticationConverter jwtAuthenticationConverter() {
     JwtGrantedAuthoritiesConverter grantedAuthoritiesConverter = new JwtGrantedAuthoritiesConverter();
     // Keycloak stores realm roles in realm_access.roles
@@ -439,7 +439,7 @@ Wire it into the security filter chain:
 
 ```java
 @Bean
-@ConditionalOnProperty(name = "spring.security.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(name = "http.security.enabled", havingValue = "true", matchIfMissing = true)
 SecurityFilterChain securityFilterChain(HttpSecurity http, JwtAuthenticationConverter jwtAuthenticationConverter) throws Exception {
     return http
         .authorizeHttpRequests(auth -> {

src/main/java/org/apache/solr/mcp/server/Main.java

@@ -97,8 +97,6 @@
  * <li>Monitor application logs for connection and performance issues
  * </ul>
  *
- * @version 1.0.0
- * @since 1.0.0
  * @see SearchService
  * @see IndexingService
  * @see CollectionService

src/main/java/org/apache/solr/mcp/server/collection/CollectionService.java

@@ -30,18 +30,14 @@
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
-import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.client.solrj.request.GenericSolrRequest;
 import org.apache.solr.client.solrj.request.LukeRequest;
 import org.apache.solr.client.solrj.request.SolrQuery;
 import org.apache.solr.client.solrj.response.CollectionAdminResponse;
-import org.apache.solr.client.solrj.response.CoreAdminResponse;
 import org.apache.solr.client.solrj.response.LukeResponse;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.response.SolrPingResponse;
-import org.apache.solr.common.params.CoreAdminParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.mcp.server.config.SolrConfigurationProperties;
@@ -67,8 +63,8 @@
  * <strong>Core Capabilities:</strong>
  *
  * <ul>
- * <li><strong>Collection Discovery</strong>: Lists available collections with
- * automatic SolrCloud vs standalone detection
+ * <li><strong>Collection Discovery</strong>: Lists available collections using
+ * the SolrCloud Collections API
  * <li><strong>Performance Monitoring</strong>: Comprehensive metrics collection
  * including index, query, cache, and handler statistics
  * <li><strong>Health Monitoring</strong>: Real-time health checks with
@@ -100,7 +96,6 @@
  *
  * <ul>
  * <li><strong>SolrCloud</strong>: Distributed mode using Collections API
- * <li><strong>Standalone</strong>: Single-node mode using Core Admin API
  * </ul>
  *
  * <p>
@@ -126,8 +121,6 @@
  * SolrHealthStatus health = collectionService.checkHealth("my_collection");
  * }</pre>
  *
- * @version 1.0.0
- * @since 1.0.0
  * @see SolrMetrics
  * @see SolrHealthStatus
  * @see org.apache.solr.client.solrj.SolrClient
@@ -319,23 +312,16 @@ public List<String> completeCollectionForSchema() {
 	}
 
 	/**
-	 * Lists all available Solr collections in the cluster.
+	 * Lists all available Solr collections in the SolrCloud cluster.
 	 *
 	 * <p>
-	 * This method automatically detects the Solr deployment type and uses the
-	 * appropriate API:
-	 *
-	 * <ul>
-	 * <li><strong>SolrCloud</strong>: Uses Collections API to list distributed
-	 * collections
-	 * <li><strong>Standalone</strong>: Uses Core Admin API to list individual
-	 * collections
-	 * </ul>
+	 * This method uses the SolrCloud Collections API to retrieve the list of
+	 * available collections. Standalone Solr instances are not supported.
 	 *
 	 * <p>
-	 * In SolrCloud environments, the returned names may include shard identifiers
-	 * (e.g., "films_shard1_replica_n1"). Use {@link #extractCollectionName(String)}
-	 * to get the base collection name if needed.
+	 * The returned names may include shard identifiers (e.g.,
+	 * "films_shard1_replica_n1"). Use {@link #extractCollectionName(String)} to get
+	 * the base collection name if needed.
 	 *
 	 * <p>
 	 * <strong>Error Handling:</strong>
@@ -356,27 +342,16 @@ public List<String> completeCollectionForSchema() {
 	 * @return a list of collection names, or an empty list if unable to retrieve
 	 *         them
 	 * @see CollectionAdminRequest.List
-	 * @see CoreAdminRequest
 	 */
 	@McpTool(name = "list-collections", description = "List solr collections")
 	public List<String> listCollections() {
 		try {
-			if (solrClient instanceof CloudSolrClient) {
-				// For SolrCloud - use Collections API
-				CollectionAdminRequest.List request = new CollectionAdminRequest.List();
-				CollectionAdminResponse response = request.process(solrClient);
+			CollectionAdminRequest.List request = new CollectionAdminRequest.List();
+			CollectionAdminResponse response = request.process(solrClient);
 
-				@SuppressWarnings("unchecked")
-				List<String> collections = (List<String>) response.getResponse().get(COLLECTIONS_KEY);
-				return collections != null ? collections : new ArrayList<>();
-			} else {
-				// For standalone Solr - use Core Admin API
-				CoreAdminRequest coreAdminRequest = new CoreAdminRequest();
-				coreAdminRequest.setAction(CoreAdminParams.CoreAdminAction.STATUS);
-				CoreAdminResponse coreResponse = coreAdminRequest.process(solrClient);
-
-				return new ArrayList<>(coreResponse.getCoreStatus().keySet());
-			}
+			@SuppressWarnings("unchecked")
+			List<String> collections = (List<String>) response.getResponse().get(COLLECTIONS_KEY);
+			return collections != null ? collections : new ArrayList<>();
 		} catch (SolrServerException | IOException _) {
 			return new ArrayList<>();
 		}
@@ -951,9 +926,8 @@ String extractCollectionName(String collectionOrShard) {
 	 * </ol>
 	 *
 	 * <p>
-	 * This dual approach ensures compatibility with both standalone Solr (which
-	 * returns collection names directly) and SolrCloud (which may return shard
-	 * names).
+	 * This dual approach ensures compatibility with SolrCloud environments where
+	 * shard names may be returned alongside collection names.
 	 *
 	 * <p>
 	 * <strong>Error Handling:</strong>