Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 11 additions & 37 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,8 @@ SPDX-License-Identifier: MIT
<okhttp.version>5.3.2</okhttp.version>
<greenmail.version>2.1.7</greenmail.version>
<spring.boot.version>${project.parent.version}</spring.boot.version>
<!-- solr and jetty versions may need to match to prevent errors such as
Caused by: java.lang.NoClassDefFoundError: org/eclipse/jetty/client/util/InputStreamResponseListener
because Solr uses http libraries from the Jetty project
-->
<jetty.version>10.0.26</jetty.version>
<solr.version>9.10.0</solr.version>
<!-- Solr 10 snapshots have not been published since 2025-10-15, 11.0.0-SNAPSHOT are current-->
<solr.version>10.0.0-SNAPSHOT</solr.version>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currently this fails (at runtime) because:

[WARNING] The POM for org.apache.solr:solr-solrj:jar:10.0.0-20251015.145323-1526 is invalid,
transitive dependencies (if any) will not be available: 3 problems were encountered while building the effective model for org.apache.solr:solr-solrj:10.0.0-SNAPSHOT
[ERROR] 'dependencies.dependency.version' for com.fasterxml.jackson.core:jackson-databind:jar is missing. @
[ERROR] 'dependencies.dependency.version' for com.fasterxml.jackson.core:jackson-annotations:jar is missing. @
[ERROR] 'dependencies.dependency.version' for com.fasterxml.jackson.core:jackson-core:jar is missing. @

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1526 has the same problem

[WARNING] The POM for org.apache.solr:solr-solrj:jar:11.0.0-20251126.070616-55 is invalid, transitive dependencies (if any) will not be available: 3 problems were encountered while building the effective model for org.apache.solr:solr-solrj:11.0.0-SNAPSHOT
[ERROR] 'dependencies.dependency.version' for com.fasterxml.jackson.core:jackson-databind:jar is missing. @
[ERROR] 'dependencies.dependency.version' for com.fasterxml.jackson.core:jackson-annotations:jar is missing. @
[ERROR] 'dependencies.dependency.version' for com.fasterxml.jackson.core:jackson-core:jar is missing. @

<!--
Spring Boot version overrides.

Expand All @@ -129,6 +125,7 @@ SPDX-License-Identifier: MIT
<flyway.version>11.17.1</flyway.version>
<!-- <hamcrest.version>3.0</hamcrest.version>-->
<hibernate.version>6.6.37.Final</hibernate.version>
<!-- <jackson-bom.version>2.20.1</jackson-bom.version>-->
<json-path.version>2.10.0</json-path.version>
<junit-jupiter.version>6.0.1</junit-jupiter.version>
<logback.version>1.5.19</logback.version>
Expand Down Expand Up @@ -183,15 +180,6 @@ SPDX-License-Identifier: MIT
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<!-- override the jetty-ee10-bom import so we can downgrade jetty to a solrj compatible version,
our spring-boot parent provides this import -->
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-bom</artifactId>
<version>12.0.30</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-bom</artifactId>
Expand Down Expand Up @@ -308,28 +296,6 @@ SPDX-License-Identifier: MIT
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${solr.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj-zookeeper</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj-streaming</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
Expand Down Expand Up @@ -645,6 +611,14 @@ SPDX-License-Identifier: MIT
<name>Releases hosted by OSGeo</name>
<url>https://repo.osgeo.org/repository/release/</url>
</repository>
<repository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>Apache Snapshots</id>
<name>Apache Snapshot Repository</name>
<url>https://repository.apache.org/snapshots/</url>
</repository>
</repositories>
<pluginRepositories />
<build>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/tailormap/api/solr/SolrHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrResponse;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;
import org.apache.solr.client.solrj.impl.RemoteExecutionException;
import org.apache.solr.client.solrj.request.schema.FieldTypeDefinition;
import org.apache.solr.client.solrj.request.schema.SchemaRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
Expand Down Expand Up @@ -527,7 +527,7 @@
SchemaResponse.FieldResponse isField = fieldCheck.process(solrClient);
logger.debug("Field {} exists", isField.getField());
return true;
} catch (SolrServerException | BaseHttpSolrClient.RemoteSolrException e) {
} catch (SolrServerException | RemoteExecutionException e) {

Check warning on line 530 in src/main/java/org/tailormap/api/solr/SolrHelper.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/org/tailormap/api/solr/SolrHelper.java#L530

Added line #L530 was not covered by tests
logger.debug("Field {} does not exist or could not be retrieved. Assuming it does not exist.", fieldName);
} catch (IOException e) {
logger.error("Tried getting field: {}, but failed.", fieldName, e);
Expand Down Expand Up @@ -574,7 +574,7 @@
SchemaResponse.FieldTypeResponse isFieldType = fieldTypeCheck.process(solrClient);
logger.debug("Field type {} exists", isFieldType.getFieldType());
return;
} catch (SolrServerException | BaseHttpSolrClient.RemoteSolrException e) {
} catch (SolrServerException | RemoteExecutionException e) {

Check warning on line 577 in src/main/java/org/tailormap/api/solr/SolrHelper.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/org/tailormap/api/solr/SolrHelper.java#L577

Added line #L577 was not covered by tests
logger.debug(
"Field type {} does not exist or could not be retrieved. Assuming it does not exist.",
SOLR_SPATIAL_FIELDNAME);
Expand Down
Loading