Skip to content

Commit b478f8c

Browse files
committed
Merge branch 'main' into solr-panl-7
# Conflicts: # README.md # build.gradle # src/book/mechanical-pencils.panl.properties # src/dist/sample/panl/all/panl.properties # src/dist/sample/panl/book-store/panl.properties # src/dist/sample/panl/mechanical-pencils-or/panl.properties # src/dist/sample/panl/mechanical-pencils/panl.properties # src/dist/sample/panl/simple-date/panl.properties # src/dist/sample/solr/book-store/solrconfig.xml # src/dist/sample/solr/mechanical-pencils/managed-schema # src/dist/sample/solr/mechanical-pencils/managed-schema.xml # src/dist/sample/solr/mechanical-pencils/solrconfig.xml # src/dist/sample/solr/simple-date/managed-schema # src/dist/sample/solr/simple-date/managed-schema.xml # src/dist/sample/solr/simple-date/solrconfig.xml # src/docker/Dockerfile # src/docker/index-collection.sh # src/main/java/com/synapticloop/panl/server/client/PanlCloudSolrClient.java # src/main/resources/gradle.properties # src/main/resources/panl.properties.template # src/test/java/book/Main.java # src/test/java/panl/Root.java # src/test/resources/sample/mechanical-pencils/panl.properties # src/test/resources/sample/mechanical-pencils/panl.properties.original # src/test/resources/sample/simple-date/panl.properties # src/test/resources/sample/simple-date/panl.properties.original
2 parents 7cd8367 + f86660a commit b478f8c

4 files changed

Lines changed: 74 additions & 458 deletions

File tree

README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,19 @@ The mention and references of any Apache projects, sub-projects, or resources in
2626

2727
# Development Information
2828

29-
| Latest<br />Release | Latest Book Release | Development Branch (version) |
30-
|------------------------------------------------------------------------------|--------------------------------------------------------------------|--------------------------------------------------------------------------|
31-
| ![GitHub Release](https://img.shields.io/github/v/release/synapticloop/panl) | Synapticloop - Getting Started With Panl version 2.1.0 (release 1) | `hidden-summer` [See Branch](https://github.com/synapticloop/panl/tree/hidden-summer) (2.1.0) |
29+
| Latest<br />Release | Latest Book Release | Development Branch (version) |
30+
|------------------------------------------------------------------------------|--------------------------------------------------------------------|------------------------------|
31+
| ![GitHub Release](https://img.shields.io/github/v/release/synapticloop/panl) | Synapticloop - Getting Started With Panl version 2.1.0 (release 1) | none yet :) |
3232

3333

3434
**Major branch release status:**
3535

3636
| BRANCH | STATUS | VERSION | TYPE | LATEST SOLR<br />VERSION TESTED |
3737
|-----------------|----------|---------|-----------------------------------------|---------------------------------|
38-
| `MAIN` | [![CircleCI](https://dl.circleci.com/status-badge/img/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/main.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/main) | `2.0.0` | Trunk - integration with Solr version 9 | `9.6.1` |
39-
| `SOLR PANL 9` | [![CircleCI](https://dl.circleci.com/status-badge/img/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/solr-panl-9.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/solr-panl-9) | `2.0.0` | Panl integration with Solr version 9 | `9.6.1` |
40-
| `SOLR PANL 8` | [![CircleCI](https://dl.circleci.com/status-badge/img/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/solr-panl-8.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/solr-panl-8) | `2.0.0` | Panl integration with Solr version 8 | `8.11.4` |
41-
| `SOLR PANL 7` | [![CircleCI](https://dl.circleci.com/status-badge/img/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/solr-panl-7.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/solr-panl-7) | `2.0.0` | Panl integration with Solr version 7 | `7.7.3` |
42-
| `hidden-summer` | [![CircleCI](https://dl.circleci.com/status-badge/img/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/hidden-summer.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/hidden-summer) | `2.1.0` | Panl development release version 2.1.0 | `9.9.0` |
38+
| `MAIN` | [![CircleCI](https://dl.circleci.com/status-badge/img/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/main.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/main) | `2.1.0` | Trunk - integration with Solr version 9 | `9.9.0` |
39+
| `SOLR PANL 9` | [![CircleCI](https://dl.circleci.com/status-badge/img/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/solr-panl-9.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/solr-panl-9) | `2.1.0` | Panl integration with Solr version 9 | `9.9.0` |
40+
| `SOLR PANL 8` | [![CircleCI](https://dl.circleci.com/status-badge/img/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/solr-panl-8.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/solr-panl-8) | `2.1.0` | Panl integration with Solr version 8 | `8.11.4` |
41+
| `SOLR PANL 7` | [![CircleCI](https://dl.circleci.com/status-badge/img/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/solr-panl-7.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/solr-panl-7) | `2.1.0` | Panl integration with Solr version 7 | `7.7.3` |
4342

4443
> We _always_ recommend that you use the most recently available release which
4544
> contains bug fixes and new functionality and is _generally_ backwards

0 commit comments

Comments
 (0)