Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump org.apache.solr:solr-solrj from 9.7.0 to 9.8.0 #1452

Merged
merged 4 commits into from
Feb 3, 2025
Merged

Bump org.apache.solr:solr-solrj from 9.7.0 to 9.8.0 #1452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bded986
Bump org.apache.solr:solr-solrj from 9.7.0 to 9.8.0
dependabot[bot] Jan 27, 2025
5bf720c
update docker image tag, script, readme
mvolikas Feb 2, 2025
f42c428
fix storm version in readme
mvolikas Feb 2, 2025
8d69403
merge main
mvolikas Feb 2, 2025
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
8 changes: 4 additions & 4 deletions THIRD-PARTY.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ List of third-party dependencies grouped by their license type.
* Apache POI (org.apache.poi:poi-scratchpad:5.3.0 - https://poi.apache.org/)
* Apache POI - API based on OPC and OOXML schemas (org.apache.poi:poi-ooxml:5.3.0 - https://poi.apache.org/)
* Apache POI - Common (org.apache.poi:poi:5.3.0 - https://poi.apache.org/)
* Apache Solr (module: api) (org.apache.solr:solr-api:9.7.0 - https://solr.apache.org/)
* Apache Solr (module: solrj) (org.apache.solr:solr-solrj:9.7.0 - https://solr.apache.org/)
* Apache Solr (module: solrj-streaming) (org.apache.solr:solr-solrj-streaming:9.7.0 - https://solr.apache.org/)
* Apache Solr (module: solrj-zookeeper) (org.apache.solr:solr-solrj-zookeeper:9.7.0 - https://solr.apache.org/)
* Apache Solr (module: api) (org.apache.solr:solr-api:9.8.0 - https://solr.apache.org/)
* Apache Solr (module: solrj) (org.apache.solr:solr-solrj:9.8.0 - https://solr.apache.org/)
* Apache Solr (module: solrj-streaming) (org.apache.solr:solr-solrj-streaming:9.8.0 - https://solr.apache.org/)
* Apache Solr (module: solrj-zookeeper) (org.apache.solr:solr-solrj-zookeeper:9.8.0 - https://solr.apache.org/)
* Apache Tika Apple parser module (org.apache.tika:tika-parser-apple-module:3.0.0 - https://tika.apache.org/tika-parser-apple-module/)
* Apache Tika audiovideo parser module (org.apache.tika:tika-parser-audiovideo-module:3.0.0 - https://tika.apache.org/tika-parser-audiovideo-module/)
* Apache Tika cad parser module (org.apache.tika:tika-parser-cad-module:3.0.0 - https://tika.apache.org/tika-parser-cad-module/)
Expand Down
2 changes: 1 addition & 1 deletion external/solr/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You'll be asked to enter a groupId (e.g. com.mycompany.crawler), an artefactId (

This will not only create a fully formed project containing a POM with the dependency above but also a set of resources, configuration files and sample topology classes. Enter the directory you just created (should be the same as the artefactId you specified earlier) and follow the instructions on the README file.

You will of course need to have both Apache Storm (2.8.0) and Apache Solr (9.7.0) installed.
You will of course need to have both Apache Storm (2.8.0) and Apache Solr (9.8.0) installed.

Official references:
* [Apache Storm: Setting Up a Development Environment](https://storm.apache.org/releases/current/Setting-up-development-environment.html)
Expand Down
2 changes: 1 addition & 1 deletion external/solr/archetype/src/main/resources/archetype-resources/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This has been generated by the StormCrawler Maven Archetype as a starting point for building your own crawler with [Apache Solr](https://solr.apache.org/) as a backend.
Have a look at the code and resources and modify them to your heart's content.

You need to have Apache Storm (2.8.0) installed, as well as a running instance of Apache Solr (9.7.0).
You need to have Apache Storm (2.8.0) installed, as well as a running instance of Apache Solr (9.8.0).

## Generated resources

Expand Down
4 changes: 2 additions & 2 deletions external/solr/archetype/src/main/resources/archetype-resources/setup-solr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ if [ -z "$ROUTER_FIELD" ]; then
fi

SOLR_PORT=8983
SOLR_HOME=/opt/solr-9.7.0
SOLR_HOME=/opt/solr-9.8.0

$SOLR_HOME/bin/solr start -cloud -p $SOLR_PORT
$SOLR_HOME/bin/solr start -c -p $SOLR_PORT

echo -e "\n\e[1mUploading configsets ...\e[0m\n"

Expand Down
2 changes: 1 addition & 1 deletion external/solr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<description>Solr resources for StormCrawler</description>

<properties>
<solr.version>9.7.0</solr.version>
<solr.version>9.8.0</solr.version>
</properties>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions external/solr/src/test/java/org/apache/stormcrawler/solr/persistence/SolrContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public abstract class SolrContainerTest {

protected static ExecutorService executorService;

private final DockerImageName image = DockerImageName.parse("solr:9.7.0");
private final DockerImageName image = DockerImageName.parse("solr:9.8.0");
private static final String configsetsPath = new File("configsets").getAbsolutePath();

@Rule
Expand All @@ -45,7 +45,7 @@ public abstract class SolrContainerTest {
.withCopyFileToContainer(
MountableFile.forHostPath(configsetsPath),
"/opt/solr/server/solr/configsets")
.withCommand("solr-foreground -cloud")
.withCommand("solr-foreground -c")
.waitingFor(Wait.forHttp("/solr/admin/cores?action=STATUS").forStatusCode(200));

@BeforeClass
Expand Down Expand Up @@ -86,7 +86,7 @@ protected Container.ExecResult createCollection(String collectionName, int shard
collectionName,
"-n",
collectionName,
"-s",
"-sh",
Copy link
Contributor

Choose a reason for hiding this comment

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

Solr 9.8 introduced this change that broke the tests. 9.8 shard param vs 9.7 shard param.

String.valueOf(shards),
"-rf",
"1");
Expand Down