Skip to content

Commit

Permalink
BXC-4701 - Update clients/tests to solr 9 (#1791) (#1795)
Browse files Browse the repository at this point in the history
* Update to solr 9, and wiremock 3 due to jetty versions. Update some commons usages which were referencing libraries pulled in by old solr versons

* Update solr config, make paths absolute since it is now required, and don't double load config

* Switch over to wiremock-jre8-standalone to avoid jetty version conflicts with solr

* Running solr 9 in docker for the integration tests that ran it in jetty, since it was failing to start. Add solr logging config

* Adjusting ghactions

* Try solr as docker run

* Reenable build

* Explicitly add solr-api as compile scope, otherwise solr-core pulls it in as test. Add commons-codec directly in a lower module, since it was previously being imported via transitive dependencies, but no longer is
  • Loading branch information
bbpennel authored Sep 9, 2024
1 parent 7cbc3f6 commit f66fb33
Show file tree
Hide file tree
Showing 23 changed files with 363 additions and 471 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@ jobs:
run: |
docker run -d --rm -p 43030:3030 atomgraph/fuseki --mem /test
- name: Make directory for solr config
run: mkdir -p /tmp/solr-config

# Need to copy the config is outside of the source path, otherwise it produces permission conflicts
- name: Copy Solr Config into container
run: sudo cp -r ${{ github.workspace }}/etc/solr-config/* /tmp/solr-config/

- name: Run solr container as command to trigger core creation
run: |
docker run -v /tmp/solr-config:/solr_config -d --rm -p 48983:8983 solr:9 solr-precreate access /solr_config/access
- name: Checkout submodules
run: git submodule update --init --recursive

Expand Down
12 changes: 11 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,14 @@ services:
image: atomgraph/fuseki
ports:
- "43030:3030"
command: --mem /test
command: --mem /test
solr:
image: solr:9
ports:
- "48983:8983"
volumes:
- ./etc/solr-config:/solr_config/config
command:
- solr-precreate
- access
- /solr_config/config
Loading

0 comments on commit f66fb33

Please sign in to comment.