Skip to content

Commit f66fb33

Browse files
authored
BXC-4701 - Update clients/tests to solr 9 (#1791) (#1795)
* 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
1 parent 7cbc3f6 commit f66fb33

File tree

23 files changed

+363
-471
lines changed

23 files changed

+363
-471
lines changed

.github/workflows/build.yml

+11
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,17 @@ jobs:
4747
run: |
4848
docker run -d --rm -p 43030:3030 atomgraph/fuseki --mem /test
4949
50+
- name: Make directory for solr config
51+
run: mkdir -p /tmp/solr-config
52+
53+
# Need to copy the config is outside of the source path, otherwise it produces permission conflicts
54+
- name: Copy Solr Config into container
55+
run: sudo cp -r ${{ github.workspace }}/etc/solr-config/* /tmp/solr-config/
56+
57+
- name: Run solr container as command to trigger core creation
58+
run: |
59+
docker run -v /tmp/solr-config:/solr_config -d --rm -p 48983:8983 solr:9 solr-precreate access /solr_config/access
60+
5061
- name: Checkout submodules
5162
run: git submodule update --init --recursive
5263

docker-compose.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,14 @@ services:
2121
image: atomgraph/fuseki
2222
ports:
2323
- "43030:3030"
24-
command: --mem /test
24+
command: --mem /test
25+
solr:
26+
image: solr:9
27+
ports:
28+
- "48983:8983"
29+
volumes:
30+
- ./etc/solr-config:/solr_config/config
31+
command:
32+
- solr-precreate
33+
- access
34+
- /solr_config/config

0 commit comments

Comments
 (0)