solr 9 support + Isolate solr testing (#40)

* Add initial Solr 9 support

* Update docs to reflect Solr 9 support

* Add 9.x tests into GA, update to node 18.

* Isolate solr in testing.

* Add dev dependency of @lando/php for testing purposes.

* Remove dogfooding step.

* Correct path to Leia tests.

* Correct check for custom config loading.

* Update Changelog.

---------

Co-authored-by: Alex Johnston <[email protected]>

.github/workflows/pr-docs-tests.yml

@@ -11,7 +11,7 @@ jobs:
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code

.github/workflows/pr-linter.yml

@@ -11,7 +11,7 @@ jobs:
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code

.github/workflows/pr-solr-tests.yml

@@ -16,14 +16,15 @@ jobs:
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
         leia-test:
           - examples/3.x
           - examples/4.x
           - examples/5.x
           - examples/6.x
           - examples/7.x
           - examples/8.x
+          - examples/9.x
     steps:
 
       - name: Checkout code
@@ -41,12 +42,9 @@ jobs:
         with:
           lando-version: ${{ matrix.lando-version }}
           config: |
-            plugins.@lando/solr=/home/runner/work/solr/solr
+            setup.skipCommonPlugins=true
+            setup.plugins.@lando/solr=/home/runner/work/solr/solr
           telemetry: false
-      - name: Verify Lando works and we are dogfooding this plugin for tests
-        run: |
-          lando version
-          lando config --path plugins | grep solr | grep /home/runner/work/solr/solr || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2
         with:

.github/workflows/pr-unit-tests.yml

@@ -13,7 +13,7 @@ jobs:
           - ubuntu-22.04
           - macos-12
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code

.node-version

@@ -1 +1 @@
-16
+18

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.9.0 - [November 2023](https://github.com/lando/solr/releases/tag/v0.9.0)
+* Added support for Solr 9.x [#40](https://github.com/lando/solr/pull/40)
+* Isolated testing to Solr [#40](https://github.com/lando/solr/pull/40)
+
 ## v0.8.0 - [July 3, 2023](https://github.com/lando/solr/releases/tag/v0.8.0)
   * Removed bundle-dependencies and version-bump-prompt from plugin.
   * Updated package to use prepare-release-action.

docs/index.md

@@ -18,6 +18,8 @@ services:
 
 ## Supported versions
 
+*   [9](https://hub.docker.com/r/_/solr/) **(experimental)**
+*   [9.0](https://hub.docker.com/r/_/solr/) **(experimental)**
 *   [8](https://hub.docker.com/r/_/solr/)
 *   [8.11](https://hub.docker.com/r/_/solr/)
 *   [8.10](https://hub.docker.com/r/_/solr/)

examples/3.x/.lando.yml

@@ -11,4 +11,5 @@ services:
 # This is important because it lets lando know to test against the plugin in this repo
 # DO NOT REMOVE THIS!
 plugins:
-  "@lando/solr": ./../../
+  "@lando/solr": ./../../
+  "@lando/php": ./../../node_modules/@lando/php

examples/4.x/.lando.yml

@@ -16,4 +16,5 @@ tooling:
 # This is important because it lets lando know to test against the plugin in this repo
 # DO NOT REMOVE THIS!
 plugins:
-  "@lando/solr": ./../../
+  "@lando/solr": ./../../
+  "@lando/php": ./../../node_modules/@lando/php

examples/5.x/.lando.yml

@@ -25,4 +25,5 @@ tooling:
 # This is important because it lets lando know to test against the plugin in this repo
 # DO NOT REMOVE THIS!
 plugins:
-  "@lando/solr": ./../../
+  "@lando/solr": ./../../
+  "@lando/php": ./../../node_modules/@lando/php

examples/6.x/.lando.yml

@@ -16,4 +16,5 @@ tooling:
 # This is important because it lets lando know to test against the plugin in this repo
 # DO NOT REMOVE THIS!
 plugins:
-  "@lando/solr": ./../../
+  "@lando/solr": ./../../
+  "@lando/php": ./../../node_modules/@lando/php

examples/7.x/.lando.yml

@@ -22,4 +22,5 @@ tooling:
 # This is important because it lets lando know to test against the plugin in this repo
 # DO NOT REMOVE THIS!
 plugins:
-  "@lando/solr": ./../../
+  "@lando/solr": ./../../
+  "@lando/php": ./../../node_modules/@lando/php

examples/8.x/.lando.yml

@@ -25,4 +25,5 @@ tooling:
 # This is important because it lets lando know to test against the plugin in this repo
 # DO NOT REMOVE THIS!
 plugins:
-  "@lando/solr": ./../../
+  "@lando/solr": ./../../
+  "@lando/php": ./../../node_modules/@lando/php

examples/9.x/.lando.yml

@@ -0,0 +1,29 @@
+name: lando-solr-9
+services:
+  defaults:
+    type: solr:9
+    portforward: true
+    config:
+      dir: '9.x-conf'
+  patch:
+    type: solr:9.0
+    core: solo
+    portforward: true
+    config:
+      dir: '9.x-conf'
+  helper:
+    type: php
+    via: cli
+tooling:
+  post-record-defaults:
+    cmd: "curl http://defaults:8983/solr/lando/update -H 'Content-Type: text/xml' -T '/app/test.xml' -X POST"
+    service: defaults
+  post-record-patch:
+    cmd: "curl http://patch:8983/solr/solo/update -H 'Content-Type: text/xml' -T '/app/test.xml' -X POST"
+    service: patch
+
+# This is important because it lets lando know to test against the plugin in this repo
+# DO NOT REMOVE THIS!
+plugins:
+  "@lando/solr": ./../../
+  "@lando/php": ./../../node_modules/@lando/php

examples/9.x/9.x-conf/lang/contractions_ca.txt

@@ -0,0 +1,8 @@
+# Set of Catalan contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+d
+l
+m
+n
+s
+t

examples/9.x/9.x-conf/lang/contractions_fr.txt

@@ -0,0 +1,15 @@
+# Set of French contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+l
+m
+t
+qu
+n
+s
+j
+d
+c
+jusqu
+quoiqu
+lorsqu
+puisqu

examples/9.x/9.x-conf/lang/contractions_ga.txt

@@ -0,0 +1,5 @@
+# Set of Irish contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+d
+m
+b

examples/9.x/9.x-conf/lang/contractions_it.txt

@@ -0,0 +1,23 @@
+# Set of Italian contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+c
+l 
+all 
+dall 
+dell 
+nell 
+sull 
+coll 
+pell 
+gl 
+agl 
+dagl 
+degl 
+negl 
+sugl 
+un 
+m 
+t 
+s 
+v 
+d

examples/9.x/9.x-conf/lang/hyphenations_ga.txt

@@ -0,0 +1,5 @@
+# Set of Irish hyphenations for StopFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+h
+n
+t

examples/9.x/9.x-conf/lang/stemdict_nl.txt

@@ -0,0 +1,6 @@
+# Set of overrides for the dutch stemmer
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+fiets	fiets
+bromfiets	bromfiets
+ei	eier
+kind	kinder