diff --git a/conf/solr/8.11.1/readme.md b/conf/solr/8.11.1/readme.md
deleted file mode 100644
index 4457cf9a7df..00000000000
--- a/conf/solr/8.11.1/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Please see the dev guide for what to do with Solr config files.
\ No newline at end of file
diff --git a/conf/solr/8.11.1/solrconfig.xml b/conf/solr/8.11.1/solrconfig.xml
deleted file mode 100644
index 3e4e5adc7b6..00000000000
--- a/conf/solr/8.11.1/solrconfig.xml
+++ /dev/null
@@ -1,1410 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
-     For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml.
--->
-<config>
-  <!-- In all configuration below, a prefix of "solr." for class names
-       is an alias that causes solr to search appropriate packages,
-       including org.apache.solr.(search|update|request|core|analysis)
-
-       You may also specify a fully qualified Java classname if you
-       have your own custom plugins.
-    -->
-
-  <!-- Controls what version of Lucene various components of Solr
-       adhere to.  Generally, you want to use the latest version to
-       get all bug fixes and improvements. It is highly recommended
-       that you fully re-index after changing this setting as it can
-       affect both how text is indexed and queried.
-  -->
-  <luceneMatchVersion>7.3.0</luceneMatchVersion>
-
-  <!-- <lib/> directives can be used to instruct Solr to load any Jars
-       identified and use them to resolve any "plugins" specified in
-       your solrconfig.xml or schema.xml (ie: Analyzers, Request
-       Handlers, etc...).
-
-       All directories and paths are resolved relative to the
-       instanceDir.
-
-       Please note that <lib/> directives are processed in the order
-       that they appear in your solrconfig.xml file, and are "stacked"
-       on top of each other when building a ClassLoader - so if you have
-       plugin jars with dependencies on other jars, the "lower level"
-       dependency jars should be loaded first.
-
-       If a "./lib" directory exists in your instanceDir, all files
-       found in it are included as if you had used the following
-       syntax...
-
-              <lib dir="./lib" />
-    -->
-
-  <!-- A 'dir' option by itself adds any files found in the directory
-       to the classpath, this is useful for including all jars in a
-       directory.
-
-       When a 'regex' is specified in addition to a 'dir', only the
-       files in that directory which completely match the regex
-       (anchored on both ends) will be included.
-
-       If a 'dir' option (with or without a regex) is used and nothing
-       is found that matches, a warning will be logged.
-
-       The examples below can be used to load some solr-contribs along
-       with their external dependencies.
-    -->
-  <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
-
-  <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
-  <!-- an exact 'path' can be used instead of a 'dir' to specify a
-       specific jar file.  This will cause a serious error to be logged
-       if it can't be loaded.
-    -->
-  <!--
-     <lib path="../a-jar-that-does-not-exist.jar" />
-  -->
-
-  <!-- Data Directory
-
-       Used to specify an alternate directory to hold all index data
-       other than the default ./data under the Solr home.  If
-       replication is in use, this should match the replication
-       configuration.
-    -->
-  <dataDir>${solr.data.dir:}</dataDir>
-
-
-  <!-- The DirectoryFactory to use for indexes.
-
-       solr.StandardDirectoryFactory is filesystem
-       based and tries to pick the best implementation for the current
-       JVM and platform.  solr.NRTCachingDirectoryFactory, the default,
-       wraps solr.StandardDirectoryFactory and caches small files in memory
-       for better NRT performance.
-
-       One can force a particular implementation via solr.MMapDirectoryFactory,
-       solr.NIOFSDirectoryFactory, or solr.SimpleFSDirectoryFactory.
-
-       solr.RAMDirectoryFactory is memory based and not persistent.
-    -->
-  <directoryFactory name="DirectoryFactory"
-                    class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
-
-  <!-- The CodecFactory for defining the format of the inverted index.
-       The default implementation is SchemaCodecFactory, which is the official Lucene
-       index format, but hooks into the schema to provide per-field customization of
-       the postings lists and per-document values in the fieldType element
-       (postingsFormat/docValuesFormat). Note that most of the alternative implementations
-       are experimental, so if you choose to customize the index format, it's a good
-       idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
-       before upgrading to a newer version to avoid unnecessary reindexing.
-       A "compressionMode" string element can be added to <codecFactory> to choose
-       between the existing compression modes in the default codec: "BEST_SPEED" (default)
-       or "BEST_COMPRESSION".
-  -->
-  <codecFactory class="solr.SchemaCodecFactory"/>
-
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-       Index Config - These settings control low-level behavior of indexing
-       Most example settings here show the default value, but are commented
-       out, to more easily see where customizations have been made.
-
-       Note: This replaces <indexDefaults> and <mainIndex> from older versions
-       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <indexConfig>
-    <!-- maxFieldLength was removed in 4.0. To get similar behavior, include a
-         LimitTokenCountFilterFactory in your fieldType definition. E.g.
-     <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="10000"/>
-    -->
-    <!-- Maximum time to wait for a write lock (ms) for an IndexWriter. Default: 1000 -->
-    <!-- <writeLockTimeout>1000</writeLockTimeout>  -->
-
-    <!-- Expert: Enabling compound file will use less files for the index,
-         using fewer file descriptors on the expense of performance decrease.
-         Default in Lucene is "true". Default in Solr is "false" (since 3.6) -->
-    <!-- <useCompoundFile>false</useCompoundFile> -->
-
-    <!-- ramBufferSizeMB sets the amount of RAM that may be used by Lucene
-         indexing for buffering added documents and deletions before they are
-         flushed to the Directory.
-         maxBufferedDocs sets a limit on the number of documents buffered
-         before flushing.
-         If both ramBufferSizeMB and maxBufferedDocs is set, then
-         Lucene will flush based on whichever limit is hit first.  -->
-    <!-- <ramBufferSizeMB>100</ramBufferSizeMB> -->
-    <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
-
-    <!-- Expert: Merge Policy
-         The Merge Policy in Lucene controls how merging of segments is done.
-         The default since Solr/Lucene 3.3 is TieredMergePolicy.
-         The default since Lucene 2.3 was the LogByteSizeMergePolicy,
-         Even older versions of Lucene used LogDocMergePolicy.
-      -->
-    <!--
-        <mergePolicyFactory class="org.apache.solr.index.TieredMergePolicyFactory">
-          <int name="maxMergeAtOnce">10</int>
-          <int name="segmentsPerTier">10</int>
-          <double name="noCFSRatio">0.1</double>
-        </mergePolicyFactory>
-      -->
-
-    <!-- Expert: Merge Scheduler
-         The Merge Scheduler in Lucene controls how merges are
-         performed.  The ConcurrentMergeScheduler (Lucene 2.3 default)
-         can perform merges in the background using separate threads.
-         The SerialMergeScheduler (Lucene 2.2 default) does not.
-     -->
-    <!--
-       <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
-       -->
-
-    <!-- LockFactory
-
-         This option specifies which Lucene LockFactory implementation
-         to use.
-
-         single = SingleInstanceLockFactory - suggested for a
-                  read-only index or when there is no possibility of
-                  another process trying to modify the index.
-         native = NativeFSLockFactory - uses OS native file locking.
-                  Do not use when multiple solr webapps in the same
-                  JVM are attempting to share a single index.
-         simple = SimpleFSLockFactory  - uses a plain file for locking
-
-         Defaults: 'native' is default for Solr3.6 and later, otherwise
-                   'simple' is the default
-
-         More details on the nuances of each LockFactory...
-         http://wiki.apache.org/lucene-java/AvailableLockFactories
-    -->
-    <lockType>${solr.lock.type:native}</lockType>
-
-    <!-- Commit Deletion Policy
-         Custom deletion policies can be specified here. The class must
-         implement org.apache.lucene.index.IndexDeletionPolicy.
-
-         The default Solr IndexDeletionPolicy implementation supports
-         deleting index commit points on number of commits, age of
-         commit point and optimized status.
-
-         The latest commit point should always be preserved regardless
-         of the criteria.
-    -->
-    <!--
-    <deletionPolicy class="solr.SolrDeletionPolicy">
-    -->
-    <!-- The number of commit points to be kept -->
-    <!-- <str name="maxCommitsToKeep">1</str> -->
-    <!-- The number of optimized commit points to be kept -->
-    <!-- <str name="maxOptimizedCommitsToKeep">0</str> -->
-    <!--
-        Delete all commit points once they have reached the given age.
-        Supports DateMathParser syntax e.g.
-      -->
-    <!--
-       <str name="maxCommitAge">30MINUTES</str>
-       <str name="maxCommitAge">1DAY</str>
-    -->
-    <!--
-    </deletionPolicy>
-    -->
-
-    <!-- Lucene Infostream
-
-         To aid in advanced debugging, Lucene provides an "InfoStream"
-         of detailed information when indexing.
-
-         Setting The value to true will instruct the underlying Lucene
-         IndexWriter to write its debugging info the specified file
-      -->
-    <!-- <infoStream file="INFOSTREAM.txt">false</infoStream> -->
-  </indexConfig>
-
-
-  <!-- JMX
-
-       This example enables JMX if and only if an existing MBeanServer
-       is found, use this if you want to configure JMX through JVM
-       parameters. Remove this to disable exposing Solr configuration
-       and statistics to JMX.
-
-       For more details see http://wiki.apache.org/solr/SolrJmx
-    -->
-  <jmx />
-  <!-- If you want to connect to a particular server, specify the
-       agentId
-    -->
-  <!-- <jmx agentId="myAgent" /> -->
-  <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
-  <!-- <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
-    -->
-
-  <!-- The default high-performance update handler -->
-  <updateHandler class="solr.DirectUpdateHandler2">
-
-    <!-- Enables a transaction log, used for real-time get, durability, and
-         and solr cloud replica recovery.  The log can grow as big as
-         uncommitted changes to the index, so use of a hard autoCommit
-         is recommended (see below).
-         "dir" - the target directory for transaction logs, defaults to the
-                solr data directory.
-         "numVersionBuckets" - sets the number of buckets used to keep
-                track of max version values when checking for re-ordered
-                updates; increase this value to reduce the cost of
-                synchronizing access to version buckets during high-volume
-                indexing, this requires 8 bytes (long) * numVersionBuckets
-                of heap space per Solr core.
-    -->
-    <updateLog>
-      <str name="dir">${solr.ulog.dir:}</str>
-      <int name="numVersionBuckets">${solr.ulog.numVersionBuckets:65536}</int>
-    </updateLog>
-
-    <!-- AutoCommit
-
-         Perform a hard commit automatically under certain conditions.
-         Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents.
-
-         http://wiki.apache.org/solr/UpdateXmlMessages
-
-         maxDocs - Maximum number of documents to add since the last
-                   commit before automatically triggering a new commit.
-
-         maxTime - Maximum amount of time in ms that is allowed to pass
-                   since a document was added before automatically
-                   triggering a new commit.
-         openSearcher - if false, the commit causes recent index changes
-           to be flushed to stable storage, but does not cause a new
-           searcher to be opened to make those changes visible.
-
-         If the updateLog is enabled, then it's highly recommended to
-         have some sort of hard autoCommit to limit the log size.
-      -->
-    <autoCommit>
-      <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
-      <openSearcher>false</openSearcher>
-    </autoCommit>
-
-    <!-- softAutoCommit is like autoCommit except it causes a
-         'soft' commit which only ensures that changes are visible
-         but does not ensure that data is synced to disk.  This is
-         faster and more near-realtime friendly than a hard commit.
-      -->
-
-    <autoSoftCommit>
-      <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
-    </autoSoftCommit>
-
-    <!-- Update Related Event Listeners
-
-         Various IndexWriter related events can trigger Listeners to
-         take actions.
-
-         postCommit - fired after every commit or optimize command
-         postOptimize - fired after every optimize command
-      -->
-
-  </updateHandler>
-
-  <!-- IndexReaderFactory
-
-       Use the following format to specify a custom IndexReaderFactory,
-       which allows for alternate IndexReader implementations.
-
-       ** Experimental Feature **
-
-       Please note - Using a custom IndexReaderFactory may prevent
-       certain other features from working. The API to
-       IndexReaderFactory may change without warning or may even be
-       removed from future releases if the problems cannot be
-       resolved.
-
-
-       ** Features that may not work with custom IndexReaderFactory **
-
-       The ReplicationHandler assumes a disk-resident index. Using a
-       custom IndexReader implementation may cause incompatibility
-       with ReplicationHandler and may cause replication to not work
-       correctly. See SOLR-1366 for details.
-
-    -->
-  <!--
-  <indexReaderFactory name="IndexReaderFactory" class="package.class">
-    <str name="someArg">Some Value</str>
-  </indexReaderFactory >
-  -->
-
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-       Query section - these settings control query time things like caches
-       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <query>
-
-    <!-- Maximum number of clauses in each BooleanQuery,  an exception
-         is thrown if exceeded.  It is safe to increase or remove this setting,
-         since it is purely an arbitrary limit to try and catch user errors where
-         large boolean queries may not be the best implementation choice.
-      -->
-    <maxBooleanClauses>1024</maxBooleanClauses>
-
-    <!-- Solr Internal Query Caches
-
-         There are two implementations of cache available for Solr,
-         LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.
-
-         FastLRUCache has faster gets and slower puts in single
-         threaded operation and thus is generally faster than LRUCache
-         when the hit ratio of the cache is high (> 75%), and may be
-         faster under other scenarios on multi-cpu systems.
-    -->
-
-    <!-- Filter Cache
-
-         Cache used by SolrIndexSearcher for filters (DocSets),
-         unordered sets of *all* documents that match a query.  When a
-         new searcher is opened, its caches may be prepopulated or
-         "autowarmed" using data from caches in the old searcher.
-         autowarmCount is the number of items to prepopulate.  For
-         LRUCache, the autowarmed items will be the most recently
-         accessed items.
-
-         Parameters:
-           class - the SolrCache implementation LRUCache or
-               (LRUCache or FastLRUCache)
-           size - the maximum number of entries in the cache
-           initialSize - the initial capacity (number of entries) of
-               the cache.  (see java.util.HashMap)
-           autowarmCount - the number of entries to prepopulate from
-               and old cache.
-           maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
-                      to occupy. Note that when this option is specified, the size
-                      and initialSize parameters are ignored.
-      -->
-    <filterCache class="solr.search.CaffeineCache"
-                 size="512"
-                 initialSize="512"
-                 autowarmCount="0"/>
-
-    <!-- Query Result Cache
-
-         Caches results of searches - ordered lists of document ids
-         (DocList) based on a query, a sort, and the range of documents requested.
-         Additional supported parameter by LRUCache:
-            maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
-                       to occupy
-      -->
-    <queryResultCache class="solr.search.CaffeineCache"
-                      size="512"
-                      initialSize="512"
-                      autowarmCount="0"/>
-
-    <!-- Document Cache
-
-         Caches Lucene Document objects (the stored fields for each
-         document).  Since Lucene internal document ids are transient,
-         this cache will not be autowarmed.
-      -->
-    <documentCache class="solr.search.CaffeineCache"
-                   size="512"
-                   initialSize="512"
-                   autowarmCount="0"/>
-
-    <!-- custom cache currently used by block join -->
-    <cache name="perSegFilter"
-           class="solr.search.CaffeineCache"
-           size="10"
-           initialSize="0"
-           autowarmCount="10"
-           regenerator="solr.NoOpRegenerator" />
-
-    <!-- Field Value Cache
-
-         Cache used to hold field values that are quickly accessible
-         by document id.  The fieldValueCache is created by default
-         even if not configured here.
-      -->
-    <!--
-       <fieldValueCache class="solr.FastLRUCache"
-                        size="512"
-                        autowarmCount="128"
-                        showItems="32" />
-      -->
-
-    <!-- Custom Cache
-
-         Example of a generic cache.  These caches may be accessed by
-         name through SolrIndexSearcher.getCache(),cacheLookup(), and
-         cacheInsert().  The purpose is to enable easy caching of
-         user/application level data.  The regenerator argument should
-         be specified as an implementation of solr.CacheRegenerator
-         if autowarming is desired.
-      -->
-    <!--
-       <cache name="myUserCache"
-              class="solr.LRUCache"
-              size="4096"
-              initialSize="1024"
-              autowarmCount="1024"
-              regenerator="com.mycompany.MyRegenerator"
-              />
-      -->
-
-
-    <!-- Lazy Field Loading
-
-         If true, stored fields that are not requested will be loaded
-         lazily.  This can result in a significant speed improvement
-         if the usual case is to not load all stored fields,
-         especially if the skipped fields are large compressed text
-         fields.
-    -->
-    <enableLazyFieldLoading>true</enableLazyFieldLoading>
-
-    <!-- Use Filter For Sorted Query
-
-         A possible optimization that attempts to use a filter to
-         satisfy a search.  If the requested sort does not include
-         score, then the filterCache will be checked for a filter
-         matching the query. If found, the filter will be used as the
-         source of document ids, and then the sort will be applied to
-         that.
-
-         For most situations, this will not be useful unless you
-         frequently get the same search repeatedly with different sort
-         options, and none of them ever use "score"
-      -->
-    <!--
-       <useFilterForSortedQuery>true</useFilterForSortedQuery>
-      -->
-
-    <!-- Result Window Size
-
-         An optimization for use with the queryResultCache.  When a search
-         is requested, a superset of the requested number of document ids
-         are collected.  For example, if a search for a particular query
-         requests matching documents 10 through 19, and queryWindowSize is 50,
-         then documents 0 through 49 will be collected and cached.  Any further
-         requests in that range can be satisfied via the cache.
-      -->
-    <queryResultWindowSize>20</queryResultWindowSize>
-
-    <!-- Maximum number of documents to cache for any entry in the
-         queryResultCache.
-      -->
-    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
-
-    <!-- Query Related Event Listeners
-
-         Various IndexSearcher related events can trigger Listeners to
-         take actions.
-
-         newSearcher - fired whenever a new searcher is being prepared
-         and there is a current searcher handling requests (aka
-         registered).  It can be used to prime certain caches to
-         prevent long request times for certain requests.
-
-         firstSearcher - fired whenever a new searcher is being
-         prepared but there is no current registered searcher to handle
-         requests or to gain autowarming data from.
-
-
-      -->
-    <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence.
-      -->
-    <listener event="newSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <!--
-           <lst><str name="q">solr</str><str name="sort">price asc</str></lst>
-           <lst><str name="q">rocks</str><str name="sort">weight asc</str></lst>
-          -->
-      </arr>
-    </listener>
-    <listener event="firstSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <!--
-        <lst>
-          <str name="q">static firstSearcher warming in solrconfig.xml</str>
-        </lst>
-        -->
-      </arr>
-    </listener>
-
-    <!-- Use Cold Searcher
-
-         If a search request comes in and there is no current
-         registered searcher, then immediately register the still
-         warming searcher and use it.  If "false" then all requests
-         will block until the first searcher is done warming.
-      -->
-    <useColdSearcher>false</useColdSearcher>
-
-  </query>
-
-
-  <!-- Request Dispatcher
-
-       This section contains instructions for how the SolrDispatchFilter
-       should behave when processing requests for this SolrCore.
-
-    -->
-  <requestDispatcher>
-    <!-- Request Parsing
-
-         These settings indicate how Solr Requests may be parsed, and
-         what restrictions may be placed on the ContentStreams from
-         those requests
-
-         enableRemoteStreaming - enables use of the stream.file
-         and stream.url parameters for specifying remote streams.
-
-         multipartUploadLimitInKB - specifies the max size (in KiB) of
-         Multipart File Uploads that Solr will allow in a Request.
-
-         formdataUploadLimitInKB - specifies the max size (in KiB) of
-         form data (application/x-www-form-urlencoded) sent via
-         POST. You can use POST to pass request parameters not
-         fitting into the URL.
-
-         addHttpRequestToContext - if set to true, it will instruct
-         the requestParsers to include the original HttpServletRequest
-         object in the context map of the SolrQueryRequest under the
-         key "httpRequest". It will not be used by any of the existing
-         Solr components, but may be useful when developing custom
-         plugins.
-
-         *** WARNING ***
-         Before enabling remote streaming, you should make sure your
-         system has authentication enabled.
-
-    <requestParsers enableRemoteStreaming="false"
-                    multipartUploadLimitInKB="-1"
-                    formdataUploadLimitInKB="-1"
-                    addHttpRequestToContext="false"/>
-      -->
-
-    <!-- HTTP Caching
-
-         Set HTTP caching related parameters (for proxy caches and clients).
-
-         The options below instruct Solr not to output any HTTP Caching
-         related headers
-      -->
-    <httpCaching never304="true" />
-    <!-- If you include a <cacheControl> directive, it will be used to
-         generate a Cache-Control header (as well as an Expires header
-         if the value contains "max-age=")
-
-         By default, no Cache-Control header is generated.
-
-         You can use the <cacheControl> option even if you have set
-         never304="true"
-      -->
-    <!--
-       <httpCaching never304="true" >
-         <cacheControl>max-age=30, public</cacheControl>
-       </httpCaching>
-      -->
-    <!-- To enable Solr to respond with automatically generated HTTP
-         Caching headers, and to response to Cache Validation requests
-         correctly, set the value of never304="false"
-
-         This will cause Solr to generate Last-Modified and ETag
-         headers based on the properties of the Index.
-
-         The following options can also be specified to affect the
-         values of these headers...
-
-         lastModFrom - the default value is "openTime" which means the
-         Last-Modified value (and validation against If-Modified-Since
-         requests) will all be relative to when the current Searcher
-         was opened.  You can change it to lastModFrom="dirLastMod" if
-         you want the value to exactly correspond to when the physical
-         index was last modified.
-
-         etagSeed="..." is an option you can change to force the ETag
-         header (and validation against If-None-Match requests) to be
-         different even if the index has not changed (ie: when making
-         significant changes to your config file)
-
-         (lastModifiedFrom and etagSeed are both ignored if you use
-         the never304="true" option)
-      -->
-    <!--
-       <httpCaching lastModifiedFrom="openTime"
-                    etagSeed="Solr">
-         <cacheControl>max-age=30, public</cacheControl>
-       </httpCaching>
-      -->
-  </requestDispatcher>
-
-  <!-- Request Handlers
-
-       http://wiki.apache.org/solr/SolrRequestHandler
-
-       Incoming queries will be dispatched to a specific handler by name
-       based on the path specified in the request.
-
-       If a Request Handler is declared with startup="lazy", then it will
-       not be initialized until the first request that uses it.
-
-    -->
-  <!-- SearchHandler
-
-       http://wiki.apache.org/solr/SearchHandler
-
-       For processing Search Queries, the primary Request Handler
-       provided with Solr is "SearchHandler" It delegates to a sequent
-       of SearchComponents (see below) and supports distributed
-       queries across multiple shards
-    -->
-  <requestHandler name="/select" class="solr.SearchHandler">
-    <!-- default values for query parameters can be specified, these
-         will be overridden by parameters in the request
-      -->
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-      <int name="rows">10</int>
-      <str name="defType">edismax</str>
-      <float name="tie">0.075</float>
-        <str name="qf">
-            dvName^400
-            authorName^180
-            dvSubject^190
-            dvDescription^180
-            dvAffiliation^170
-            title^130
-            subject^120
-            keyword^110
-            topicClassValue^100
-            dsDescriptionValue^90
-            authorAffiliation^80
-            publicationCitation^60
-            producerName^50
-            fileName^30
-            fileDescription^30
-            variableLabel^20
-            variableName^10
-            _text_^1.0
-        </str>
-        <str name="pf">
-            dvName^200
-            authorName^100
-            dvSubject^100
-            dvDescription^100
-            dvAffiliation^100
-            title^75
-            subject^75
-            keyword^75
-            topicClassValue^75
-            dsDescriptionValue^75
-            authorAffiliation^75
-            publicationCitation^75
-            producerName^75
-        </str>
-        <!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3--> 
-        <str name="bq">
-            isHarvested:false^25000
-        </str>
-
-      <!-- Default search field
-         <str name="df">text</str> 
-        -->
-      <!-- Change from JSON to XML format (the default prior to Solr 7.0)
-         <str name="wt">xml</str> 
-        -->
-    </lst>
-    <!-- In addition to defaults, "appends" params can be specified
-         to identify values which should be appended to the list of
-         multi-val params from the query (or the existing "defaults").
-      -->
-    <!-- In this example, the param "fq=instock:true" would be appended to
-         any query time fq params the user may specify, as a mechanism for
-         partitioning the index, independent of any user selected filtering
-         that may also be desired (perhaps as a result of faceted searching).
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "appends" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="appends">
-         <str name="fq">inStock:true</str>
-       </lst>
-      -->
-    <!-- "invariants" are a way of letting the Solr maintainer lock down
-         the options available to Solr clients.  Any params values
-         specified here are used regardless of what values may be specified
-         in either the query, the "defaults", or the "appends" params.
-
-         In this example, the facet.field and facet.query params would
-         be fixed, limiting the facets clients can use.  Faceting is
-         not turned on by default - but if the client does specify
-         facet=true in the request, these are the only facets they
-         will be able to see counts for; regardless of what other
-         facet.field or facet.query params they may specify.
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "invariants" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="invariants">
-         <str name="facet.field">cat</str>
-         <str name="facet.field">manu_exact</str>
-         <str name="facet.query">price:[* TO 500]</str>
-         <str name="facet.query">price:[500 TO *]</str>
-       </lst>
-      -->
-    <!-- If the default list of SearchComponents is not desired, that
-         list can either be overridden completely, or components can be
-         prepended or appended to the default list.  (see below)
-      -->
-    <!--
-       <arr name="components">
-         <str>nameOfCustomComponent1</str>
-         <str>nameOfCustomComponent2</str>
-       </arr>
-      -->
-  </requestHandler>
-
-  <!-- A request handler that returns indented JSON by default -->
-  <requestHandler name="/query" class="solr.SearchHandler">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-      <str name="wt">json</str>
-      <str name="indent">true</str>
-    </lst>
-  </requestHandler>
-
-
-  <!-- A Robust Example
-
-       This example SearchHandler declaration shows off usage of the
-       SearchHandler with many defaults declared
-
-       Note that multiple instances of the same Request Handler
-       (SearchHandler) can be registered multiple times with different
-       names (and different init parameters)
-    -->
-  <requestHandler name="/browse" class="solr.SearchHandler" useParams="query,facets,velocity,browse">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-    </lst>
-  </requestHandler>
-
-  <initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">
-    <lst name="defaults">
-      <str name="df">_text_</str>
-    </lst>
-  </initParams>
-
-  <!-- Solr Cell Update Request Handler
-
-       http://wiki.apache.org/solr/ExtractingRequestHandler
-
-    -->
-  <requestHandler name="/update/extract"
-                  startup="lazy"
-                  class="solr.extraction.ExtractingRequestHandler" >
-    <lst name="defaults">
-      <str name="lowernames">true</str>
-      <str name="fmap.meta">ignored_</str>
-      <str name="fmap.content">_text_</str>
-    </lst>
-  </requestHandler>
-
-  <!-- Search Components
-
-       Search components are registered to SolrCore and used by
-       instances of SearchHandler (which can access them by name)
-
-       By default, the following components are available:
-
-       <searchComponent name="query"     class="solr.QueryComponent" />
-       <searchComponent name="facet"     class="solr.FacetComponent" />
-       <searchComponent name="mlt"       class="solr.MoreLikeThisComponent" />
-       <searchComponent name="highlight" class="solr.HighlightComponent" />
-       <searchComponent name="stats"     class="solr.StatsComponent" />
-       <searchComponent name="debug"     class="solr.DebugComponent" />
-
-       Default configuration in a requestHandler would look like:
-
-       <arr name="components">
-         <str>query</str>
-         <str>facet</str>
-         <str>mlt</str>
-         <str>highlight</str>
-         <str>stats</str>
-         <str>debug</str>
-       </arr>
-
-       If you register a searchComponent to one of the standard names,
-       that will be used instead of the default.
-
-       To insert components before or after the 'standard' components, use:
-
-       <arr name="first-components">
-         <str>myFirstComponentName</str>
-       </arr>
-
-       <arr name="last-components">
-         <str>myLastComponentName</str>
-       </arr>
-
-       NOTE: The component registered with the name "debug" will
-       always be executed after the "last-components"
-
-     -->
-
-  <!-- Spell Check
-
-       The spell check component can return a list of alternative spelling
-       suggestions.
-
-       http://wiki.apache.org/solr/SpellCheckComponent
-    -->
-  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-
-    <str name="queryAnalyzerFieldType">text_general</str>
-
-    <!-- Multiple "Spell Checkers" can be declared and used by this
-         component
-      -->
-
-    <!-- a spellchecker built from a field of the main index -->
-    <lst name="spellchecker">
-      <str name="name">default</str>
-      <str name="field">_text_</str>
-      <str name="classname">solr.DirectSolrSpellChecker</str>
-      <!-- the spellcheck distance measure used, the default is the internal levenshtein -->
-      <str name="distanceMeasure">internal</str>
-      <!-- minimum accuracy needed to be considered a valid spellcheck suggestion -->
-      <float name="accuracy">0.5</float>
-      <!-- the maximum #edits we consider when enumerating terms: can be 1 or 2 -->
-      <int name="maxEdits">2</int>
-      <!-- the minimum shared prefix when enumerating terms -->
-      <int name="minPrefix">1</int>
-      <!-- maximum number of inspections per result. -->
-      <int name="maxInspections">5</int>
-      <!-- minimum length of a query term to be considered for correction -->
-      <int name="minQueryLength">4</int>
-      <!-- maximum threshold of documents a query term can appear to be considered for correction -->
-      <float name="maxQueryFrequency">0.01</float>
-      <!-- uncomment this to require suggestions to occur in 1% of the documents
-        <float name="thresholdTokenFrequency">.01</float>
-      -->
-    </lst>
-
-    <!-- a spellchecker that can break or combine words.  See "/spell" handler below for usage -->
-    <!--
-    <lst name="spellchecker">
-      <str name="name">wordbreak</str>
-      <str name="classname">solr.WordBreakSolrSpellChecker</str>
-      <str name="field">name</str>
-      <str name="combineWords">true</str>
-      <str name="breakWords">true</str>
-      <int name="maxChanges">10</int>
-    </lst>
-    -->
-  </searchComponent>
-
-  <!-- A request handler for demonstrating the spellcheck component.
-
-       NOTE: This is purely as an example.  The whole purpose of the
-       SpellCheckComponent is to hook it into the request handler that
-       handles your normal user queries so that a separate request is
-       not needed to get suggestions.
-
-       IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
-       NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
-
-       See http://wiki.apache.org/solr/SpellCheckComponent for details
-       on the request parameters.
-    -->
-  <requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <!-- Solr will use suggestions from both the 'default' spellchecker
-           and from the 'wordbreak' spellchecker and combine them.
-           collations (re-written queries) can include a combination of
-           corrections from both spellcheckers -->
-      <str name="spellcheck.dictionary">default</str>
-      <str name="spellcheck">on</str>
-      <str name="spellcheck.extendedResults">true</str>
-      <str name="spellcheck.count">10</str>
-      <str name="spellcheck.alternativeTermCount">5</str>
-      <str name="spellcheck.maxResultsForSuggest">5</str>
-      <str name="spellcheck.collate">true</str>
-      <str name="spellcheck.collateExtendedResults">true</str>
-      <str name="spellcheck.maxCollationTries">10</str>
-      <str name="spellcheck.maxCollations">5</str>
-    </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Term Vector Component
-
-       http://wiki.apache.org/solr/TermVectorComponent
-    -->
-  <searchComponent name="tvComponent" class="solr.TermVectorComponent"/>
-
-  <!-- A request handler for demonstrating the term vector component
-
-       This is purely as an example.
-
-       In reality you will likely want to add the component to your
-       already specified request handlers.
-    -->
-  <requestHandler name="/tvrh" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <bool name="tv">true</bool>
-    </lst>
-    <arr name="last-components">
-      <str>tvComponent</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Clustering Component. (Omitted here. See the default Solr example for a typical configuration.) -->
-
-  <!-- Terms Component
-
-       http://wiki.apache.org/solr/TermsComponent
-
-       A component to return terms and document frequency of those
-       terms
-    -->
-  <searchComponent name="terms" class="solr.TermsComponent"/>
-
-  <!-- A request handler for demonstrating the terms component -->
-  <requestHandler name="/terms" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <bool name="terms">true</bool>
-      <bool name="distrib">false</bool>
-    </lst>
-    <arr name="components">
-      <str>terms</str>
-    </arr>
-  </requestHandler>
-
-
-  <!-- Query Elevation Component
-
-       http://wiki.apache.org/solr/QueryElevationComponent
-
-       a search component that enables you to configure the top
-       results for a given query regardless of the normal lucene
-       scoring.
-    -->
-  <searchComponent name="elevator" class="solr.QueryElevationComponent" >
-    <!-- pick a fieldType to analyze queries -->
-    <str name="queryFieldType">string</str>
-  </searchComponent>
-
-  <!-- A request handler for demonstrating the elevator component -->
-  <requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-    </lst>
-    <arr name="last-components">
-      <str>elevator</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Highlighting Component
-
-       http://wiki.apache.org/solr/HighlightingParameters
-    -->
-  <searchComponent class="solr.HighlightComponent" name="highlight">
-    <highlighting>
-      <!-- Configure the standard fragmenter -->
-      <!-- This could most likely be commented out in the "default" case -->
-      <fragmenter name="gap"
-                  default="true"
-                  class="solr.highlight.GapFragmenter">
-        <lst name="defaults">
-          <int name="hl.fragsize">100</int>
-        </lst>
-      </fragmenter>
-
-      <!-- A regular-expression-based fragmenter
-           (for sentence extraction)
-        -->
-      <fragmenter name="regex"
-                  class="solr.highlight.RegexFragmenter">
-        <lst name="defaults">
-          <!-- slightly smaller fragsizes work better because of slop -->
-          <int name="hl.fragsize">70</int>
-          <!-- allow 50% slop on fragment sizes -->
-          <float name="hl.regex.slop">0.5</float>
-          <!-- a basic sentence pattern -->
-          <str name="hl.regex.pattern">[-\w ,/\n\&quot;&apos;]{20,200}</str>
-        </lst>
-      </fragmenter>
-
-      <!-- Configure the standard formatter -->
-      <formatter name="html"
-                 default="true"
-                 class="solr.highlight.HtmlFormatter">
-        <lst name="defaults">
-          <str name="hl.simple.pre"><![CDATA[<em>]]></str>
-          <str name="hl.simple.post"><![CDATA[</em>]]></str>
-        </lst>
-      </formatter>
-
-      <!-- Configure the standard encoder -->
-      <encoder name="html"
-               class="solr.highlight.HtmlEncoder" />
-
-      <!-- Configure the standard fragListBuilder -->
-      <fragListBuilder name="simple"
-                       class="solr.highlight.SimpleFragListBuilder"/>
-
-      <!-- Configure the single fragListBuilder -->
-      <fragListBuilder name="single"
-                       class="solr.highlight.SingleFragListBuilder"/>
-
-      <!-- Configure the weighted fragListBuilder -->
-      <fragListBuilder name="weighted"
-                       default="true"
-                       class="solr.highlight.WeightedFragListBuilder"/>
-
-      <!-- default tag FragmentsBuilder -->
-      <fragmentsBuilder name="default"
-                        default="true"
-                        class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <!--
-        <lst name="defaults">
-          <str name="hl.multiValuedSeparatorChar">/</str>
-        </lst>
-        -->
-      </fragmentsBuilder>
-
-      <!-- multi-colored tag FragmentsBuilder -->
-      <fragmentsBuilder name="colored"
-                        class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <lst name="defaults">
-          <str name="hl.tag.pre"><![CDATA[
-               <b style="background:yellow">,<b style="background:lawgreen">,
-               <b style="background:aquamarine">,<b style="background:magenta">,
-               <b style="background:palegreen">,<b style="background:coral">,
-               <b style="background:wheat">,<b style="background:khaki">,
-               <b style="background:lime">,<b style="background:deepskyblue">]]></str>
-          <str name="hl.tag.post"><![CDATA[</b>]]></str>
-        </lst>
-      </fragmentsBuilder>
-
-      <boundaryScanner name="default"
-                       default="true"
-                       class="solr.highlight.SimpleBoundaryScanner">
-        <lst name="defaults">
-          <str name="hl.bs.maxScan">10</str>
-          <str name="hl.bs.chars">.,!? &#9;&#10;&#13;</str>
-        </lst>
-      </boundaryScanner>
-
-      <boundaryScanner name="breakIterator"
-                       class="solr.highlight.BreakIteratorBoundaryScanner">
-        <lst name="defaults">
-          <!-- type should be one of CHARACTER, WORD(default), LINE and SENTENCE -->
-          <str name="hl.bs.type">WORD</str>
-          <!-- language and country are used when constructing Locale object.  -->
-          <!-- And the Locale object will be used when getting instance of BreakIterator -->
-          <str name="hl.bs.language">en</str>
-          <str name="hl.bs.country">US</str>
-        </lst>
-      </boundaryScanner>
-    </highlighting>
-  </searchComponent>
-
-  <!-- Update Processors
-
-       Chains of Update Processor Factories for dealing with Update
-       Requests can be declared, and then used by name in Update
-       Request Processors
-
-       http://wiki.apache.org/solr/UpdateRequestProcessor
-
-    -->
-
-  <!-- Add unknown fields to the schema
-
-       Field type guessing update processors that will
-       attempt to parse string-typed field values as Booleans, Longs,
-       Doubles, or Dates, and then add schema fields with the guessed
-       field types. Text content will be indexed as "text_general" as
-       well as a copy to a plain string version in *_str.
-
-       These require that the schema is both managed and mutable, by
-       declaring schemaFactory as ManagedIndexSchemaFactory, with
-       mutable specified as true.
-
-       See http://wiki.apache.org/solr/GuessingFieldTypes
-    -->
-<schemaFactory class="ClassicIndexSchemaFactory"/>
-
-  <updateProcessor class="solr.UUIDUpdateProcessorFactory" name="uuid"/>
-  <updateProcessor class="solr.RemoveBlankFieldUpdateProcessorFactory" name="remove-blank"/>
-  <updateProcessor class="solr.FieldNameMutatingUpdateProcessorFactory" name="field-name-mutating">
-    <str name="pattern">[^\w-\.]</str>
-    <str name="replacement">_</str>
-  </updateProcessor>
-  <updateProcessor class="solr.ParseBooleanFieldUpdateProcessorFactory" name="parse-boolean"/>
-  <updateProcessor class="solr.ParseLongFieldUpdateProcessorFactory" name="parse-long"/>
-  <updateProcessor class="solr.ParseDoubleFieldUpdateProcessorFactory" name="parse-double"/>
-  <updateProcessor class="solr.ParseDateFieldUpdateProcessorFactory" name="parse-date">
-    <arr name="format">
-      <str>yyyy-MM-dd'T'HH:mm:ss.SSSZ</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss,SSSZ</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss.SSS</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss,SSS</str>
-      <str>yyyy-MM-dd'T'HH:mm:ssZ</str>
-      <str>yyyy-MM-dd'T'HH:mm:ss</str>
-      <str>yyyy-MM-dd'T'HH:mmZ</str>
-      <str>yyyy-MM-dd'T'HH:mm</str>
-      <str>yyyy-MM-dd HH:mm:ss.SSSZ</str>
-      <str>yyyy-MM-dd HH:mm:ss,SSSZ</str>
-      <str>yyyy-MM-dd HH:mm:ss.SSS</str>
-      <str>yyyy-MM-dd HH:mm:ss,SSS</str>
-      <str>yyyy-MM-dd HH:mm:ssZ</str>
-      <str>yyyy-MM-dd HH:mm:ss</str>
-      <str>yyyy-MM-dd HH:mmZ</str>
-      <str>yyyy-MM-dd HH:mm</str>
-      <str>yyyy-MM-dd</str>
-    </arr>
-  </updateProcessor>
-
-  <!--Dataverse removed-->
-<!--  <updateProcessor class="solr.AddSchemaFieldsUpdateProcessorFactory" name="add-schema-fields">
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.String</str>
-      <str name="fieldType">text_general</str>
-      <lst name="copyField">
-        <str name="dest">*_str</str>
-        <int name="maxChars">256</int>
-      </lst>
-
-      <bool name="default">true</bool>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.Boolean</str>
-      <str name="fieldType">booleans</str>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.util.Date</str>
-      <str name="fieldType">pdates</str>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.Long</str>
-      <str name="valueClass">java.lang.Integer</str>
-      <str name="fieldType">plongs</str>
-    </lst>
-    <lst name="typeMapping">
-      <str name="valueClass">java.lang.Number</str>
-      <str name="fieldType">pdoubles</str>
-    </lst>
-    </updateProcessor> -->
-
-  <!-- The update.autoCreateFields property can be turned to false to disable schemaless mode -->
-  <updateRequestProcessorChain name="add-unknown-fields-to-the-schema" default="${update.autoCreateFields:false}"
-           processor="uuid,remove-blank,field-name-mutating,parse-boolean,parse-long,parse-double,parse-date">
-    <processor class="solr.LogUpdateProcessorFactory"/>
-    <processor class="solr.DistributedUpdateProcessorFactory"/>
-    <processor class="solr.RunUpdateProcessorFactory"/>
-  </updateRequestProcessorChain>
-
-  <!-- Deduplication
-
-       An example dedup update processor that creates the "id" field
-       on the fly based on the hash code of some other fields.  This
-       example has overwriteDupes set to false since we are using the
-       id field as the signatureField and Solr will maintain
-       uniqueness based on that anyway.
-
-    -->
-  <!--
-     <updateRequestProcessorChain name="dedupe">
-       <processor class="solr.processor.SignatureUpdateProcessorFactory">
-         <bool name="enabled">true</bool>
-         <str name="signatureField">id</str>
-         <bool name="overwriteDupes">false</bool>
-         <str name="fields">name,features,cat</str>
-         <str name="signatureClass">solr.processor.Lookup3Signature</str>
-       </processor>
-       <processor class="solr.LogUpdateProcessorFactory" />
-       <processor class="solr.RunUpdateProcessorFactory" />
-     </updateRequestProcessorChain>
-    -->
-
-  <!-- Language identification
-
-       This example update chain identifies the language of the incoming
-       documents using the langid contrib. The detected language is
-       written to field language_s. No field name mapping is done.
-       The fields used for detection are text, title, subject and description,
-       making this example suitable for detecting languages form full-text
-       rich documents injected via ExtractingRequestHandler.
-       See more about langId at http://wiki.apache.org/solr/LanguageDetection
-    -->
-  <!--
-   <updateRequestProcessorChain name="langid">
-     <processor class="org.apache.solr.update.processor.TikaLanguageIdentifierUpdateProcessorFactory">
-       <str name="langid.fl">text,title,subject,description</str>
-       <str name="langid.langField">language_s</str>
-       <str name="langid.fallback">en</str>
-     </processor>
-     <processor class="solr.LogUpdateProcessorFactory" />
-     <processor class="solr.RunUpdateProcessorFactory" />
-   </updateRequestProcessorChain>
-  -->
-
-  <!-- Script update processor
-
-    This example hooks in an update processor implemented using JavaScript.
-
-    See more about the script update processor at http://wiki.apache.org/solr/ScriptUpdateProcessor
-  -->
-  <!--
-    <updateRequestProcessorChain name="script">
-      <processor class="solr.StatelessScriptUpdateProcessorFactory">
-        <str name="script">update-script.js</str>
-        <lst name="params">
-          <str name="config_param">example config parameter</str>
-        </lst>
-      </processor>
-      <processor class="solr.RunUpdateProcessorFactory" />
-    </updateRequestProcessorChain>
-  -->
-
-  <!-- Response Writers
-
-       http://wiki.apache.org/solr/QueryResponseWriter
-
-       Request responses will be written using the writer specified by
-       the 'wt' request parameter matching the name of a registered
-       writer.
-
-       The "default" writer is the default and will be used if 'wt' is
-       not specified in the request.
-    -->
-  <!-- The following response writers are implicitly configured unless
-       overridden...
-    -->
-  <!--
-     <queryResponseWriter name="xml"
-                          default="true"
-                          class="solr.XMLResponseWriter" />
-     <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
-     <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
-     <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
-     <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
-     <queryResponseWriter name="phps" class="solr.PHPSerializedResponseWriter"/>
-     <queryResponseWriter name="csv" class="solr.CSVResponseWriter"/>
-     <queryResponseWriter name="schema.xml" class="solr.SchemaXmlResponseWriter"/>
-    -->
-
-  <queryResponseWriter name="json" class="solr.JSONResponseWriter">
-    <!-- For the purposes of the tutorial, JSON responses are written as
-     plain text so that they are easy to read in *any* browser.
-     If you expect a MIME type of "application/json" just remove this override.
-    -->
-    <str name="content-type">text/plain; charset=UTF-8</str>
-  </queryResponseWriter>
-
-  <!--
-     Custom response writers can be declared as needed...
-    -->
-  <queryResponseWriter name="velocity" class="solr.VelocityResponseWriter" startup="lazy">
-    <str name="template.base.dir">${velocity.template.base.dir:}</str>
-    <str name="solr.resource.loader.enabled">${velocity.solr.resource.loader.enabled:true}</str>
-    <str name="params.resource.loader.enabled">${velocity.params.resource.loader.enabled:false}</str>
-  </queryResponseWriter>
-
-  <!-- XSLT response writer transforms the XML output by any xslt file found
-       in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.
-    -->
-  <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
-    <int name="xsltCacheLifetimeSeconds">5</int>
-  </queryResponseWriter>
-
-  <!-- Query Parsers
-
-       https://lucene.apache.org/solr/guide/query-syntax-and-parsing.html
-
-       Multiple QParserPlugins can be registered by name, and then
-       used in either the "defType" param for the QueryComponent (used
-       by SearchHandler) or in LocalParams
-    -->
-  <!-- example of registering a query parser -->
-  <!--
-     <queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
-    -->
-
-  <!-- Function Parsers
-
-       http://wiki.apache.org/solr/FunctionQuery
-
-       Multiple ValueSourceParsers can be registered by name, and then
-       used as function names when using the "func" QParser.
-    -->
-  <!-- example of registering a custom function parser  -->
-  <!--
-     <valueSourceParser name="myfunc"
-                        class="com.mycompany.MyValueSourceParser" />
-    -->
-
-
-  <!-- Document Transformers
-       http://wiki.apache.org/solr/DocTransformers
-    -->
-  <!--
-     Could be something like:
-     <transformer name="db" class="com.mycompany.LoadFromDatabaseTransformer" >
-       <int name="connection">jdbc://....</int>
-     </transformer>
-
-     To add a constant value to all docs, use:
-     <transformer name="mytrans2" class="org.apache.solr.response.transform.ValueAugmenterFactory" >
-       <int name="value">5</int>
-     </transformer>
-
-     If you want the user to still be able to change it with _value:something_ use this:
-     <transformer name="mytrans3" class="org.apache.solr.response.transform.ValueAugmenterFactory" >
-       <double name="defaultValue">5</double>
-     </transformer>
-
-      If you are using the QueryElevationComponent, you may wish to mark documents that get boosted.  The
-      EditorialMarkerFactory will do exactly that:
-     <transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-    -->
-</config>
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service
index d89ee108377..8bb21e38083 100644
--- a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service
+++ b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service
@@ -8,6 +8,7 @@ Type = forking
 WorkingDirectory = /usr/local/solr/solr-8.11.1
 ExecStart = /usr/local/solr/solr-8.11.1/bin/solr start -m 1g -j "jetty.host=127.0.0.1"
 ExecStop = /usr/local/solr/solr-8.11.1/bin/solr stop
+Environment="SOLR_OPTS=-Dsolr.jetty.request.header.size=102400"
 LimitNOFILE=65000
 LimitNPROC=65000
 Restart=on-failure
diff --git a/doc/sphinx-guides/source/admin/metadatacustomization.rst b/doc/sphinx-guides/source/admin/metadatacustomization.rst
index 53bc32eca3d..d635dbc3643 100644
--- a/doc/sphinx-guides/source/admin/metadatacustomization.rst
+++ b/doc/sphinx-guides/source/admin/metadatacustomization.rst
@@ -516,7 +516,7 @@ the Solr schema configuration, including any enabled metadata schemas:
 
 ``curl "http://localhost:8080/api/admin/index/solr/schema"``
 
-You can use :download:`update-fields.sh <../../../../conf/solr/8.11.1/update-fields.sh>` to easily add these to the
+You can use :download:`update-fields.sh <../../../../modules/solr-configset/src/main/scripts/update-fields.sh>` to easily add these to the
 Solr schema you installed for your Dataverse installation.
 
 The script needs a target XML file containing your Solr schema. (See the :doc:`/installation/prerequisites/` section of
diff --git a/doc/sphinx-guides/source/conf.py b/doc/sphinx-guides/source/conf.py
index 2c2ddf1bdf6..1cd1505a69f 100755
--- a/doc/sphinx-guides/source/conf.py
+++ b/doc/sphinx-guides/source/conf.py
@@ -18,6 +18,9 @@
 sys.path.insert(0, os.path.abspath('../../'))
 import sphinx_bootstrap_theme
 
+import xml.etree.ElementTree as et
+pom = et.parse("../../../modules/dataverse-parent/pom.xml")
+ns = {"mvn": "http://maven.apache.org/POM/4.0.0"}
 
 # Activate the theme.
 # html_theme = 'bootstrap'
@@ -438,4 +441,5 @@
 rst_prolog = """
 .. |toctitle| replace:: Contents:
 .. |anotherSub| replace:: Yes, there can be multiple.
-"""
+.. |solr_version| replace:: {solr_version}
+""".format(solr_version=pom.find("./mvn:properties/mvn:solr.version", ns).text)
diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst
index 0d1610be8bf..0061c28878e 100644
--- a/doc/sphinx-guides/source/installation/prerequisites.rst
+++ b/doc/sphinx-guides/source/installation/prerequisites.rst
@@ -154,86 +154,164 @@ Configuring Database Access for the Dataverse Installation (and the Dataverse So
 Solr
 ----
 
-The Dataverse Software search index is powered by Solr.
+The Dataverse Software search index is powered by `Solr <https://solr.apache.org>`_.
 
 Supported Versions
 ==================
 
-The Dataverse Software has been tested with Solr version 8.11.1. Future releases in the 8.x series are likely to be compatible; however, this cannot be confirmed until they are officially tested. Major releases above 8.x (e.g. 9.x) are not supported.
+The Dataverse Software has been tested with Solr version |solr_version|. Future releases in the 8.x series are likely to
+be compatible; however, this cannot be confirmed until they are officially tested. Major releases above 8.x (e.g. 9.x)
+are not supported.
+
+- Releases up to 4.20 supported Solr 7.x.x.
+- Releases 5.0 to 5.3 supported Solr 7.7.2.
+- Releases 5.4 to 5.9 supported Solr 8.8.1.
+- Releases since 5.10 support Solr |solr_version|
+
 
 Installing Solr
 ===============
 
-You should not run Solr as root. Create a user called ``solr`` and a directory to install Solr into::
+Note: this guide describes setting up a small installation, using the Solr *standalone* mode. For larger installations or
+higher availability requirements, please take a look at `Solr Cloud <https://solr.apache.org/guide/solrcloud.html>`_ mode.
+
+Optional Step 0:
 
-        useradd solr
+- Solr launches asynchronously and attempts to use the ``lsof`` binary to watch for its own availability.
+  Installation of this package isn't required but will prevent a warning in the log at startup. (Use ``dnf``, ``yum`` or
+  ``apt-get`` to install this standard package.)
+- Solr 8.x runs on Java 11 (same as your Dataverse installation). Remember to install it when running Solr on a
+  separated machine.
+
+**Step 1**: You should **not** run Solr as ``root``! Create a user and group called ``solr`` (as root) and a directory to
+install Solr into:
+
+.. parsed-literal::
         mkdir /usr/local/solr
-        chown solr:solr /usr/local/solr
+        groupadd -r --gid 8983 solr
+        useradd -r --home-dir /usr/local/solr --uid 8983 --gid 8983 solr
+        chown solr: /usr/local/solr
 
-Become the ``solr`` user and then download and configure Solr::
+**Step 2:** Become the ``solr`` user and then download and configure Solr:
 
-        su - solr
+.. parsed-literal::
+        sudo -u solr -s
         cd /usr/local/solr
-        wget https://archive.apache.org/dist/lucene/solr/8.11.1/solr-8.11.1.tgz
-        tar xvzf solr-8.11.1.tgz
-        cd solr-8.11.1
-        cp -r server/solr/configsets/_default server/solr/collection1
+        wget https://archive.apache.org/dist/lucene/solr/|solr_version|/solr-|solr_version|.tgz
+        tar xvzf solr-|solr_version|.tgz
+        exit
 
-You should already have a "dvinstall.zip" file that you downloaded from https://github.com/IQSS/dataverse/releases . Unzip it into ``/tmp``. Then copy the files into place::
 
-        cp /tmp/dvinstall/schema*.xml /usr/local/solr/solr-8.11.1/server/solr/collection1/conf
-        cp /tmp/dvinstall/solrconfig.xml /usr/local/solr/solr-8.11.1/server/solr/collection1/conf
+Solr Init Script
+================
 
-Note: The Dataverse Project team has customized Solr to boost results that come from certain indexed elements inside the Dataverse installation, for example prioritizing results from Dataverse collections over Datasets. If you would like to remove this, edit your ``solrconfig.xml`` and remove the ``<str name="qf">`` element and its contents. If you have ideas about how this boosting could be improved, feel free to contact us through our Google Group https://groups.google.com/forum/#!forum/dataverse-dev .
+**Step 3:** Once you installed Solr, you need to add to the init system to start on boot, stop on shutdown etc. Please choose the
+right option for your underlying Linux operating system. *It will not be necessary to execute both!*
 
-A Dataverse installation requires a change to the ``jetty.xml`` file that ships with Solr. Edit ``/usr/local/solr/solr-8.11.1/server/etc/jetty.xml`` , increasing ``requestHeaderSize`` from ``8192`` to ``102400``
+SystemD based systems
+^^^^^^^^^^^^^^^^^^^^^
 
-Solr will warn about needing to increase the number of file descriptors and max processes in a production environment but will still run with defaults. We have increased these values to the recommended levels by adding ulimit -n 65000 to the init script, and the following to ``/etc/security/limits.conf``::
+For systems running systemd (like RedHat or derivatives since 7, Debian since 9, Ubuntu since 15.04), as root, download
+:download:`solr.service<../_static/installation/files/etc/systemd/solr.service>` and place it in ``/tmp``. Then start
+Solr and configure it to start at boot with the following commands (run as root again):
 
-        solr soft nproc 65000
-        solr hard nproc 65000
-        solr soft nofile 65000
-        solr hard nofile 65000
+.. parsed-literal::
+        cp /tmp/solr.service /etc/systemd/system
+        systemctl daemon-reload
+        systemctl start solr.service
+        systemctl enable solr.service
 
-On operating systems which use systemd such as RHEL/derivative, you may then add a line like LimitNOFILE=65000 for the number of open file descriptors and a line with LimitNPROC=65000 for the max processes to the systemd unit file, or adjust the limits on a running process using the prlimit tool::
+SysVinit based systems
+^^^^^^^^^^^^^^^^^^^^^^
 
-        # sudo prlimit --pid pid --nofile=65000:65000
+For (older) systems using init.d (like CentOS 6 or Devuan), download this :download:`Solr init script <../_static/installation/files/etc/init.d/solr>`
+and place it in ``/tmp``. Then start Solr and configure it to start at boot with the following commands (run as root again):
 
-Solr launches asynchronously and attempts to use the ``lsof`` binary to watch for its own availability. Installation of this package isn't required but will prevent a warning in the log at startup::
+.. parsed-literal::
+        cp /tmp/solr /etc/init.d
+        service start solr
+        chkconfig solr on
 
-	# yum install lsof
 
-Finally, you need to tell Solr to create the core "collection1" on startup::
+Creating Solr Core
+==================
 
-        echo "name=collection1" > /usr/local/solr/solr-8.11.1/server/solr/collection1/core.properties
+Solr Cores hold the actual data of your index. They get created from templates called "config sets". We provide a
+template that has been tuned carefully for usage within a Dataverse installation and is distributed as a ZIP file.
 
-Solr Init Script
-================
+Note: The Dataverse Project team has customized the cores ``solrconfig.xml`` to boost Solr search results that come from
+certain indexed elements inside the Dataverse installation, for example prioritizing results from Dataverse collections
+over Datasets. If you would like to remove this, edit this file and remove the ``<str name="qf">`` element and its
+contents. If you have ideas about how this boosting could be improved, feel free to contact us through our
+`Google Group <https://groups.google.com/forum/#!forum/dataverse-dev>`_.
 
-Please choose the right option for your underlying Linux operating system.
-It will not be necessary to execute both!
+**Step 4:** If not already done, please download the latest release package ``dvinstall.zip`` at
+https://github.com/IQSS/dataverse/releases.
 
-For systems running systemd (like RedHat or derivatives since 7, Debian since 9, Ubuntu since 15.04), as root, download :download:`solr.service<../_static/installation/files/etc/systemd/solr.service>` and place it in ``/tmp``. Then start Solr and configure it to start at boot with the following commands::
+**Step 5:** Extract our Solr Dataverse config set from it and unpack the configset directory:
 
-        cp /tmp/solr.service /etc/systemd/system
-        systemctl daemon-reload
-        systemctl start solr.service
-        systemctl enable solr.service
+.. parsed-literal::
+        sudo -u solr -s
+        cd solr-|solr_version|/server/solr/configsets
+        unzip path/to/dvinstall.zip solr-configset.zip
+        unzip solr-configset.zip
 
-For systems using init.d (like CentOS 6), download this :download:`Solr init script <../_static/installation/files/etc/init.d/solr>` and place it in ``/tmp``. Then start Solr and configure it to start at boot with the following commands::
+**Step 6:** Create the core within your running Solr instance:
 
-        cp /tmp/solr /etc/init.d
-        service start solr
-        chkconfig solr on
+.. parsed-literal::
+        /usr/local/solr/solr-|solr_version|/bin/solr create -c collection1 -d dataverse
+
+
+Tuning Solr
+===========
+
+The next steps are mostly extracted from the recommendations for
+`"Taking Solr to Production" <https://solr.apache.org/guide/taking-solr-to-production.html>`_.
+
+They are mostly necessary for older Linux distributions using System V init systems. If you are using our
+SystemD unit file (see above), they may be skipped.
+
+1. A Dataverse installation requires a change to the ``jetty.xml`` file that ships with Solr.
+   Edit ``/usr/local/solr/*/server/etc/jetty.xml`` , increasing ``requestHeaderSize`` from ``8192`` to ``102400``.
+
+   Alternative: use ``SOLR_OPTS`` to set the system property (see Solr docs linked above).
+
+2. Solr will warn about needing to increase the number of file descriptors and max processes in a production environment
+   but will still run with defaults. We have increased these values to the recommended levels by adding ulimit -n 65000
+   to the init script, and the following to ``/etc/security/limits.conf``:
+
+   .. parsed-literal::
+        solr soft nproc 65000
+        solr hard nproc 65000
+        solr soft nofile 65000
+        solr hard nofile 65000
+
+   Note: This is not necessary with SystemD, which ignores these settings (see unit file instead)!
+   If not using our unit file, you may need to add a line like ``LimitNOFILE=65000`` for the number of open file
+   descriptors and a line with ``LimitNPROC=65000`` for the max processes to the systemd unit file.
+
+   Alternative: adjust the limits on a running process using the ``prlimit`` tool:
+
+   .. parsed-literal::
+         sudo prlimit --pid pid --nofile=65000:65000
 
 Securing Solr
 =============
 
-Our sample init script and systemd service file linked above tell Solr to only listen on localhost (127.0.0.1). We strongly recommend that you also use a firewall to block access to the Solr port (8983) from outside networks, for added redundancy.
+Our sample init script and systemd service file linked above tell Solr to only listen on localhost (127.0.0.1). We
+strongly recommend that you also use a firewall to block access to the Solr port (8983) from outside networks, for
+added redundancy.
 
-It is **very important** not to allow direct access to the Solr API from outside networks! Otherwise, any host that can reach the Solr port (8983 by default) can add or delete data, search unpublished data, and even reconfigure Solr. For more information, please see https://lucene.apache.org/solr/guide/7_3/securing-solr.html. A particularly serious security issue that has been identified recently allows a potential intruder to remotely execute arbitrary code on the system. See `RCE in Solr via Velocity Template <https://github.com/veracode-research/solr-injection#7-cve-2019-xxxx-rce-via-velocity-template-by-_s00py>`_ for more information.
+It is **very important** not to allow direct access to the Solr API from outside networks! Otherwise, any host that can
+reach the Solr port (8983 by default) can add or delete data, search unpublished data, and even reconfigure Solr. For
+more information, please see https://lucene.apache.org/solr/guide/7_3/securing-solr.html. A particularly serious
+security issue that has been identified recently allows a potential intruder to remotely execute arbitrary code on the
+system. See `RCE in Solr via Velocity Template <https://github.com/veracode-research/solr-injection#7-cve-2019-xxxx-rce-via-velocity-template-by-_s00py>`_
+for more information.
 
-If you're running your Dataverse installation across multiple service hosts you'll want to remove the jetty.host argument (``-j jetty.host=127.0.0.1``) from the startup command line, but make sure Solr is behind a firewall and only accessible by the Dataverse installation host(s), by specific ip address(es).
+If you're running your Dataverse installation across multiple service hosts you'll want to remove the jetty.host
+argument (``-j jetty.host=127.0.0.1``) from the startup command line, but make sure Solr is behind a firewall and only
+accessible by the Dataverse installation host(s), by specific ip address(es).
 
 We additionally recommend that the Solr service account's shell be disabled, as it isn't necessary for daily operation::
 
@@ -247,7 +325,10 @@ or simply prepend each command you would run as the Solr user with "sudo -u solr
 
         # sudo -u solr command
 
-Finally, we would like to reiterate that it is simply never a good idea to run Solr as root! Running the process as a non-privileged user would substantially minimize any potential damage even in the event that the instance is compromised.
+Finally, we would like to reiterate that it is simply never a good idea to run Solr as root! Running the process as
+non-privileged user would substantially minimize any potential damage even in the event that the instance is compromised.
+
+
 
 jq
 --
diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml
index 3a8e0bc1d06..f3c661b3791 100644
--- a/modules/dataverse-parent/pom.xml
+++ b/modules/dataverse-parent/pom.xml
@@ -15,6 +15,7 @@
         <module>../../scripts/zipdownload</module>
         <module>../container-base</module>
         <module>../dataverse-spi</module>
+        <module>../solr-configset</module>
     </modules>
     
     <!-- Transitive dependencies, bigger library "bill of materials" (BOM) and
@@ -53,6 +54,11 @@
                 <artifactId>postgresql</artifactId>
                 <version>${postgresql.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.solr</groupId>
+                <artifactId>solr-solrj</artifactId>
+                <version>${solr.version}</version>
+            </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
@@ -126,6 +132,12 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+    
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>${junit.jupiter.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
  
@@ -200,6 +212,8 @@
         
         <!-- Container related -->
         <fabric8-dmp.version>0.43.0</fabric8-dmp.version>
+        <solr.collection>collection1</solr.collection>
+        <solr.configset>dataverse</solr.configset> <!-- Note: container usage only for now, might be reused in code -->
     </properties>
     
     <pluginRepositories>
@@ -407,7 +421,6 @@
                 -->
                 <!-- <payara.version>5.2022.5</payara.version> -->
             </properties>
-    
             <build>
                 <plugins>
                     <!-- This will get the current commit id to include in image tags of container builds as Maven properties -->
@@ -433,8 +446,6 @@
                     </plugin>
                 </plugins>
             </build>
-            
         </profile>
     </profiles>
-    
 </project>
diff --git a/modules/solr-configset/pom.xml b/modules/solr-configset/pom.xml
new file mode 100644
index 00000000000..1fab865dd77
--- /dev/null
+++ b/modules/solr-configset/pom.xml
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>edu.harvard.iq</groupId>
+        <artifactId>dataverse-parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>../dataverse-parent</relativePath>
+    </parent>
+    
+    <artifactId>solr-configset</artifactId>
+    <!-- We actually create a ZIP file, so let's not create an empty JAR -->
+    <packaging>${solr.packaging.type}</packaging>
+    
+    <properties>
+        <solr.configset.directory>${project.build.directory}/${solr.configset}</solr.configset.directory>
+        <solr.packaging.type>jar</solr.packaging.type>
+        <solrteur.script>${project.build.sourceDirectory}/io/gdcc/solrteur/solrteur.java</solrteur.script>
+    </properties>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <release>${target.java.version}</release>
+                    <!-- for use with `mvn -DcompilerArgument=-Xlint:unchecked compile` -->
+                    <compilerArgument>${compilerArgument}</compilerArgument>
+                </configuration>
+            </plugin>
+            
+            <!-- Download Solr to build configset template -->
+            <plugin>
+                <groupId>com.googlecode.maven-download-plugin</groupId>
+                <artifactId>download-maven-plugin</artifactId>
+                <version>1.6.8</version>
+                <executions>
+                    <execution>
+                        <id>download-solr</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>wget</goal>
+                        </goals>
+                        <configuration>
+                            <url>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.zip</url>
+                            <unpack>false</unpack>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <followRedirects>true</followRedirects>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+    
+            <plugin>
+                <groupId>dev.jbang</groupId>
+                <artifactId>jbang-maven-plugin</artifactId>
+                <version>0.0.7</version>
+                <executions>
+                    <execution>
+                        <id>extract-template</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <args>
+                                <arg>--solr-version="${solr.version}"</arg>
+                                <arg>--target="${solr.configset.directory}"</arg>
+                                <arg>extract-zip</arg>
+                                <arg>--zip="${project.build.directory}/solr-${solr.version}.zip"</arg>
+                            </args>
+                            <script>${solrteur.script}</script>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>compile-solrconfig-xml</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <args>
+                                <arg>--solr-version="${solr.version}"</arg>
+                                <arg>--target="${solr.configset.directory}"</arg>
+                                <arg>solrconfig</arg>
+                                <arg>--xslts="${project.resources[0].directory}/solrconfig-xslt"</arg>
+                            </args>
+                            <script>${solrteur.script}</script>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>compile-schema</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <args>
+                                <arg>--solr-version="${solr.version}"</arg>
+                                <arg>--target="${solr.configset.directory}"</arg>
+                                <arg>schema</arg>
+                                <!--<arg>-tsvs="${project.basedir}/../../scripts/api/data/metadatablocks"</arg>-->
+                                <arg>--tsvs="${project.resources[0].directory}/tsv"</arg>
+                                <arg>--base="${project.resources[0].directory}/schema.xml"</arg>
+                            </args>
+                            <script>${solrteur.script}</script>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+    
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>test-solr-config</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <buildDirectory>${project.build.directory}</buildDirectory>
+                            </systemPropertyVariables>
+                            
+                            <groups>SolrConfig</groups>
+                            <includes>
+                                <include>**/*Test.java</include>
+                                <include>**/*IT.java</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <dependencies>
+        <dependency>
+            <groupId>info.picocli</groupId>
+            <artifactId>picocli</artifactId>
+            <version>4.6.3</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.saxon</groupId>
+            <artifactId>Saxon-HE</artifactId>
+            <version>10.6</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-core</artifactId>
+            <version>${solr.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <profiles>
+        <profile>
+            <id>zip</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>${maven-assembly-plugin.version}</version>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <finalName>${project.artifactId}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/default.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>create-archive</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    
+        <profile>
+            <id>ct</id>
+            <properties>
+                <solr.packaging.type>docker</solr.packaging.type>
+                <solr.configsets.path>/opt/solr/server/solr/configsets</solr.configsets.path>
+                <solr.memory>1073741824</solr.memory> <!-- = 1 GiB in bytes -->
+            </properties>
+            <build>
+                <plugins>
+                    <!-- Build image via Docker Maven Plugin -->
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <startParallel>true</startParallel>
+                            <images>
+                                <image>
+                                    <alias>solr</alias>
+                                    <name>${ct.orgname}/solr:${revision}</name>
+                                    <registry>${ct.registry}</registry>
+                                    <build>
+                                        <from>solr:${solr.version}</from>
+                                        <!-- Tune some settings by default for Dataverse usage -->
+                                        <env>
+                                            <!-- Use 80% of RAM as heap space by default, using the JVM Container Limits support -->
+                                            <!-- Ratios taken from https://github.com/fabric8io-images/run-java-sh/blob/master/TUNING.md#recommandations -->
+                                            <SOLR_JAVA_MEM>-XX:MaxRAMPercentage=80.0 -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40</SOLR_JAVA_MEM>
+                                            <!-- To avoid "401 - URI too long" errors we need to set a larger request size -->
+                                            <SOLR_OPTS>-Dsolr.jetty.request.header.size=102400</SOLR_OPTS>
+                                        </env>
+                                        <labels>
+                                            <!-- Git details are coming from the git plugin, see parent module -->
+                                            <org.opencontainers.image.created>${git.build.time}</org.opencontainers.image.created>
+                                            <org.opencontainers.image.authors><![CDATA[Research Data Management at FZJ <forschungsdaten@fz-juelich.de>]]></org.opencontainers.image.authors>
+                                            <org.opencontainers.image.url>https://k8s-docs.gdcc.io</org.opencontainers.image.url>
+                                            <org.opencontainers.image.documentation>https://k8s-docs.gdcc.io</org.opencontainers.image.documentation>
+                                            <org.opencontainers.image.source>https://github.com/gdcc/dataverse/tree/develop%2Bct/modules/solr-configset</org.opencontainers.image.source>
+                                            <org.opencontainers.image.version>${project.version}</org.opencontainers.image.version>
+                                            <org.opencontainers.image.revision>${git.commit.id.abbrev}</org.opencontainers.image.revision>
+                                            <org.opencontainers.image.vendor>Global Dataverse Community Consortium</org.opencontainers.image.vendor>
+                                            <org.opencontainers.image.licenses>Apache-2.0</org.opencontainers.image.licenses>
+                                            <org.opencontainers.image.title>gdcc/solr :: Dataverse-ready Solr</org.opencontainers.image.title>
+                                            <org.opencontainers.image.description>This container image provides a Dataverse-ready Solr Search Index.</org.opencontainers.image.description>
+                                        </labels>
+                                        <assembly>
+                                            <targetDir>${solr.configsets.path}</targetDir>
+                                            <descriptor>${project.basedir}/src/assembly/default.xml</descriptor>
+                                        </assembly>
+                                    </build>
+                                    <!-- Run via Maven: mvn -Pct package docker:run -->
+                                    <run>
+                                        <cmd>
+                                            <shell>solr-precreate ${solr.collection} ${solr.configsets.path}/${solr.configset}</shell>
+                                        </cmd>
+                                        <!-- Limit to 1 GiB memory by default, but allow overrides via property -->
+                                        <memory>${solr.memory}</memory>
+                                        <ports>
+                                            <port>8983:8983</port>
+                                        </ports>
+                                        <volumes>
+                                            <bind>
+                                                <volume>solr-temp-volume:/var/solr</volume>
+                                            </bind>
+                                        </volumes>
+                                    </run>
+                                </image>
+                            </images>
+                            <volumes>
+                                <volume>
+                                    <name>solr-temp-volume</name>
+                                    <driver>local</driver>
+                                    <opts>
+                                        <type>tmpfs</type>
+                                        <device>tmpfs</device>
+                                        <o>size=256m,uid=8939</o>
+                                    </opts>
+                                    <labels>
+                                        <volatileData>true</volatileData>
+                                    </labels>
+                                </volume>
+                            </volumes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
+</project>
\ No newline at end of file
diff --git a/modules/solr-configset/src/assembly/default.xml b/modules/solr-configset/src/assembly/default.xml
new file mode 100644
index 00000000000..87487791d81
--- /dev/null
+++ b/modules/solr-configset/src/assembly/default.xml
@@ -0,0 +1,19 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    <id>default</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${solr.configset.directory}</directory>
+            <outputDirectory>${solr.configset}</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
+
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/cmd/CompileSchema.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/cmd/CompileSchema.java
new file mode 100644
index 00000000000..c63232b1edc
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/cmd/CompileSchema.java
@@ -0,0 +1,222 @@
+package io.gdcc.solrteur.cmd;
+
+import io.gdcc.solrteur.mdb.tsv.Block;
+import io.gdcc.solrteur.mdb.MetadataBlockTSVReader;
+import io.gdcc.solrteur.mdb.tsv.Field;
+import io.gdcc.solrteur.mdb.tsv.ParserException;
+import io.gdcc.solrteur.solrteur;
+import picocli.CommandLine;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@CommandLine.Command(
+    name = "schema",
+    mixinStandardHelpOptions = true,
+    usageHelpAutoWidth = true,
+    showDefaultValues = true,
+    sortOptions = false,
+    description = "Compile the schema.xml from a template and add metadata fields from blocks%n")
+public class CompileSchema implements Callable<Integer> {
+    
+    @CommandLine.ParentCommand
+    private solrteur cliParent;
+    
+    @CommandLine.Option(required = true,
+        names = {"--base"},
+        paramLabel = "<file>",
+        description = "Path to the base schema.xml, to be enriched with fields from blocks")
+    private String baseSchemaPath;
+    
+    @CommandLine.Option(required = true,
+        names = {"--tsvs"},
+        paramLabel = "<dir/file>",
+        description = "Repeatable argument to directories and/or TSV files with metadata blocks.")
+    private Path[] mdbTsvPaths;
+    
+    @CommandLine.Option(required = false,
+        names = {"--mfb"},
+        paramLabel = "<string>",
+        description = "String to indicate a mark after which all <field> should be inserted.",
+        defaultValue = "SCHEMA-FIELDS::BEGIN")
+    private String markFieldsBegin;
+    
+    @CommandLine.Option(required = false,
+        names = {"--mfe"},
+        paramLabel = "<string>",
+        description = "String to indicate a mark where insertion of all <field> shall end.",
+        defaultValue = "SCHEMA-FIELDS::END")
+    private String markFieldsEnd;
+    
+    @CommandLine.Option(required = false,
+        names = {"--mcfb"},
+        paramLabel = "<string>",
+        description = "String to indicate a mark after which all <copyField> should be inserted.",
+        defaultValue = "SCHEMA-COPY-FIELDS::BEGIN")
+    private String markCopyFieldsBegin;
+    
+    @CommandLine.Option(required = false,
+        names = {"--mcfe"},
+        paramLabel = "<string>",
+        description = "String to indicate a mark where insertion of all <copyField> shall end.",
+        defaultValue = "SCHEMA-COPY-FIELDS::END")
+    private String markCopyFieldsEnd;
+    
+    /**
+     * Business logic routine, calling all the execution steps.
+     * @return The exit code
+     */
+    @Override
+    public Integer call() throws Exception {
+        getFieldsFromBlocks();
+        
+        return CommandLine.ExitCode.OK;
+    }
+    
+    private void getFieldsFromBlocks() throws solrteur.AbortScriptException {
+    
+        MetadataBlockTSVReader reader = new MetadataBlockTSVReader();
+        
+        // Walk all locations and add files to a large list
+        List<Path> allTsvFiles = new ArrayList<>();
+        for (Path path : mdbTsvPaths) {
+            if (Files.isDirectory(path)) {
+                allTsvFiles.addAll(findTsvFiles(path));
+            } else if (Files.isReadable(path) && Files.isRegularFile(path)) {
+                allTsvFiles.add(path);
+            }
+        }
+    
+        // Much nicer in output if sorted
+        Collections.sort(allTsvFiles);
+        
+        // Iterate the files and read the blocks to have a set of 'em (necessary for cross-checking fields)
+        Map<Block, Path> blockPathMap = new HashMap<>();
+        boolean hadErrors = false;
+        for (Path path : allTsvFiles) {
+            try {
+                List<String> lines = Files.readAllLines(path, StandardCharsets.UTF_8);
+                Block block = reader.retrieveBlock(lines);
+                
+                if (blockPathMap.containsKey(block)) {
+                    throw new ParserException("Metadata block " + block.getName() + "already present in " + blockPathMap.get(block) + "!");
+                }
+                blockPathMap.put(block, path);
+                
+            } catch (ParserException e) {
+                // Log a warning but continue parsing with next file to get done as much as possible.
+                hadErrors = true;
+                logErrors(path, e);
+            } catch (IOException e) {
+                // Log a warning but continue parsing with next file to get done as much as possible.
+                hadErrors = true;
+                solrteur.Logger.warn(new solrteur.AbortScriptException("Could not read "+path, e));
+            }
+        }
+    
+        // Abort here if there were errors
+        if (hadErrors) {
+            throw new solrteur.AbortScriptException("Experienced parsing errors, fix your block definitions first to continue", null);
+        }
+        
+        // If all blocks could be read and are valid, let's extract the fields
+        Map<Block, List<Field>> blockFieldsMap = new HashMap<>();
+        Set<Block> blocks = blockPathMap.keySet();
+    
+        for (Map.Entry<Block, Path> mdb : blockPathMap.entrySet()) {
+            Block block = mdb.getKey();
+            Path path = mdb.getValue();
+
+            try {
+                List<String> lines = Files.readAllLines(path, StandardCharsets.UTF_8);
+                // First store all retrieved fields, we check on uniqueness later
+                blockFieldsMap.put(block, reader.retrieveFields(lines, blocks));
+            } catch (ParserException e) {
+                // Log a warning but continue parsing with next file to get done as much as possible.
+                hadErrors = true;
+                logErrors(path, e);
+            } catch (IOException e) {
+                // Log a warning but continue parsing with next file to get done as much as possible.
+                hadErrors = true;
+                solrteur.Logger.warn(new solrteur.AbortScriptException("Could not read "+path, e));
+            }
+        }
+    
+        // Abort here if there were errors
+        if (hadErrors) {
+            throw new solrteur.AbortScriptException("Experienced parsing errors, fix your field definitions first to continue", null);
+        }
+        
+        // We need to check uniqueness of fields across blocks
+        Map<Field,Block> fieldBlockMap = new HashMap<>();
+        for (Map.Entry<Block,List<Field>> entry : blockFieldsMap.entrySet()) {
+            Block block = entry.getKey();
+            System.out.println("BLOCK: " + block.getName());
+            
+            for (Field field : entry.getValue()) {
+                System.out.println("    FIELD: " + field.getName());
+                
+                if (fieldBlockMap.containsKey(field)) {
+                    hadErrors = true;
+                    solrteur.Logger.warn("Duplicate field '" + field.getName() + "' in block '" + block.getName() +
+                        "' from '" + blockPathMap.get(block) + "': already defined by block '" +
+                        fieldBlockMap.get(field).getName() + "' from '" + blockPathMap.get(fieldBlockMap.get(field)) + "'");
+                } else {
+                    fieldBlockMap.put(field, block);
+                }
+            }
+        }
+    
+        // Abort here if there were errors
+        if (hadErrors) {
+            throw new solrteur.AbortScriptException("Stopping analysis", null);
+        }
+    
+    }
+    private void injectFields() {}
+    private void injectCopyFields() {}
+    
+    private List<Path> findTsvFiles(Path dir) throws solrteur.AbortScriptException {
+        if (!Files.isDirectory(dir)) {
+            return List.of();
+        }
+        
+        try (Stream<Path> walk =  Files.walk(dir, 2)) {
+            return walk
+                .filter(Files::isRegularFile)
+                .filter(Files::isReadable)
+                .filter(path -> path.toString().endsWith(".tsv"))
+                .sorted()
+                .collect(Collectors.toList());
+        } catch (IOException e) {
+            throw new solrteur.AbortScriptException("Could not walk over TSV files at " + dir, e);
+        }
+    }
+    
+    private void logErrors(final Path path, final ParserException e) {
+        String fileName = path.getFileName().toString();
+        logPE(fileName, "", "", e);
+    }
+    
+    private void logPE(final String fileName, final String lineNumber, final String indent, final ParserException e) {
+        String ln = lineNumber.isEmpty() ? e.getLineNumber() : lineNumber;
+        
+        solrteur.Logger.warn(fileName + ln + ": " + indent + e.getMessage());
+        for (ParserException pe : e.getSubExceptions()) {
+            logPE(fileName, ln, indent + "  ", pe);
+        }
+    }
+}
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/cmd/CompileSolrConfig.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/cmd/CompileSolrConfig.java
new file mode 100644
index 00000000000..0a5269f2d99
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/cmd/CompileSolrConfig.java
@@ -0,0 +1,120 @@
+//DEPS net.sf.saxon:Saxon-HE:10.6
+
+package io.gdcc.solrteur.cmd;
+
+import io.gdcc.solrteur.solrteur;
+import net.sf.saxon.s9api.Processor;
+import net.sf.saxon.s9api.SaxonApiException;
+import net.sf.saxon.s9api.Serializer;
+import net.sf.saxon.s9api.Xslt30Transformer;
+import net.sf.saxon.s9api.XsltCompiler;
+import net.sf.saxon.s9api.XsltExecutable;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.ParentCommand;
+import picocli.CommandLine.Option;
+
+import javax.xml.transform.stream.StreamSource;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import io.gdcc.solrteur.solrteur.AbortScriptException;
+import io.gdcc.solrteur.solrteur.Logger;
+
+@Command(name = "solrconfig",
+    mixinStandardHelpOptions = true,
+    usageHelpAutoWidth = true,
+    showDefaultValues = true,
+    sortOptions = false,
+    description = "Compile the solrconfig.xml from a source and XSLT files%n")
+public class CompileSolrConfig implements Callable<Integer> {
+    
+    @ParentCommand
+    private solrteur cliParent;
+    
+    @Option(required = true,
+        names = {"--xslts"},
+        paramLabel = "<dir>",
+        description = "Path to the directory with XSLTs to adapt solrconfig.xml")
+    private String solrConfigXSLTDir;
+    
+    /**
+     * Business logic routine, calling all the execution steps.
+     * @return The exit code
+     */
+    @Override
+    public Integer call() throws Exception {
+        applySolrConfigXSLT();
+        return CommandLine.ExitCode.OK;
+    }
+    
+    private void applySolrConfigXSLT() throws AbortScriptException {
+        Logger.info("Starting to transform solrconfig.xml...");
+        
+        final Path solrConfig = cliParent.getTargetDir().resolve(Path.of("conf", "solrconfig.xml"));
+        final Path xsltDir = Path.of(solrConfigXSLTDir);
+        
+        // Find all the XSLT files
+        final List<Path> xsltFiles;
+        try (Stream<Path> walk =  Files.walk(xsltDir, 2)) {
+            xsltFiles = walk.filter(path -> path.toFile().isFile())
+                .filter(path -> path.toString().endsWith("xslt"))
+                .sorted()
+                .collect(Collectors.toList());
+        } catch (IOException e) {
+            throw new AbortScriptException("Could not walk over XSLT files at " + xsltDir, e);
+        }
+        
+        // Log found XSLT files
+        Logger.info("Found XSLT files in " + solrConfigXSLTDir + ":");
+        for (Path xsltFile : xsltFiles) {
+            Logger.info(xsltFile.toString().substring(xsltDir.toString().length()+1));
+        }
+        
+        // Setup the XSLT processor
+        final Processor processor = new Processor(false);
+        final XsltCompiler compiler = processor.newXsltCompiler();
+        
+        try {
+            
+            // First iteration uses initial solrconfig.xml as input source
+            StreamSource source = new StreamSource(Files.newInputStream(solrConfig));
+            
+            // For every XSLT, we need to do the transformation and rotate the input source afterwards,
+            // so we apply the next transformation to the already transformed content.
+            for (Path xsltFile : xsltFiles) {
+                final XsltExecutable stylesheet = compiler.compile(new StreamSource(Files.newInputStream(xsltFile)));
+                
+                // Prepare a fresh temporary file (which will be deleted when we read it back for the next iteration)
+                final Path tmpFile = Files.createTempFile(null, null);
+                Serializer out = processor.newSerializer(Files.newOutputStream(tmpFile));
+                
+                // Actual transformation happens
+                Xslt30Transformer transformer = stylesheet.load30();
+                transformer.transform(source, out);
+                
+                // Read back the transformed config and rotate the source. The opening option makes the old temp file
+                // go away after it has been read.
+                source = new StreamSource(Files.newInputStream(tmpFile, StandardOpenOption.DELETE_ON_CLOSE));
+            }
+            
+            // The final transformation still reads back the final result, so we need to push InputStream content somewhere
+            Files.copy(source.getInputStream(),
+                solrConfig,
+                StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException e) {
+            throw new AbortScriptException("Could not complete solrconfig.xml compilation", e);
+        } catch (SaxonApiException e) {
+            throw new AbortScriptException("XML transformation failed", e);
+        }
+        
+        Logger.info("Finished applying XSLT transformations, saved to " + solrConfig);
+    }
+}
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/cmd/ExtractConfigSet.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/cmd/ExtractConfigSet.java
new file mode 100644
index 00000000000..e51c4ec2457
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/cmd/ExtractConfigSet.java
@@ -0,0 +1,109 @@
+package io.gdcc.solrteur.cmd;
+
+import io.gdcc.solrteur.solrteur;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.ParentCommand;
+import picocli.CommandLine.Option;
+
+import java.io.IOException;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.concurrent.Callable;
+
+import io.gdcc.solrteur.solrteur.AbortScriptException;
+import io.gdcc.solrteur.solrteur.Logger;
+
+@Command(
+    name = "extract-zip",
+    mixinStandardHelpOptions = true,
+    usageHelpAutoWidth = true,
+    showDefaultValues = true,
+    sortOptions = false,
+    description = "Extract default configset from Solr ZIP distribution%n")
+public class ExtractConfigSet implements Callable<Integer> {
+    
+    @ParentCommand
+    private solrteur cliParent;
+    
+    @Option(required = true,
+        names = {"--zip"},
+        paramLabel = "<file>",
+        description = "Path to local Solr ZIP distribution file")
+    private Path solrZipFile;
+    
+    @Option(required = false,
+        names = {"--zip-subpath"},
+        paramLabel = "<path>",
+        description = "Relative path within ZIP to _default configset",
+        defaultValue = "solr-{{ solr.version }}/server/solr/configsets/_default")
+    private String solrConfigSetZipPath;
+    
+    /**
+     * Business logic routine, calling all the execution steps.
+     * @return The exit code
+     */
+    @Override
+    public Integer call() throws Exception {
+        replaceVariables();
+        extractConfigSet();
+        return CommandLine.ExitCode.OK;
+    }
+    
+    private void replaceVariables() throws AbortScriptException {
+        this.solrConfigSetZipPath = this.solrConfigSetZipPath.replaceAll("\\Q{{ solr.version }}\\E", cliParent.getSolrVersion());
+    }
+    
+    private void extractConfigSet() throws AbortScriptException {
+        // Wrap the file system in a try-with-resources statement
+        // to auto-close it when finished and prevent a memory leak
+        // NOTE: the explicit casting to ClassLoader is necessary to make this compatible with JDK 11 _and_ 17
+        try (FileSystem zipFileSystem = FileSystems.newFileSystem(solrZipFile, (ClassLoader) null)) {
+            Path zipSource = zipFileSystem.getPath(solrConfigSetZipPath);
+            
+            // TODO: should we delete the target before copying the new content? (Usually this shouldn't change, but better safe than sorry?)
+            
+            Logger.info("Extracting " + solrConfigSetZipPath + " from " + solrZipFile + " into " + cliParent.getTargetDir());
+            Files.walkFileTree(zipSource, new SimpleFileVisitor<>() {
+                // Copy the directory structure (skip existing with the same name)
+                @Override
+                public FileVisitResult preVisitDirectory(Path zippedDir, BasicFileAttributes attrs) throws IOException {
+                    // Remove the leading path part from the ZIP file structure, as we don't want it in target
+                    String strippedZipPath = zippedDir.toString().substring(solrConfigSetZipPath.length());
+                    Path targetDir = Path.of(cliParent.getTargetDir().toString(), strippedZipPath);
+                    
+                    try {
+                        //Logger.info(solrZipFile + ":" + zippedDir + " -> " + targetDir);
+                        Files.copy(zippedDir, targetDir, StandardCopyOption.COPY_ATTRIBUTES);
+                    } catch (FileAlreadyExistsException e) {
+                        // intentional ignore - simply reuse the existing directory
+                    }
+                    
+                    return FileVisitResult.CONTINUE;
+                }
+                
+                // Copy & replace files already present (which makes any run idempotent by deleting the former run)
+                @Override
+                public FileVisitResult visitFile(Path zippedFile, BasicFileAttributes attrs) throws IOException {
+                    String strippedZipPath = zippedFile.toString().substring(solrConfigSetZipPath.length());
+                    Path targetFile = Path.of(cliParent.getTargetDir().toString(), strippedZipPath);
+    
+                    //Logger.info(solrZipFile + ":" + zippedFile + " -> " + targetFile);
+                    Files.copy(zippedFile, targetFile, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
+                    
+                    return FileVisitResult.CONTINUE;
+                }
+            });
+            
+        } catch(IOException e) {
+            throw new AbortScriptException("Extracting from ZIP file "+solrZipFile+" failed", e);
+        }
+    }
+}
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/cmd/package-info.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/cmd/package-info.java
new file mode 100644
index 00000000000..485085204df
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/cmd/package-info.java
@@ -0,0 +1 @@
+package io.gdcc.solrteur.cmd;
\ No newline at end of file
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/MetadataBlockTSVReader.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/MetadataBlockTSVReader.java
new file mode 100644
index 00000000000..71699efdf75
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/MetadataBlockTSVReader.java
@@ -0,0 +1,184 @@
+package io.gdcc.solrteur.mdb;
+
+import io.gdcc.solrteur.mdb.tsv.Block;
+import io.gdcc.solrteur.mdb.tsv.Configuration;
+import io.gdcc.solrteur.mdb.tsv.Field;
+import io.gdcc.solrteur.mdb.tsv.ParserException;
+import io.gdcc.solrteur.mdb.tsv.ParsingState;
+
+import javax.swing.text.html.parser.Parser;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class MetadataBlockTSVReader {
+    
+    private Configuration config;
+    
+    public MetadataBlockTSVReader() {
+        this.config = Configuration.defaultConfig();
+    }
+    
+    public MetadataBlockTSVReader(Configuration config) {
+        this.config = config;
+    }
+    
+    /**
+     * Extract the metadata block definition from a single TSV file and return it.
+     * @param lines
+     * @return
+     * @throws ParserException
+     */
+    public Block retrieveBlock(final List<String> lines) throws ParserException {
+        // Assertions
+        Objects.requireNonNull(lines, "You must provide a list of strings, it may be empty but not null");
+        
+        ParsingState state = ParsingState.Init;
+        Block.BlockBuilder blockBuilder = null;
+        ParserException parentException = new ParserException("Has errors:");
+        int lineIndex = 0;
+        
+        for (String line : lines) {
+            // Skip lines that are empty, blanks only or comments
+            if (line.isBlank() || line.startsWith(config.commentIndicator())) {
+                // Increment line counter before skipping to next line
+                lineIndex++;
+                continue;
+            }
+            
+            // If the line starts with a new section trigger, analyse the state
+            if (line.startsWith(config.triggerIndicator())) {
+                state = state.transitionState(line, config);
+                
+                // Being here means we transitioned from one state to the next - otherwise there would have been an exception.
+                switch (state) {
+                    case MetadataBlock:
+                        try {
+                            blockBuilder = new Block.BlockBuilder(line, config);
+                        } catch (ParserException e) {
+                            // This is critical, as we cannot parse the following lines with a broken header
+                            throw e.withLineNumber(lineIndex);
+                        }
+                        break;
+                    case Fields:
+                        Objects.requireNonNull(blockBuilder, "BlockBuilder not initialized, cannot build block");
+    
+                        // In case there had been parsing errors, stop here
+                        if (parentException.hasSubExceptions()) {
+                            throw parentException;
+                        }
+    
+                        // We managed to complete parsing the block section, return the block now.
+                        // The last line of the block section is the line before this one (which transitioned the state)
+                        return blockBuilder.build(lineIndex-1);
+                    default:
+                        // Intentionally left blank, as the other sections are of no interest to us here.
+                }
+            } else {
+                // Proceed analysis
+                switch(state) {
+                    case Init: throw new ParserException("Only comments, empty or blank lines allowed before block definition")
+                        .withLineNumber(lineIndex);
+                    case MetadataBlock:
+                        Objects.requireNonNull(blockBuilder, "BlockBuilder not initialized, cannot parse");
+                        try {
+                            blockBuilder.parseAndValidateLine(line);
+                        } catch (ParserException e) {
+                            parentException.addSubException(e.withLineNumber(lineIndex));
+                        }
+                        break;
+                    default:
+                        throw new ParserException("We should never see this exception, as we looked for the block only")
+                            .withLineNumber(lineIndex);
+                }
+            }
+            
+            // Increment line counter
+            lineIndex++;
+        }
+        
+        // The trigger switch did not kick in - only one explanation.
+        throw new ParserException("Missing fields section.");
+    }
+    
+    public List<Field> retrieveFields(final List<String> lines, final Set<Block> knownBlocks) throws ParserException {
+        Objects.requireNonNull(lines, "You must provide a list of strings, it may be empty but not null");
+        Objects.requireNonNull(knownBlocks, "You must provide a set of known blocks, it may be empty");
+        
+        // Read the block again, so we are at that stage and can continue with fields
+        Block currentBlock = retrieveBlock(lines);
+        ParsingState state = ParsingState.MetadataBlock;
+        
+        int lineIndex = currentBlock.getIndexLastLineofBlockSection()+1;
+        List<String> linesAfterBlock = lines.stream()
+            .skip(lineIndex)
+            .collect(Collectors.toUnmodifiableList());
+    
+        Field.FieldsBuilder fieldsBuilder = null;
+        ParserException parentException = new ParserException("Has errors:");
+    
+        for (String line : linesAfterBlock) {
+            // Skip lines that are empty, blanks only or comments
+            if (line.isBlank() || line.startsWith(config.commentIndicator())) {
+                // Increment line counter
+                lineIndex++;
+                continue;
+            }
+        
+            // If the line starts with a new section trigger, analyse the state
+            if (line.startsWith(config.triggerIndicator())) {
+                state = state.transitionState(line, config);
+            
+                // Being here means we transitioned from one state to the next - otherwise there would have been an exception.
+                switch (state) {
+                    case Fields:
+                        try {
+                            fieldsBuilder = new Field.FieldsBuilder(line, currentBlock.getName(), config);
+                        } catch (ParserException e) {
+                            // This is critical, as we cannot parse the following lines with a broken header
+                            throw e.withLineNumber(lineIndex);
+                        }
+                        break;
+                    case Vocabularies:
+                        // We managed to get to the vocab section, meaning the fields are all done. Return fields!
+                        Objects.requireNonNull(fieldsBuilder, "FieldsBuilder not initialized, cannot build fields");
+                        
+                        // In case there had been parsing errors, stop here
+                        if (parentException.hasSubExceptions()) {
+                            throw parentException;
+                        }
+                        
+                        return fieldsBuilder.build();
+                    default:
+                        // Intentionally left blank, as the other sections are of no interest to us here.
+                }
+            } else {
+                // Proceed analysis
+                switch (state) {
+                    case Fields:
+                        Objects.requireNonNull(fieldsBuilder, "FieldsBuilder not initialized, cannot parse");
+                        
+                        try{
+                            // TODO: Extend with checking if this field is for a different block (which is allowed by spec)
+                            fieldsBuilder.parseAndValidateLine(lineIndex, line);
+                        } catch (ParserException e) {
+                            parentException.addSubException(e.withLineNumber(lineIndex));
+                        }
+                        
+                        break;
+                    default:
+                        throw new ParserException("We should never see this exception, as we looked for the fields only")
+                            .withLineNumber(lineIndex);
+                }
+            }
+    
+            // Increment line counter
+            lineIndex++;
+        }
+    
+        // The trigger switch did not kick in - only one explanation.
+        throw new ParserException("Missing fields section.");
+    }
+    
+}
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/package-info.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/package-info.java
new file mode 100644
index 00000000000..a74044f0e2b
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/package-info.java
@@ -0,0 +1 @@
+package io.gdcc.solrteur.mdb;
\ No newline at end of file
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/Block.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/Block.java
new file mode 100644
index 00000000000..b294b949e4f
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/Block.java
@@ -0,0 +1,288 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+public final class Block {
+    public static final String KEYWORD = "metadataBlock";
+    public static final String NAME_PATTERN = "[a-z]+(([\\d_])|([A-Z0-9][a-z0-9]+))*([A-Z])?";
+    
+    /**
+     * Programmatic variant of the spec of a #metadataBlock. List all the column headers and associated restrictions
+     * on the values of a column.
+     */
+    public enum Header {
+        KEYWORD(
+            Block.KEYWORD,
+            String::isEmpty,
+            "must have no value (be empty)"
+        ),
+        NAME(
+            "name",
+            Predicate.not(String::isBlank).and(Pattern.compile(Block.NAME_PATTERN).asMatchPredicate()),
+            "must not be blank and match regex pattern " + Block.NAME_PATTERN
+        ),
+        DATAVERSE_ALIAS(
+            "dataverseAlias",
+            Predicate.not(String::isBlank).or(String::isEmpty),
+            "must be either empty or not blank"
+        ),
+        DISPLAY_NAME(
+            "displayName",
+            Predicate.not(String::isBlank).and(h -> h.length() < 257),
+            "must not be blank and shorter than 256 chars"
+        ),
+        BLOCK_URI(
+            "blockURI",
+            Validator::isValidUrl,
+            "must be a valid URL"
+        );
+        
+        private final String value;
+        private final Predicate<String> test;
+        private final String errorMessage;
+        
+        Header(final String value, final Predicate<String> test, final String errorMessage) {
+            this.value = value;
+            this.test = test;
+            this.errorMessage = errorMessage;
+        }
+        
+        private static final Map<String, Header> valueMap;
+        static {
+            Map<String, Header> map = new ConcurrentHashMap<>();
+            Arrays.stream(Header.values()).forEach(h -> map.put(h.toString(), h));
+            valueMap = Collections.unmodifiableMap(map);
+        }
+        
+        /**
+         * Inverse lookup of a {@link Header} from a {@link String}.
+         *
+         * @param value A textual string to look up.
+         * @return Matching {@link Header} wrapped in {@link Optional} or an empty {@link Optional}.
+         */
+        public static Optional<Header> getByValue(String value) {
+            return Optional.ofNullable(valueMap.get(value));
+        }
+        
+        /**
+         * Retrieve all column headers of a metadata block definition as a spec-like list of strings,
+         * usable for validation and more. The list is ordered as the spec defines the order of the headers.
+         *
+         * @return List of the column headers, in order
+         */
+        public static List<String> getHeaders() {
+            return Arrays.stream(Header.values()).map(Header::toString).collect(Collectors.toUnmodifiableList());
+        }
+        
+        /**
+         * Parse a {@link String} as a header of a metadata block definition. Will validate the presence or absence
+         * of column headers as defined by the spec. This is not a lenient parser - headers need to comply with order
+         * from the spec. On the other hand, it is case-insensitive.
+         *
+         * @param line The textual line to parse for column headers
+         * @param config The parser configuration to be used
+         * @return A list of {@link Header} build from the line of text
+         * @throws ParserException When presented column headers are missing, invalid or the complete line is just wrong.
+         * @throws IllegalStateException When a column header cannot be found within the enum {@link Header}.
+         *                               This should never happen, as the validation would fail before!
+         */
+        public static List<Header> parseAndValidate(final String line, final Configuration config) throws ParserException {
+            List<String> validatedColumns = Validator.validateHeaderLine(line, getHeaders(), config);
+            // the IllegalStateException shall never happen, as we already validated the header!
+            return validatedColumns.stream()
+                .map(Header::getByValue)
+                .map(o -> o.orElseThrow(IllegalStateException::new))
+                .collect(Collectors.toUnmodifiableList());
+        }
+        
+        @Override
+        public String toString() {
+            return value;
+        }
+        
+        /**
+         * Test a given {@link String} if it matches the restrictions applied on values of this type.
+         *
+         * @param sut The textual string to test.
+         * @return True if matching or false in every other case.
+         */
+        public boolean isValid(final String sut) {
+            return sut != null && test.test(sut);
+        }
+        
+        /**
+         * Receive a proper error message for this type of value (should be extended with more context in calling code!).
+         *
+         * @return The error message, always in the form of "must ...". (Create a sentence with it.)
+         */
+        public String getErrorMessage() {
+            return errorMessage;
+        }
+    }
+    
+    /**
+     * Blocks should not be build directly, but using this builder pattern. This allows for validation before handing
+     * over an object to work with and containing a complete POJO representation of a (custom) metadata block.
+     */
+    public static final class BlockBuilder {
+        private final Configuration config;
+        private final List<Header> header;
+        
+        private Block block;
+        private boolean hasErrors = false;
+        
+        /**
+         * Create a builder with a line containing the header of the metadata block definition, so the order of
+         * the columns can be determined from it. (The builder is stateful.)
+         *
+         * @param header The textual line with the column headers.
+         * @throws ParserException
+         */
+        public BlockBuilder(final String header, final Configuration config) throws ParserException {
+            this.config = config;
+            this.header = Block.Header.parseAndValidate(header, config);
+        }
+        
+        /**
+         * Analyse a line containing a concrete metadata block definition by parsing and validating it.
+         *
+         * This will fail:
+         * - when the line is null or blanks only
+         * - when another line has been analysed before (spec allows only 1 definition in a single custom metadata block)
+         * - when the columns within the line do not match the length of the header
+         * - when the column values do not match the column type restrictions (as implied by the header)
+         *
+         * The exception might contain sub-exceptions, as the parser will do its best to keep going and find as many
+         * problems as possible to avoid unnecessary (pesky) re-iterations.
+         *
+         * @param line The metadata block definition line to analyse.
+         * @throws ParserException If the parsing fails (see description).
+         */
+        public void parseAndValidateLine(final String line) throws ParserException {
+            // no null or blank lines for the parser. (blank lines can be skipped and not sent here by calling code)
+            if (line == null || line.isBlank()) {
+                this.hasErrors = true;
+                throw new ParserException("Must not be empty nor blanks only nor null.");
+            }
+            
+            // only 1 block definition allowed as per spec
+            if (this.block != null) {
+                this.hasErrors = true;
+                throw new ParserException("Must not add more than one metadata block definition");
+            } else {
+                this.block = parseAndValidateColumns(line.split(config.columnSeparator()));
+            }
+        }
+        
+        /**
+         * Parse and validate the columns (usually given by {@code parseAndValidateLine}).
+         * This is package private, becoming testable this way.
+         *
+         * @param lineParts
+         * @return A {@link Block} object (modifiable for builder internal use)
+         * @throws ParserException
+         */
+        Block parseAndValidateColumns(final String[] lineParts) throws ParserException {
+            if (lineParts == null || lineParts.length != header.size()) {
+                throw new ParserException("Does not match length of metadata block headline");
+            }
+            
+            Block block = new Block();
+            ParserException parserException = new ParserException("Has validation errors:");
+            
+            for (int i = 0; i < lineParts.length; i++) {
+                Block.Header column = header.get(i);
+                String value = lineParts[i];
+                if( ! column.isValid(value)) {
+                    parserException.addSubException(
+                        "Invalid value '" + value + "' for column '" + column + "', " + column.getErrorMessage());
+                } else {
+                    block.set(column, value);
+                }
+            }
+            
+            if (parserException.hasSubExceptions()) {
+                // setting this to true to ensure no block will be created accidentally via build().
+                this.hasErrors = true;
+                throw parserException;
+            } else {
+                return block;
+            }
+        }
+        
+        public boolean hasSucceeded() {
+            return ! this.hasErrors && this.block != null;
+        }
+        
+        /**
+         * Execute the builder to create the {@link Block} POJO, containing the representation of the custom metadata
+         * block that has been analysed. Will execute associated field builders (which will execute associated
+         * vocabulary builders).
+         */
+        public Block build(int indexLastLineofBlockSection) {
+            if (hasSucceeded()) {
+                block.indexLastLineofBlockSection = indexLastLineofBlockSection;
+                return block;
+            } else {
+                throw new IllegalStateException("Trying to build a block with errors or without parsing a line first");
+            }
+        }
+    }
+    
+    /* ---- Actual Block Class starting here ---- */
+    
+    private final Map<Header,String> properties = new EnumMap<>(Header.class);
+    private List<Field> fields = Collections.emptyList();
+    private int indexLastLineofBlockSection;
+    
+    private Block() {}
+    
+    private void set(Header column, String value) {
+        this.properties.put(column, value);
+    }
+    public Optional<String> get(Header column) {
+        return Optional.ofNullable(this.properties.get(column));
+    }
+    public String get(Header column, String defaultValue) {
+        return this.properties.getOrDefault(column, defaultValue);
+    }
+    
+    public int getIndexLastLineofBlockSection() {
+        return indexLastLineofBlockSection;
+    }
+    
+    public String getName() {
+        return this.properties.get(Header.NAME);
+    }
+    
+    /**
+     * Get fields for this metadata block.
+     * @return List of fields. May be empty, but never null.
+     */
+    public List<Field> getFields() {
+        return fields;
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Block)) return false;
+        Block block = (Block) o;
+        return this.getName().equals(block.getName());
+    }
+    
+    @Override
+    public int hashCode() {
+        return Objects.hash(properties);
+    }
+}
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/Configuration.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/Configuration.java
new file mode 100644
index 00000000000..5bce96576a8
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/Configuration.java
@@ -0,0 +1,67 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public final class Configuration {
+    
+    private final String comment;
+    private final String trigger;
+    private final String column;
+    private final Matcher rtrimMatcher;
+    private final Boolean allowDeepFieldNesting;
+    
+    public Configuration(
+        String comment,
+        String trigger,
+        String column,
+        boolean allowDeepFieldNesting
+    ) {
+        notNullNotEmpty("Comment indicator", comment);
+        this.comment = comment;
+    
+        notNullNotEmpty("Triggering indicator (keyword prefix)", trigger);
+        this.trigger = trigger;
+    
+        notNullNotEmpty("Column separator", column);
+        this.column = column;
+        
+        this.rtrimMatcher = Pattern.compile("(" + this.column + ")+$").matcher("");
+        
+        this.allowDeepFieldNesting = allowDeepFieldNesting;
+    }
+    
+    public static Configuration defaultConfig() {
+        return new Configuration("%%", "#", "\t", false);
+    }
+    
+    private static void notNullNotEmpty(String optionName, String value) {
+        if (value == null || value.isEmpty()) {
+            throw new IllegalArgumentException(optionName + " may not be null or empty");
+        }
+    }
+    
+    public String commentIndicator() {
+        return comment;
+    }
+    
+    public String triggerIndicator() {
+        return trigger;
+    }
+    
+    public String columnSeparator() {
+        return column;
+    }
+    
+    public String rtrimColumns(String line) {
+        return line == null ? null : rtrimMatcher.reset(line).replaceAll("");
+    }
+    
+    public String trigger(String keyword) {
+        return this.triggerIndicator() + keyword;
+    }
+    
+    public boolean deepFieldNestingEnabled() {
+        return this.allowDeepFieldNesting;
+    }
+}
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/ControlledVocabulary.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/ControlledVocabulary.java
new file mode 100644
index 00000000000..487b2198079
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/ControlledVocabulary.java
@@ -0,0 +1,114 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+public final class ControlledVocabulary {
+    
+    public static final String KEYWORD = "controlledVocabulary";
+
+    /**
+     * Programmatic variant of the spec of a #controlledVocabulary. List all the column headers and associated restrictions
+     * on the values of a column.
+     */
+    public enum Header {
+        // TODO: add the rest of the fields
+        KEYWORD(
+            ControlledVocabulary.KEYWORD,
+            String::isEmpty,
+            "must have no value (be empty)"
+        );
+    
+        private final String value;
+        private final Predicate<String> test;
+        private final String errorMessage;
+    
+        Header(final String value, final Predicate<String> test, final String errorMessage) {
+            this.value = value;
+            this.test = test;
+            this.errorMessage = errorMessage;
+        }
+    
+        Header(final String value) {
+            this.value = value;
+            this.test = Predicate.not(String::isBlank);
+            this.errorMessage = "must not be empty or blank";
+        }
+    
+        private static final Map<String, Header> valueMap;
+        static {
+            Map<String, Header> map = new ConcurrentHashMap<>();
+            Arrays.stream(Header.values()).forEach(h -> map.put(h.toString(), h));
+            valueMap = Collections.unmodifiableMap(map);
+        }
+    
+        /**
+         * Inverse lookup of a {@link ControlledVocabulary.Header} from a {@link String}.
+         *
+         * @param value A textual string to look up.
+         * @return Matching {@link ControlledVocabulary.Header} wrapped in {@link Optional} or an empty {@link Optional}.
+         */
+        public static Optional<ControlledVocabulary.Header> getByValue(String value) {
+            return Optional.ofNullable(valueMap.get(value));
+        }
+    
+        /**
+         * Retrieve all column headers of controlled vocabulary definitions as a spec-like list of strings,
+         * usable for validation and more. The list is ordered as the spec defines the order of the headers.
+         *
+         * @return List of the column headers, in order
+         */
+        public static List<String> getHeaders() {
+            return List.copyOf(valueMap.keySet());
+        }
+    
+        /**
+         * Parse a {@link String} as a header of a metadata block definition. Will validate the presence or absence
+         * of column headers as defined by the spec. This is not a lenient parser - headers need to comply with order
+         * from the spec. On the other hand, it is case-insensitive.
+         *
+         * @param line The textual line to parse for column headers
+         * @param config The parser configuration to be used
+         * @return A list of {@link ControlledVocabulary.Header} build from the line of text
+         * @throws ParserException When presented column headers are missing, invalid or the complete line is just wrong.
+         * @throws IllegalStateException When a column header cannot be found within the enum {@link ControlledVocabulary.Header}.
+         *                               This should never happen, as the validation would fail before!
+         */
+        public static List<ControlledVocabulary.Header> parseAndValidate(final String line, final Configuration config) throws ParserException {
+            List<String> validatedColumns = Validator.validateHeaderLine(line, getHeaders(), config);
+            // the exception shall never happen, as we already validated the header!
+            return validatedColumns.stream()
+                .map(ControlledVocabulary.Header::getByValue)
+                .map(o -> o.orElseThrow(IllegalStateException::new))
+                .collect(Collectors.toUnmodifiableList());
+        }
+    
+        @Override
+        public String toString() {
+            return value;
+        }
+    
+        public boolean isValid(final String sut) {
+            return sut != null && test.test(sut);
+        }
+    
+        public String getErrorMessage() {
+            return errorMessage;
+        }
+    }
+    
+    public static final class ControlledVocabularyBuilder {
+        // TODO: extend!
+        public ControlledVocabulary build() {
+            return new ControlledVocabulary();
+        }
+    }
+    
+    private ControlledVocabulary() {}
+}
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/Field.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/Field.java
new file mode 100644
index 00000000000..d6eff8a25ef
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/Field.java
@@ -0,0 +1,500 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+public final class Field {
+    
+    public static final String KEYWORD = "datasetField";
+    
+    /**
+     * Currently, the spec says we need to comply with Solr and DDI rules.
+     * De-facto commonly used are camel-cased names.
+     * See also https://solr.apache.org/guide/8_11/defining-fields.html#field-properties
+     *
+     * This regex matches the strict Solr name spec plus adds "." as valid chars
+     * (we need it for comptability with astrophysics.tsv)
+     */
+    public static final String NAME_PATTERN = "^(?=_[\\w.]+[^_]$|[^_][\\w.]+_?$)[a-zA-Z_][\\w.]+$";
+    public static final String WHITESPACE_ONLY = "^\\s+$";
+    
+    public static final Predicate<String> matchBoolean = s -> "TRUE".equals(s) || "FALSE".equals(s);
+    public static final Predicate<String> matchParentDisplayFormat = Pattern.compile("^[;,:]?$").asMatchPredicate();
+    
+    /**
+     * Programmatic variant of the spec of a #datasetField. List all the column headers and associated restrictions
+     * on the values of a column.
+     */
+    public enum Header {
+        KEYWORD(
+            Field.KEYWORD,
+            String::isEmpty,
+            "must have no value (be empty)"
+        ),
+        
+        NAME(
+            "name",
+            Predicate.not(String::isBlank).and(Pattern.compile(Field.NAME_PATTERN).asMatchPredicate()),
+            "must not be blank and match regex pattern " + Field.NAME_PATTERN
+        ),
+        TITLE("title"),
+        DESCRIPTION("description"),
+        WATERMARK(
+            "watermark",
+            Predicate.not(Pattern.compile(WHITESPACE_ONLY).asMatchPredicate()),
+            "must not be whitespace only"
+        ),
+        
+        FIELDTYPE(
+            "fieldType",
+            Types.matchesTypes(),
+            "must be one of [" + String.join(", ", Types.getTypesList()) + "]"
+        ),
+        
+        DISPLAY_ORDER(
+            "displayOrder",
+            Pattern.compile("\\d+").asMatchPredicate(),
+            "must be a non-negative integer"
+        ),
+        DISPLAY_FORMAT(
+            "displayFormat",
+            Predicate.not(Pattern.compile(WHITESPACE_ONLY).asMatchPredicate()),
+            "must not be whitespace only"
+        ),
+        
+        ADVANCED_SEARCH_FIELD("advancedSearchField", matchBoolean, "must be 'TRUE' or 'FALSE"),
+        ALLOW_CONTROLLED_VOCABULARY("allowControlledVocabulary", matchBoolean, "must be 'TRUE' or 'FALSE"),
+        ALLOW_MULTIPLES("allowmultiples", matchBoolean, "must be 'TRUE' or 'FALSE"),
+        FACETABLE("facetable", matchBoolean, "must be 'TRUE' or 'FALSE"),
+        DISPLAY_ON_CREATE("displayoncreate", matchBoolean, "must be 'TRUE' or 'FALSE"),
+        REQUIRED("required", matchBoolean, "must be 'TRUE' or 'FALSE"),
+        
+        PARENT(
+            "parent",
+            Pattern.compile(Field.NAME_PATTERN).asMatchPredicate().or(String::isEmpty),
+            "must be either empty or match regex pattern " + Field.NAME_PATTERN
+        ),
+        METADATABLOCK_ID(
+            "metadatablock_id",
+            Predicate.not(String::isBlank).and(Pattern.compile(Block.NAME_PATTERN).asMatchPredicate()),
+            "must not be blank and match regex pattern " + Block.NAME_PATTERN
+        ),
+        TERM_URI(
+            "termURI",
+            s -> s.isEmpty() || Validator.isValidUrl(s),
+            "must be empty or a valid URL"
+        );
+        
+        private final String value;
+        private final Predicate<String> test;
+        private final String errorMessage;
+        
+        Header(final String value, final Predicate<String> test, final String errorMessage) {
+            this.value = value;
+            this.test = test;
+            this.errorMessage = errorMessage;
+        }
+        
+        Header(final String value) {
+            this.value = value;
+            this.test = Predicate.not(String::isBlank);
+            this.errorMessage = "must not be empty or blank";
+        }
+        
+        private static final Map<String, Header> valueMap;
+        static {
+            Map<String, Header> map = new ConcurrentHashMap<>();
+            Arrays.stream(Header.values()).forEach(h -> map.put(h.toString(), h));
+            valueMap = Collections.unmodifiableMap(map);
+        }
+    
+        /**
+         * Inverse lookup of a {@link Field.Header} from a {@link String}.
+         *
+         * @param value A textual string to look up.
+         * @return Matching {@link Field.Header} wrapped in {@link Optional} or an empty {@link Optional}.
+         */
+        public static Optional<Header> getByValue(String value) {
+            return Optional.ofNullable(valueMap.get(value));
+        }
+    
+        /**
+         * Retrieve all column headers of field definitions as a spec-like list of strings,
+         * usable for validation and more. The list is ordered as the spec defines the order of the headers.
+         *
+         * @return List of the column headers, in order
+         */
+        public static List<String> getHeaders() {
+            return Arrays.stream(Header.values()).map(Header::toString).collect(Collectors.toUnmodifiableList());
+        }
+    
+        /**
+         * Parse a {@link String} as a header of field definitions. Will validate the presence or absence
+         * of column headers as defined by the spec. This is not a lenient parser - headers need to comply with order
+         * from the spec. On the other hand, it is case-insensitive.
+         *
+         * @param line The textual line to parse for column headers
+         * @param config The parser configuration to be used
+         * @return A list of {@link Field.Header} build from the line of text
+         * @throws ParserException When presented column headers are missing, invalid or the complete line is just wrong.
+         * @throws IllegalStateException When a column header cannot be found within the enum {@link Field.Header}.
+         *                               This should never happen, as the validation would fail before!
+         */
+        public static List<Header> parseAndValidate(final String line, final Configuration config) throws ParserException {
+            List<String> validatedColumns = Validator.validateHeaderLine(line, getHeaders(), config);
+            // the exception shall never happen, as we already validated the header!
+            return validatedColumns.stream()
+                .map(Header::getByValue)
+                .map(o -> o.orElseThrow(IllegalStateException::new))
+                .collect(Collectors.toUnmodifiableList());
+        }
+        
+        @Override
+        public String toString() {
+            return value;
+        }
+        
+        public boolean isValid(final String sut) {
+            return sut != null && test.test(sut);
+        }
+        
+        public String getErrorMessage() {
+            return errorMessage;
+        }
+    }
+    
+    public enum Types implements Predicate<String> {
+        NONE("none"),
+        DATE("date"),
+        EMAIL("email"),
+        TEXT("text"),
+        TEXTBOX("textbox"),
+        URL("url"),
+        INT("int"),
+        FLOAT("float");
+        
+        private final String name;
+        
+        Types(final String name) {
+            this.name = name;
+        }
+    
+        private static final Map<String, Types> valueMap;
+        static {
+            Map<String, Types> map = new ConcurrentHashMap<>();
+            Arrays.stream(Types.values()).forEach(type -> map.put(type.toString(), type));
+            valueMap = Collections.unmodifiableMap(map);
+        }
+    
+        @Override
+        public boolean test(String sut) {
+            // we demand correct case!
+            return this.toString().equals(sut);
+        }
+        
+        public static Predicate<String> matchesTypes() {
+            Predicate<String> test = NONE;
+            for (Types type : Types.values()) {
+                test = test.or(type);
+            }
+            return test;
+        }
+        
+        public static List<String> getTypesList() {
+            return valueMap.keySet().stream().collect(Collectors.toUnmodifiableList());
+        }
+        
+        @Override
+        public String toString() {
+            return this.name;
+        }
+    }
+    
+    public static final class FieldsBuilder {
+        private final Configuration config;
+        private final String containingBlockName;
+        private final List<Header> header;
+        private final List<Field> fields;
+        
+        private int parsedLines = 0;
+    
+        /**
+         * Create a parser for field lines. As this is  on the block it
+         * @param headerLine
+         * @param containingBlockName
+         * @param config
+         * @throws ParserException
+         */
+        public FieldsBuilder(final String headerLine, String containingBlockName, final Configuration config) throws ParserException {
+            this.header = Header.parseAndValidate(headerLine, config);
+            this.containingBlockName = containingBlockName;
+            this.config = config;
+            this.fields = new ArrayList<>();
+        }
+        
+        /**
+         * Analyse a line containing a concrete dataset field definition by parsing and validating it.
+         *
+         * This will fail:
+         * - when the line is null or blanks only
+         * - when the columns within the line do not match the length of the header
+         * - when the column values do not match the column type restrictions (as implied by the header)
+         *
+         * The exception might contain sub-exceptions, as the parser will do its best to keep going and find as many
+         * problems as possible to avoid unnecessary (pesky) re-iterations.
+         *
+         * Beware:
+         * 1. This method does not check for parent/child dependencies, as the spec does not say parent fields
+         *    must be defined first. This needs to be done by {@link #build()}, as this is the indication all lines
+         *    have been attempted to parse.
+         *
+         * @param line The dataset field definition line to analyse.
+         * @throws ParserException If the parsing fails (see description).
+         */
+        public void parseAndValidateLine(final int lineIndex, final String line) throws ParserException {
+            // no null or blank lines for the parser. (blank lines can be skipped and not sent here by calling code)
+            if (line == null || line.isBlank()) {
+                throw new ParserException("must not be empty nor blanks only nor null.").withLineNumber(lineIndex);
+            }
+            
+            // save the field for further builder internal manipulation
+            // (if validation fails, the exception will prevent it)
+            this.fields.add(parseAndValidateColumns(lineIndex, line.split(config.columnSeparator())));
+        }
+        
+        /**
+         * Parse and validate the columns (usually given by {@code parseAndValidateLine}).
+         * This is package private, becoming testable this way.
+         *
+         * @param lineParts
+         * @return A {@link Block} object (modifiable for builder internal use)
+         * @throws ParserException
+         */
+        Field parseAndValidateColumns(final int lineIndex, final String[] lineParts) throws ParserException {
+            if (lineParts == null || lineParts.length > header.size()) {
+                throw new ParserException("Not matching length of dataset fields headline");
+            }
+            
+            Field field = new Field(lineIndex);
+            ParserException parserException = new ParserException("Has validation errors:").withLineNumber(lineIndex);
+            
+            for (int i = 0; i < lineParts.length; i++) {
+                Field.Header column = header.get(i);
+                String value = lineParts[i];
+                if( ! column.isValid(value)) {
+                    parserException.addSubException(
+                        "Invalid value '" + value + "' for column '" + column + "', " + column.getErrorMessage());
+                } else {
+                    field.set(column, value);
+                }
+            }
+            
+            // TODO: extend with the possibility to reference a different, but existing other block (also not recommended)
+            // check the metadata block reference matches the block this field is defined in
+            field.get(Header.METADATABLOCK_ID).ifPresent(id -> {
+                if (! this.containingBlockName.equals(id)) {
+                    parserException.addSubException(
+                        "Metadata block reference '" + id +
+                            "' does not match parsed containing block '" + this.containingBlockName + "'");
+                }
+            });
+            
+            if (parserException.hasSubExceptions()) {
+                throw parserException;
+            } else {
+                return field;
+            }
+        }
+        
+        // TODO: extract distinct checks and move to separate methods to reduce complexity
+        public List<Field> build() throws ParserException {
+            // Check if all fields are unique within this block
+            List<String> duplicates = fields.stream()
+                .collect(Collectors.groupingBy(Field::getName))
+                .entrySet()
+                .stream()
+                .filter(entry -> entry.getValue().size() > 1)
+                .map(Map.Entry::getKey)
+                .collect(Collectors.toUnmodifiableList());
+            
+            // This is critical - we cannot build relations when duplicates are present. Step away now.
+            if (!duplicates.isEmpty()) {
+                throw new ParserException("Found duplicate field definitions for '" + String.join("', '", duplicates) + "'");
+            }
+            
+            // Create parent / child relations for compound fields and validate
+            // a) Get all fields that claim to have a parent
+            List<Field> children = fields.stream()
+                .filter(field -> !field.get(Header.PARENT, "").isEmpty())
+                .collect(Collectors.toUnmodifiableList());
+    
+            ParserException parentException = new ParserException("Compound field errors:");
+            // b) Search and associate the parent field to these children
+            for (Field child : children) {
+                // Always non-null as we filtered for this before, so will never be "" (but we avoid the Optional)
+                String parentName = child.get(Header.PARENT, "");
+                
+                Optional<Field> parentCandidate = fields.stream()
+                    .filter(field -> field.getName().equals(parentName))
+                    .findFirst();
+                
+                if (parentCandidate.isEmpty()) {
+                    parentException.addSubException(
+                        new ParserException("'" + child.getName() + "' misses its parent '" + parentName + "'")
+                            .withLineNumber(child.lineIndex));
+                } else {
+                    // TODO: when this parsing is extended to allow fields belonging to other blocks, this would
+                    //       need extension to verify the parent candidate is within the same metadata block
+                    Field parent = parentCandidate.get();
+                    
+                    // Associate children and parents
+                    child.parent = parent;
+                    parent.children.add(child);
+                }
+            }
+            
+            // Check no cyclic dependencies present / deep nesting is optional.
+            // First, fetch fields that are children and parents at the same time:
+            List<Field> parentChilds = fields.stream()
+                .filter(field -> field.isParent() && field.isChild())
+                .collect(Collectors.toUnmodifiableList());
+            
+            // When deep nesting is disabled, this list must be empty (only 1 level of nesting allowed means
+            // there cannot be any parents that are children at the same time)
+            if (!config.deepFieldNestingEnabled() && !parentChilds.isEmpty()) {
+                parentChilds.forEach(field ->
+                    parentException.addSubException(
+                        new ParserException("'" + field.getName() + "' is not allowed to be parent and child at once")
+                            .withLineNumber(field.lineIndex)));
+            // With deep nesting enabled, cyclic dependencies might happen. Need to recurse over these elements.
+            } else if (config.deepFieldNestingEnabled() && !parentChilds.isEmpty()) {
+                parentChilds.forEach(field -> {
+                    if (hasCyclicDependency(field, field.parent)) {
+                        parentException.addSubException(
+                            new ParserException("'" + field.getName() + "' is part of a cyclic dependency")
+                                .withLineNumber(field.lineIndex));
+                    }
+                });
+            }
+            
+            // Ensure compound parents are a) of type "none", b) have no displayFormat other than ":", ";" or "," and
+            // are c) not facetable and d) not allowed to use a CV
+            List<Field> parents = fields.stream()
+                .filter(Field::isParent)
+                .collect(Collectors.toUnmodifiableList());
+            
+            parents.forEach(field -> {
+                // a) type none
+                // The first check shall never be true, but just in case...
+                if (field.get(Header.FIELDTYPE).isEmpty() || !Types.NONE.test(field.get(Header.FIELDTYPE).get())) {
+                    parentException.addSubException(
+                        new ParserException("'" + field.getName() + "' is a parent but does not have 'fieldType'='none'")
+                            .withLineNumber(field.lineIndex));
+                }
+                // b) displayFormat contains only ":", ";" or "," or empty
+                if (field.get(Header.DISPLAY_FORMAT).isEmpty() || !matchParentDisplayFormat.test(field.get(Header.DISPLAY_FORMAT).get())) {
+                    parentException.addSubException(
+                        new ParserException("'" + field.getName() + "' is a parent but 'displayFormat' is not empty or from [;,:]")
+                            .withLineNumber(field.lineIndex));
+                }
+                // c) not facetable
+                if (field.get(Header.FACETABLE).isEmpty() || field.get(Header.FACETABLE).get().equals("TRUE")) {
+                    parentException.addSubException(
+                        new ParserException("'" + field.getName() + "' is a parent but has 'facetable'='TRUE'")
+                            .withLineNumber(field.lineIndex));
+                }
+                // c) not using a CV
+                if (field.get(Header.ALLOW_CONTROLLED_VOCABULARY).isEmpty() || field.get(Header.ALLOW_CONTROLLED_VOCABULARY).get().equals("TRUE")) {
+                    parentException.addSubException(
+                        new ParserException("'" + field.getName() + "' is a parent but has 'allowControlledVocabulary'='TRUE'")
+                            .withLineNumber(field.lineIndex));
+                }
+            });
+    
+            // TODO: Extend check here with:
+            //       1) Unique numbers in displayOrder (attention: compound fields!) - should it print warnings when unsorted?
+            //       2) Warnings for facetable fields with suboptimal field types
+            //       3) Check if any compound fields are optional but have required children and warn about potential unwanted conditional requirements
+            //       4) Check no primitive (non-parent) field has type "none"
+            //       5) ...
+            
+            // Now either die or return fields
+            if (parentException.hasSubExceptions()) {
+                throw parentException;
+            }
+            return List.copyOf(fields);
+        }
+        
+        private boolean hasCyclicDependency(final Field root, final Field parent) {
+            // Found ourselves - stop recursion here.
+            if (parent == root) {
+                return true;
+            }
+            // Simple recursive search. Should be cheap enough for our expected workload.
+            if (parent.parent != null) {
+                return hasCyclicDependency(root, parent.parent);
+            } else {
+                return false;
+            }
+        }
+    }
+    
+    /* ---- Actual Field Class starting here ---- */
+    
+    private Field parent;
+    private final List<Field> children = new ArrayList<>();
+    private final Map<Header, String> properties = new EnumMap<>(Header.class);
+    private final int lineIndex;
+    
+    private Field(int lineIndex) {
+        this.lineIndex = lineIndex;
+    }
+    
+    private void set(final Header column, final String value) {
+        this.properties.put(column, value);
+    }
+    public Optional<String> get(final Header column) {
+        return Optional.ofNullable(properties.get(column));
+    }
+    public String get(final Header column, final String defaultValue) {
+        return properties.getOrDefault(column, defaultValue);
+    }
+    
+    public String getName() {
+        // Will always be non-null after creating the field with the builder
+        return properties.get(Header.NAME);
+    }
+    
+    public boolean isParent() {
+        return !this.children.isEmpty();
+    }
+    
+    public boolean isChild() {
+        return this.parent != null;
+    }
+    
+    List<ControlledVocabulary> controlledVocabularyValues = List.of();
+    
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Field)) return false;
+        Field field = (Field) o;
+        return field.getName().equals(this.getName());
+    }
+    
+    @Override
+    public int hashCode() {
+        return Objects.hash(properties);
+    }
+}
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/ParserError.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/ParserError.java
new file mode 100644
index 00000000000..fd120ce4f1e
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/ParserError.java
@@ -0,0 +1,16 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+public final class ParserError {
+    String message;
+    Integer lineNumber;
+    
+    public ParserError(String message, Integer lineNumber) {
+        this.message = message;
+        this.lineNumber = lineNumber;
+    }
+    
+    public ParserError(ParserException exception, Integer lineNumber) {
+        this.message = exception.getMessage();
+        this.lineNumber = lineNumber;
+    }
+}
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/ParserException.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/ParserException.java
new file mode 100644
index 00000000000..dca7f86b44a
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/ParserException.java
@@ -0,0 +1,39 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class ParserException extends Throwable {
+    
+    private final List<ParserException> subExceptions = new ArrayList<>(0);
+    private int lineNumber = -1;
+    
+    public ParserException(String message) {
+        super(message);
+    }
+    
+    public boolean hasSubExceptions() {
+        return !subExceptions.isEmpty();
+    }
+    
+    public void addSubException(String message) {
+        this.subExceptions.add(new ParserException(message));
+    }
+    
+    public void addSubException(ParserException ex) {
+        this.subExceptions.add(ex);
+    }
+    
+    public List<ParserException> getSubExceptions() {
+        return List.copyOf(subExceptions);
+    }
+    
+    public String getLineNumber() {
+        return lineNumber > 0 ? ":"+lineNumber : "";
+    }
+    
+    public ParserException withLineNumber(int lineIndex) {
+        this.lineNumber = lineIndex + 1;
+        return this;
+    }
+}
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/ParsingState.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/ParsingState.java
new file mode 100644
index 00000000000..731cbc939c5
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/ParsingState.java
@@ -0,0 +1,54 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+public enum ParsingState {
+    Vocabularies(ControlledVocabulary.KEYWORD),
+    Fields(Field.KEYWORD, Vocabularies),
+    MetadataBlock(Block.KEYWORD, Fields),
+    // This state is only used exactly once and should never be reached from input.
+    // For safety, make the validation fail.
+    Init(null, MetadataBlock);
+    
+    private final String stateKeyword;
+    private final ParsingState nextState;
+    
+    ParsingState(String keyword, ParsingState next) {
+        this.stateKeyword = keyword;
+        this.nextState = next;
+    }
+    
+    /**
+     * Create final state (no next step)
+     * @param trigger
+     */
+    ParsingState(String keyword) {
+        this.stateKeyword = keyword;
+        this.nextState = this;
+    }
+    
+    public boolean isAllowedFinalState() {
+        return this == Fields || this == Vocabularies;
+    }
+    
+    /**
+     * Return the next state if the given line is triggering the change correctly.
+     * Wrong header lines will trigger exceptions.
+     *
+     * @param headerLine The line to analyse for switching to the next parsing state
+     * @param config The parser configuration
+     * @return The new state (will throw if line not valid)
+     * @throws ParserException When the given line wasn't the expected one to transition the state
+     */
+    public ParsingState transitionState(String headerLine, Configuration config) throws ParserException {
+        // if not null, not starting the same state again (no loops allowed) and starting the correct next state, return the next state
+        if(headerLine != null &&
+           ! headerLine.startsWith(config.trigger(this.stateKeyword)) &&
+           headerLine.startsWith(config.trigger(this.nextState.stateKeyword))) {
+            return this.nextState;
+        }
+        // otherwise, throw a parsing exception
+        throw new ParserException("Found invalid header '" +
+            (headerLine == null ? "null" : headerLine.substring(0, Math.min(25, headerLine.length()))) +
+            "...' while " +
+            (this.stateKeyword == null ? "initializing." : "in section '" + this.stateKeyword + "'."));
+    }
+}
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/Validator.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/Validator.java
new file mode 100644
index 00000000000..2c950f1fd91
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/mdb/tsv/Validator.java
@@ -0,0 +1,120 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+public final class Validator {
+    
+    /**
+     * Test if a given value is a valid {@link java.net.URL}
+     *
+     * Remember, Java only supports HTTP/S, file and JAR protocols by default!
+     * Any URL not using such a protocol will not be considered a valid URL!
+     * {@see <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/net/URL.html#%3Cinit%3E(java.lang.String,java.lang.String,int,java.lang.String)">URL Constructor Summary</a>}
+     *
+     * @param url The value to test
+     * @return True if valid URL, false otherwise
+     */
+    public static boolean isValidUrl(String url) {
+        try {
+            new URL(url).toURI();
+            return true;
+        } catch (MalformedURLException | URISyntaxException e) {
+            return false;
+        }
+    }
+    
+    /**
+     * Split and validate a textual line declared to be a header of custom metadata block definition section
+     * (the block, the fields or controlled vocabularies). Will return a list of the headers found (if they match) and
+     * when being a spec conform header line.
+     *
+     * As this function retrieves the relevant spec parts as parameters, it can be reused for all sections.
+     * You will need to transform into the resulting list into real Header enum values within calling code.
+     *
+     * This validator is strict with naming and order of appearance (must be same as spec), but is lenient
+     * about case (so you might use camel/pascal case variants).
+     *
+     * @param headerLine The textual line to analyse.
+     * @param validOrderedHeaders A list of Strings with the column headers from the spec in order of appearance.
+     * @param config The configuration to use
+     * @return A list of the found headers in normalized form if matching the spec
+     * @throws ParserException If any validation fails. Contains sub-exceptions with validation details.
+     */
+    static List<String> validateHeaderLine(final String headerLine,
+                                           final List<String> validOrderedHeaders,
+                                           final Configuration config) throws ParserException {
+        // start a parenting parser exception to be filled with errors as subexceptions
+        ParserException ex = new ParserException("Invalid headline:");
+    
+        if (headerLine == null || headerLine.isBlank()) {
+            ex.addSubException("Header may not be null, empty or whitespace only");
+            throw ex;
+        }
+        
+        // test for trigger being present
+        if (! headerLine.startsWith(config.triggerIndicator())) {
+            ex.addSubException("Trigger sign '" + config.triggerIndicator() + "' not found");
+            throw ex;
+        }
+        
+        // the actual split and validate length
+        String[] headerSplit = headerLine
+            .substring(config.triggerIndicator().length()) // remove the trigger indicator first
+            .split(config.columnSeparator());
+        // missing headers?
+        if (headerSplit.length < validOrderedHeaders.size()) {
+            ex.addSubException(
+                "Less fields (" + headerSplit.length + ") found than required (" + validOrderedHeaders.size() + ").");
+        } else if (headerSplit.length > validOrderedHeaders.size()) {
+            ex.addSubException(
+                "More fields (" + headerSplit.length + ") found than required (" + validOrderedHeaders.size() + ").");
+        }
+    
+        // allocate a list of validated columns
+        List<String> validatedColumns = new ArrayList<>();
+        
+        // iterate the found header values
+        for (int i = 0; i < headerSplit.length; i++) {
+            String columnHeader = headerSplit[i];
+            
+            // is the value a valid one? (in order of appearance and existing, but ignoring case)
+            if (i < validOrderedHeaders.size() && validOrderedHeaders.get(i).equalsIgnoreCase(columnHeader)) {
+                // add as entry of validated and present headers (to be used for line mapping)
+                // BUT use the normalized variant (makes comparisons easier)
+                validatedColumns.add(validOrderedHeaders.get(i));
+            // when invalid, mark as such
+            } else {
+                ex.addSubException(
+                    "Column " + (i+1) + " contains '" + columnHeader + "', but spec expects " +
+                    (i < validOrderedHeaders.size() ? "'"+validOrderedHeaders.get(i)+"'" : "nothing") + " to be here."
+                );
+                // additional hint when valid, but accidentally already present
+                if (validatedColumns.stream().anyMatch(columnHeader::equalsIgnoreCase)) {
+                    ex.addSubException("Column " + (i+1) + " contains valid '" + columnHeader + "' already present.");
+                }
+            }
+        }
+        
+        // when there are headers missing, report them
+        if ( validatedColumns.size() < validOrderedHeaders.size() ) {
+            for (int i = 0; i < validOrderedHeaders.size(); i++) {
+                String missingHeader = validOrderedHeaders.get(i);
+                if (validatedColumns.stream().noneMatch(missingHeader::equalsIgnoreCase)) {
+                    ex.addSubException("Missing column '" + missingHeader + "' from position " + (i+1) + ".");
+                }
+            }
+        }
+        
+        // Will only return the header column mapping if and only if the validation did not find errors.
+        // use an unmodifiable version of the list to avoid accidents without notice. Else throw the exception.
+        if (ex.hasSubExceptions()) {
+            throw ex;
+        } else {
+            return List.copyOf(validatedColumns);
+        }
+    }
+}
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/package-info.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/package-info.java
new file mode 100644
index 00000000000..ef7bd55f222
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/package-info.java
@@ -0,0 +1 @@
+package io.gdcc.solrteur;
\ No newline at end of file
diff --git a/modules/solr-configset/src/main/java/io/gdcc/solrteur/solrteur.java b/modules/solr-configset/src/main/java/io/gdcc/solrteur/solrteur.java
new file mode 100644
index 00000000000..1a8fa5ae69b
--- /dev/null
+++ b/modules/solr-configset/src/main/java/io/gdcc/solrteur/solrteur.java
@@ -0,0 +1,117 @@
+///usr/bin/env jbang "$0" "$@" ; exit $?
+//
+//SOURCES cmd/*.java
+//SOURCES mdb/*.java
+//SOURCES mdb/**/*.java
+//
+//DEPS info.picocli:picocli:4.6.3
+
+package io.gdcc.solrteur;
+
+import io.gdcc.solrteur.cmd.CompileSchema;
+import io.gdcc.solrteur.cmd.ExtractConfigSet;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+
+import io.gdcc.solrteur.cmd.CompileSolrConfig;
+
+import java.nio.file.Path;
+
+/**
+ * This class is the main entry point into the different functions of handling different aspects of
+ * the Dataverse Solr flavor.
+ *
+ * (The name "solrteur" is a remix of the German word "Solarteur" which means "solar technician".)
+ */
+@Command(name = solrteur.CLI_NAME,
+    mixinStandardHelpOptions = true,
+    usageHelpAutoWidth = true,
+    version = solrteur.CLI_NAME+" "+ solrteur.CLI_VERSION,
+    description = "Execute different tasks around Dataverse and Solr",
+    subcommands = {
+        ExtractConfigSet.class,
+        CompileSolrConfig.class,
+        CompileSchema.class
+    },
+    synopsisSubcommandLabel = "COMMAND")
+public class solrteur {
+    public final static String CLI_NAME = "solrteur";
+    public final static String CLI_VERSION = "1.0";
+    
+    @Option(
+        required = true,
+        names = {"--solr-version", "-s"},
+        paramLabel = "<x.y.z>",
+        description = "Which version of Solr to use, e. g. 8.9 or 8.11.1")
+    private String solrVersion;
+    
+    public String getSolrVersion() {
+        return this.solrVersion;
+    }
+    
+    @Option(required = true,
+        names = {"--target", "-t"},
+        paramLabel = "<dir>",
+        description = "Path to a target directory")
+    private Path targetDir;
+    
+    public Path getTargetDir() {
+        return this.targetDir;
+    }
+    
+    @Option(
+        names = {"--quiet", "-q"},
+        description = "Decrease verbosity"
+    )
+    static boolean quiet;
+    
+    /**
+     * A wrapper for Throwables to create a checked exception that leads to aborting the execution
+     */
+    public static final class AbortScriptException extends Exception {
+        private AbortScriptException() {}
+        public AbortScriptException(String msg, Throwable cause) {
+            super(msg, cause);
+        }
+    }
+    /**
+     * Static inner logging wrapper for convenience.
+     * This is here because we don't want to add more clutter of a logging framework
+     * to the Maven output where we use this from.
+     */
+    public static final class Logger {
+        static void log(String message) {
+            System.out.println(message);
+        }
+        static void logError(String message) {
+            System.err.println(message);
+        }
+        
+        public static void info(String message) {
+            if (!quiet) {
+                log(message);
+            }
+        }
+        public static void info(AbortScriptException ex) {
+            if (!quiet) {
+                log(ex.getMessage());
+                log(ex.getCause().getMessage());
+            }
+        }
+    
+        public static void warn(String message) {
+            logError(message);
+        }
+        
+        public static void warn(AbortScriptException ex) {
+            logError(ex.getMessage());
+            logError(ex.getCause().getMessage());
+        }
+    }
+    
+    public static void main(String... args) {
+        int exitCode = new CommandLine(new solrteur()).execute(args);
+        System.exit(exitCode);
+    }
+}
diff --git a/conf/solr/8.11.1/schema.xml b/modules/solr-configset/src/main/resources/schema.xml
similarity index 100%
rename from conf/solr/8.11.1/schema.xml
rename to modules/solr-configset/src/main/resources/schema.xml
diff --git a/modules/solr-configset/src/main/resources/solrconfig-xslt/01-disable-schemaless.xslt b/modules/solr-configset/src/main/resources/solrconfig-xslt/01-disable-schemaless.xslt
new file mode 100644
index 00000000000..a9a9da12229
--- /dev/null
+++ b/modules/solr-configset/src/main/resources/solrconfig-xslt/01-disable-schemaless.xslt
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
+    
+    <!-- First copy all existing XML over -->
+    <xsl:template match="node()|@*">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*"/>
+        </xsl:copy>
+    </xsl:template>
+    
+    <!--
+        Disable schemaless mode as per https://solr.apache.org/guide/8_8/schemaless-mode.html#enable-field-class-guessing
+        by switching the default use to "false" for the processor chain activating schemaless operation.
+        
+        The setting may also be configured via a Solr user property (see https://solr.apache.org/guide/8_8/schemaless-mode.html#disabling-automatic-field-guessing)
+        or using "update.autoCreateFields=false" in core.properties.
+        
+        You can test this XSLT via http://xsltransform.net/eiZQFqt - remember to copy a current base solrconfig.xml into it.
+    -->
+    <xsl:template match="/config/updateRequestProcessorChain[@name='add-unknown-fields-to-the-schema']/@default">
+        <xsl:attribute name="default">
+            <xsl:value-of select="'${update.autoCreateFields:false}'"/>
+        </xsl:attribute>
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/modules/solr-configset/src/main/resources/solrconfig-xslt/02-search-boosting.xslt b/modules/solr-configset/src/main/resources/solrconfig-xslt/02-search-boosting.xslt
new file mode 100644
index 00000000000..2d4e8d39987
--- /dev/null
+++ b/modules/solr-configset/src/main/resources/solrconfig-xslt/02-search-boosting.xslt
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
+    
+    <!-- First copy all existing XML over -->
+    <xsl:template match="node()|@*">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*"/>
+        </xsl:copy>
+    </xsl:template>
+    
+    <!-- Add boosting config XML inside of selected element -->
+    <xsl:template match="/config/requestHandler[@name='/select'][@class='solr.SearchHandler']/lst[@name='defaults']">
+        <xsl:copy>
+            <xsl:copy-of select="@*|node()[not(contains('defType|tie|qf|pf|bq',@name))]|comment()|text()"/>
+            <xsl:comment>
+                This boosting configuration has been
+                first introduced in 2015, see https://github.com/IQSS/dataverse/issues/1928#issuecomment-91651853,
+                been re-introduced in 2018 for Solr 7.2.1 update, see https://github.com/IQSS/dataverse/issues/4158,
+                and finally evolved to the current state later in 2018 https://github.com/IQSS/dataverse/issues/4938
+                (merged with https://github.com/IQSS/dataverse/commit/3843e5366845d55c327cdb252dd9b4e4125b9b88)
+                
+                Since then, this has not been touched again (2021-12-21).
+            </xsl:comment>
+            <str name="defType">edismax</str>
+            <float name="tie">0.075</float>
+            <str name="qf">
+                dvName^400
+                authorName^180
+                dvSubject^190
+                dvDescription^180
+                dvAffiliation^170
+                title^130
+                subject^120
+                keyword^110
+                topicClassValue^100
+                dsDescriptionValue^90
+                authorAffiliation^80
+                publicationCitation^60
+                producerName^50
+                fileName^30
+                fileDescription^30
+                variableLabel^20
+                variableName^10
+                _text_^1.0
+            </str>
+            <str name="pf">
+                dvName^200
+                authorName^100
+                dvSubject^100
+                dvDescription^100
+                dvAffiliation^100
+                title^75
+                subject^75
+                keyword^75
+                topicClassValue^75
+                dsDescriptionValue^75
+                authorAffiliation^75
+                publicationCitation^75
+                producerName^75
+            </str>
+            <xsl:comment> Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 </xsl:comment>
+            <str name="bq">
+                isHarvested:false^25000
+            </str>
+        </xsl:copy>
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/modules/solr-configset/src/main/resources/solrconfig-xslt/03-static-schema-factory.xslt b/modules/solr-configset/src/main/resources/solrconfig-xslt/03-static-schema-factory.xslt
new file mode 100644
index 00000000000..f154965b30a
--- /dev/null
+++ b/modules/solr-configset/src/main/resources/solrconfig-xslt/03-static-schema-factory.xslt
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
+    
+    <!-- First copy all existing XML over -->
+    <xsl:template match="node()|@*">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*"/>
+        </xsl:copy>
+    </xsl:template>
+    
+    <!-- Add <schemaFactory> using the static schema.xml right before the first <updateProcessor> -->
+    <!-- Test this XSLT via http://xsltransform.net/jyH9Xwx/1 -->
+    <xsl:template match="/config/updateProcessor[1]">
+        <xsl:if test="not(preceding-sibling::schemaFactory)">
+            <schemaFactory class="ClassicIndexSchemaFactory"/>
+        </xsl:if>
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*"/>
+        </xsl:copy>
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/modules/solr-configset/src/main/resources/solrconfig-xslt/99-fix-special-chars.xslt b/modules/solr-configset/src/main/resources/solrconfig-xslt/99-fix-special-chars.xslt
new file mode 100644
index 00000000000..9d6a3e2ee5e
--- /dev/null
+++ b/modules/solr-configset/src/main/resources/solrconfig-xslt/99-fix-special-chars.xslt
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
+    
+    <!-- First copy all existing XML over -->
+    <xsl:template match="node()|@*">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*"/>
+        </xsl:copy>
+    </xsl:template>
+    
+    <xsl:template match="str[@name='hl.bs.chars']/text()">
+        <xsl:text disable-output-escaping="yes"><![CDATA[.,!? &#9;&#10;&#13;]]></xsl:text>
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/conf/solr/8.11.1/update-fields.sh b/modules/solr-configset/src/main/scripts/update-fields.sh
similarity index 100%
rename from conf/solr/8.11.1/update-fields.sh
rename to modules/solr-configset/src/main/scripts/update-fields.sh
diff --git a/modules/solr-configset/src/test/java/Constants.java b/modules/solr-configset/src/test/java/Constants.java
new file mode 100644
index 00000000000..88a6abb8a24
--- /dev/null
+++ b/modules/solr-configset/src/test/java/Constants.java
@@ -0,0 +1,3 @@
+public class Constants {
+    public final static String TAG_CONFIG = "SolrConfig";
+}
diff --git a/modules/solr-configset/src/test/java/EmbeddedSolrConfigIT.java b/modules/solr-configset/src/test/java/EmbeddedSolrConfigIT.java
new file mode 100644
index 00000000000..00abf2929c0
--- /dev/null
+++ b/modules/solr-configset/src/test/java/EmbeddedSolrConfigIT.java
@@ -0,0 +1,106 @@
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
+import org.apache.solr.client.solrj.request.CoreAdminRequest;
+import org.apache.solr.client.solrj.request.CoreStatus;
+import org.apache.solr.client.solrj.request.SolrPing;
+import org.apache.solr.client.solrj.response.SolrPingResponse;
+import org.apache.solr.core.NodeConfig;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Calendar;
+import java.util.Comparator;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+@Tag(Constants.TAG_CONFIG)
+@DisplayName("Embedded Solr Configuration Integration Test")
+public class EmbeddedSolrConfigIT {
+    
+    final static String buildDirectory = System.getProperty("buildDirectory");
+    final static String[] solrHomeSubPath = {"solr"};
+    
+    static Path solrHome;
+    static Path solrConfigSets;
+    
+    final static String collectionName = "collection1";
+    final static String configSetName = "dataverse";
+    static SolrClient solrClient;
+    
+    @BeforeAll
+    public static void setUp() throws IOException {
+        checkAndSetupSolrDirectories();
+        
+        // build a node config, so we can start an embedded server with it
+        final NodeConfig config = new NodeConfig.NodeConfigBuilder("embeddedSolrServerNode", solrHome)
+            .setConfigSetBaseDirectory(solrConfigSets.toString())
+            .build();
+    
+        // create the server
+        final EmbeddedSolrServer embeddedSolrServer = new EmbeddedSolrServer(config, collectionName);
+        solrClient = embeddedSolrServer;
+    }
+    
+    @AfterAll
+    public static void tearDown() throws IOException {
+        // delete the solr home (so we can run the test again without mvn clean)
+        try (Stream<Path> walk = Files.walk(solrHome)) {
+            walk.sorted(Comparator.reverseOrder())
+                .map(Path::toFile)
+                //.peek(System.out::println)
+                .forEach(File::delete);
+        }
+    }
+    
+    @Test
+    @DisplayName("Deploy Solr Core from Dataverse ConfigSet")
+    public void deployDataverseCore() throws SolrServerException, IOException {
+        assumeTrue(solrClient != null);
+    
+        // create the core from our configset
+        final CoreAdminRequest.Create createRequest = new CoreAdminRequest.Create();
+        createRequest.setCoreName(collectionName);
+        createRequest.setConfigSet(configSetName);
+        createRequest.process(solrClient);
+        
+        // get the core status
+        final CoreStatus coreStatus = CoreAdminRequest.getCoreStatus(collectionName, solrClient);
+        assertNotNull(coreStatus);
+        assertTrue(coreStatus.getCoreStartTime().before(Calendar.getInstance().getTime()));
+        
+        // check ping
+        final SolrPing ping = new SolrPing();
+        SolrPingResponse pingResponse = ping.process(solrClient);
+        assertNotNull(pingResponse);
+        assertTrue(pingResponse.toString().contains("status=OK"));
+    }
+    
+    
+    private static void checkAndSetupSolrDirectories() throws IOException {
+        assertNotNull(buildDirectory);
+        final Path buildDir = Path.of(buildDirectory);
+        assertTrue(buildDir.isAbsolute() &&
+            Files.exists(buildDir) &&
+            Files.isDirectory(buildDir) &&
+            Files.isReadable(buildDir) &&
+            Files.isWritable(buildDir));
+    
+        // create the solr home (might be replaced with a memory fs)
+        solrHome = Path.of(buildDirectory, solrHomeSubPath);
+        Files.createDirectories(solrHome);
+        
+        // we simply reuse the parent directory from the build as our configsets source directory
+        solrConfigSets = buildDir;
+    }
+}
diff --git a/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/BlockTest.java b/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/BlockTest.java
new file mode 100644
index 00000000000..b12da3702e3
--- /dev/null
+++ b/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/BlockTest.java
@@ -0,0 +1,108 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.NullAndEmptySource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class BlockTest {
+    
+    private static final Logger logger = Logger.getLogger(BlockTest.class.getCanonicalName());
+    
+    static final Configuration config = Configuration.defaultConfig();
+    static final String validHeaderLine = "#metadataBlock\tname\tdataverseAlias\tdisplayName\tblockURI";
+    static final String validBlockDef1 = "\tmyblock\t\tFooBar Block\thttps://foobar.com/";
+    static final String validBlockDef2 = "\tmyblock\tdataverse\tFooBar Block\thttps://foobar.com/";
+    
+    @Nested
+    class HeaderTest {
+        @ParameterizedTest
+        @ValueSource(strings = {
+            validHeaderLine,
+            "#metadataBlock\tNAME\tDataversealias\tDisplayname\tBlockURI"
+        })
+        void successfulParseAndValidateHeaderLine(String headerLine) throws ParserException {
+            List<Block.Header> headers = Block.Header.parseAndValidate(headerLine, config);
+            assertFalse(headers.isEmpty());
+            assertEquals(List.of(Block.Header.values()), headers);
+        }
+    
+        @ParameterizedTest
+        @NullAndEmptySource
+        @ValueSource(strings = {
+            "hello",
+            "#metadataBlock test",
+            "#metadataBlock\tname\tdataverseAlias\tdisplayName",
+            "\t#metadataBlock\tname\tdataverseAlias\tdisplayName\tblockURI",
+            "#metadataBlock\tname\tdataverseAlias\tdisplayName\tblockURI\tfoobar",
+            "#metadataBlock\tname\tdataverseAlias\tdisplayName\tdisplayName\tblockURI",
+            "dataverseAlias\tdisplayName\tblockURI\t#metadataBlock\tname"
+        })
+        void failingParseAndValidateHeaderLine(String headerLine) throws ParserException {
+            ParserException exception = assertThrows(ParserException.class, () -> Block.Header.parseAndValidate(headerLine, config));
+            assertTrue(exception.hasSubExceptions());
+            logger.log(Level.FINE,
+                exception.getSubExceptions().stream().map(Throwable::getMessage).collect(Collectors.joining("\n"))
+            );
+        }
+    }
+    
+    @Nested
+    class ParseLineTest {
+        Block.BlockBuilder builder;
+        
+        @BeforeEach
+        void setUp() throws ParserException {
+            builder = new Block.BlockBuilder(validHeaderLine, config);
+        }
+    
+        @ParameterizedTest
+        @NullAndEmptySource
+        @ValueSource(strings = {
+            "\t",
+            "myblock",
+            "\tmyblock\t",
+            "\tmyblock\tdataverse",
+            "\tmyblock\tdataverse\tFooBar Block",
+            "\tmyblock\tdataverse\tFooBar Block\thttps://",
+            "\tmyblock\tdataverse\tFooBar Block\thttps://foobar.com/\thello",
+            "\tmyblock\t\tFooBar Block\thttps://foobar.com/\thello",
+            "myblock\tdataverse\tFooBar Block\thttps://foobar.com/",
+            "myblock\t\tFooBar Block\thttps://foobar.com/"
+        })
+        void failingParseLine(String line) throws ParserException {
+            ParserException exception = assertThrows(ParserException.class, () -> builder.parseAndValidateLine(line));
+            assertFalse(builder.hasSucceeded());
+        }
+    
+        @ParameterizedTest
+        @ValueSource(strings = {
+            validBlockDef1, validBlockDef2
+        })
+        void succeedingParseLine(String line) throws ParserException {
+            builder.parseAndValidateLine(line);
+            assertTrue(builder.hasSucceeded());
+        }
+        
+        @Test
+        void failingDoubleAdditionAttempt() throws ParserException {
+            builder.parseAndValidateLine(validBlockDef1);
+            assertTrue(builder.hasSucceeded());
+            ParserException exception = assertThrows(ParserException.class, () -> builder.parseAndValidateLine(validBlockDef1));
+            assertFalse(builder.hasSucceeded());
+        }
+    }
+    
+}
diff --git a/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/ConfigurationTest.java b/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/ConfigurationTest.java
new file mode 100644
index 00000000000..5b632955bac
--- /dev/null
+++ b/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/ConfigurationTest.java
@@ -0,0 +1,28 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+import io.gdcc.solrteur.mdb.tsv.Configuration;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ConfigurationTest {
+    
+    private final Configuration testConfiguration = Configuration.defaultConfig();
+    
+    @ParameterizedTest
+    @CsvSource(nullValues = "NULL",
+        value = {
+            "NULL,NULL",
+            "hello,hello",
+            "'   hello','   hello'",
+            "'   hello   ','   hello   '",
+            "'   hello','   hello\t\t\t'",
+            "'\t\t\thello','\t\t\thello\t\t\t'",
+            "'\t\t\thello\ttest','\t\t\thello\ttest\t\t'",
+            "'\t\t\thello\ttest\t\t ','\t\t\thello\ttest\t\t '",
+        })
+    void trimming(String expected, String sut) {
+        assertEquals(expected, testConfiguration.rtrimColumns(sut));
+    }
+}
\ No newline at end of file
diff --git a/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/FieldTest.java b/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/FieldTest.java
new file mode 100644
index 00000000000..028296ed290
--- /dev/null
+++ b/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/FieldTest.java
@@ -0,0 +1,209 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvFileSource;
+import org.junit.jupiter.params.provider.EmptySource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.NullAndEmptySource;
+import org.junit.jupiter.params.provider.NullSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+class FieldTest {
+    
+    private static final Logger logger = Logger.getLogger(FieldTest.class.getCanonicalName());
+    
+    static final Configuration config = Configuration.defaultConfig();
+    static final String validHeaderLine = "#datasetField\tname\ttitle\tdescription\twatermark\tfieldType" +
+        "\tdisplayOrder\tdisplayFormat\tadvancedSearchField\tallowControlledVocabulary\tallowmultiples\tfacetable" +
+        "\tdisplayoncreate\trequired\tparent\tmetadatablock_id\ttermURI";
+    static final String validContainingBlockName = "citation";
+    static final String validFieldDef = "\ttitle\tTitle\tThe main title of the Dataset\t\ttext" +
+        "\t0\t\tTRUE\tFALSE\tFALSE\tFALSE\tTRUE\tTRUE\t\tcitation\thttp://purl.org/dc/terms/title";
+    
+    @Nested
+    class TypesTest {
+        Predicate<String> allowedTypes = Field.Types.matchesTypes();
+        
+        @ParameterizedTest
+        @NullAndEmptySource
+        @ValueSource(strings = {"foobar", "hello_hello", "NONE", "DATE"})
+        void failing(String subject) {
+            assertFalse(allowedTypes.test(subject));
+        }
+    
+        @ParameterizedTest
+        @ValueSource(strings = {"none", "text", "textbox", "date", "email", "int", "float"})
+        void succeeding(String subject) {
+            assertTrue(allowedTypes.test(subject));
+        }
+    }
+    
+    @Nested
+    class HeaderFieldValueValidationTest {
+        @ParameterizedTest
+        @NullAndEmptySource
+        @ValueSource(strings = {"   ", "\t", "_foobar_", "_foo_bar_"})
+        void invalidNames(String subject) {
+            assertFalse(Field.Header.NAME.isValid(subject));
+        }
+    
+        @ParameterizedTest
+        @ValueSource(strings = {"foobar_", "foo_bar_", "_foobar", "_foo_bar", "foobar", "foobar1234", "foo_bar_1234"})
+        void validNames(String subject) {
+            assertTrue(Field.Header.NAME.isValid(subject));
+            assertTrue(Field.Header.PARENT.isValid(subject));
+        }
+    
+        @ParameterizedTest
+        @EmptySource
+        void validParentName(String subject) {
+            assertTrue(Field.Header.PARENT.isValid(subject));
+        }
+    
+        @ParameterizedTest
+        @NullSource
+        @ValueSource(strings = {"   ", "\t"})
+        void invalidEmptyOrText(String subject) {
+            assertFalse(Field.Header.WATERMARK.isValid(subject));
+            assertFalse(Field.Header.DISPLAY_FORMAT.isValid(subject));
+        }
+    
+        @ParameterizedTest
+        @ValueSource(strings = { "", "foobar", "My name is Hase, I know about nothing."})
+        void validEmptyOrText(String subject) {
+            assertTrue(Field.Header.WATERMARK.isValid(subject));
+            assertTrue(Field.Header.DISPLAY_FORMAT.isValid(subject));
+        }
+    
+        @ParameterizedTest
+        @NullAndEmptySource
+        @ValueSource(strings = { "true", "false", "0", "1", "foobar"})
+        void invalidBoolean(String subject) {
+            assertFalse(Field.Header.ADVANCED_SEARCH_FIELD.isValid(subject));
+            assertFalse(Field.Header.ALLOW_CONTROLLED_VOCABULARY.isValid(subject));
+            assertFalse(Field.Header.ALLOW_MULTIPLES.isValid(subject));
+            assertFalse(Field.Header.FACETABLE.isValid(subject));
+            assertFalse(Field.Header.DISPLAY_ON_CREATE.isValid(subject));
+            assertFalse(Field.Header.REQUIRED.isValid(subject));
+        }
+    
+        @ParameterizedTest
+        @ValueSource(strings = { "TRUE", "FALSE" })
+        void validBoolean(String subject) {
+            assertTrue(Field.Header.ADVANCED_SEARCH_FIELD.isValid(subject));
+            assertTrue(Field.Header.ALLOW_CONTROLLED_VOCABULARY.isValid(subject));
+            assertTrue(Field.Header.ALLOW_MULTIPLES.isValid(subject));
+            assertTrue(Field.Header.FACETABLE.isValid(subject));
+            assertTrue(Field.Header.DISPLAY_ON_CREATE.isValid(subject));
+            assertTrue(Field.Header.REQUIRED.isValid(subject));
+        }
+    }
+    
+    @Nested
+    class HeaderLineTest {
+        @ParameterizedTest
+        @ValueSource(strings = {
+            validHeaderLine,
+            "#datasetfield\tName\tTITLE\tdescription\tWAtermark\tfieldType\tdisplayOrder\tdisplayFormat" +
+                "\tadvancedSearchField\tallowControlledVocabulary\tallowmultiples\tfacetable" +
+                "\tdisplayOnCreate\trequired\tparent\tmetadataBLOCK_ID\ttermUri"
+        })
+        void successfulParseAndValidateHeaderLine(String headerLine) throws ParserException {
+            List<Field.Header> headers = Field.Header.parseAndValidate(headerLine, config);
+            assertFalse(headers.isEmpty());
+            assertEquals(List.of(Field.Header.values()), headers);
+        }
+        
+        @ParameterizedTest
+        @NullAndEmptySource
+        @ValueSource(strings = {
+            "hello",
+            "datasetField",
+            "#datasetField test",
+            "#datasetField\tname\ttitle\tdescription\twatermark\tfieldType",
+            "#datasetField\tname\ttitle\tdescription\twatermark\tfieldType\t\tdisplayoncreate\trequired\tparent\tmetadatablock_id\ttermURI"
+        })
+        void failingParseAndValidateHeaderLine(String headerLine) throws ParserException {
+            ParserException exception = assertThrows(ParserException.class, () -> Field.Header.parseAndValidate(headerLine, config));
+            assertTrue(exception.hasSubExceptions());
+            logger.log(Level.FINE,
+                exception.getSubExceptions().stream().map(Throwable::getMessage).collect(Collectors.joining("\n"))
+            );
+        }
+    }
+    
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    class ParseLineTest {
+        Field.FieldsBuilder builder;
+        
+        @BeforeEach
+        void setUp() throws ParserException {
+            builder = new Field.FieldsBuilder(validHeaderLine, validContainingBlockName, config);
+        }
+        
+        @ParameterizedTest
+        @NullAndEmptySource
+        @MethodSource("invalidFieldExamples")
+        void failingParseLine(String line) throws ParserException {
+            ParserException exception = assertThrows(ParserException.class, () -> builder.parseAndValidateLine(0, line));
+            //assertFalse(builder.hasSucceeded());
+        }
+        
+        @ParameterizedTest
+        @ValueSource(strings = {validFieldDef})
+        @MethodSource("validFieldExamples")
+        void succeedingParseLine(String line) throws ParserException {
+            try {
+                System.out.println(line);
+                builder.parseAndValidateLine(0, line);
+            } catch (ParserException e) {
+                e.getSubExceptions().forEach(System.out::println);
+                fail(e);
+            }
+            //assertTrue(builder.hasSucceeded());
+        }
+    
+        Stream<String> validFieldExamples() throws IOException {
+            Path file = Path.of("", "src/test/resources", "fields", "valid_fields.csv");
+            return Files.readAllLines(file, StandardCharsets.UTF_8).stream().map(s -> s.replaceAll(";", "\t"));
+        }
+    
+        Stream<String> invalidFieldExamples() throws IOException {
+            // TODO: write a file with such examples that fail already at parsing the line
+            Path file = Path.of("", "src/test/resources", "fields", "invalid_fields.csv");
+            return Files.readAllLines(file, StandardCharsets.UTF_8).stream().map(s -> s.replaceAll(";", "\t"));
+        }
+    }
+    
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    class BuildFieldListTest {
+        // TODO: write tests for the checks at build time
+    }
+}
\ No newline at end of file
diff --git a/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/ParsingStateTest.java b/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/ParsingStateTest.java
new file mode 100644
index 00000000000..3722eb78289
--- /dev/null
+++ b/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/ParsingStateTest.java
@@ -0,0 +1,78 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+import io.gdcc.solrteur.mdb.tsv.Configuration;
+import io.gdcc.solrteur.mdb.tsv.Block;
+import io.gdcc.solrteur.mdb.tsv.ControlledVocabulary;
+import io.gdcc.solrteur.mdb.tsv.Field;
+import io.gdcc.solrteur.mdb.tsv.ParserException;
+import io.gdcc.solrteur.mdb.tsv.ParsingState;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class ParsingStateTest {
+    
+    static Configuration config = Configuration.defaultConfig();
+
+    static Stream<Arguments> failingStateTransitionExamples() {
+        return Stream.of(
+            Arguments.of(ParsingState.Init, null),
+            Arguments.of(ParsingState.MetadataBlock, null),
+            Arguments.of(ParsingState.Fields, null),
+            Arguments.of(ParsingState.Vocabularies, null),
+    
+            Arguments.of(ParsingState.Init, ""),
+            Arguments.of(ParsingState.MetadataBlock, ""),
+            Arguments.of(ParsingState.Fields, ""),
+            Arguments.of(ParsingState.Vocabularies, ""),
+    
+            Arguments.of(ParsingState.Init, "foobar"),
+            Arguments.of(ParsingState.MetadataBlock, "foobar"),
+            Arguments.of(ParsingState.Fields, "foobar"),
+            Arguments.of(ParsingState.Vocabularies, "foobar"),
+    
+            Arguments.of(ParsingState.Init, config.triggerIndicator()),
+            Arguments.of(ParsingState.Init, config.commentIndicator()),
+            Arguments.of(ParsingState.Init, config.columnSeparator()),
+            
+            Arguments.of(ParsingState.Init, config.trigger(Field.KEYWORD)),
+            Arguments.of(ParsingState.Init, config.trigger(ControlledVocabulary.KEYWORD)),
+    
+            Arguments.of(ParsingState.MetadataBlock, config.commentIndicator()),
+            Arguments.of(ParsingState.MetadataBlock, config.trigger(ControlledVocabulary.KEYWORD)),
+    
+            Arguments.of(ParsingState.Fields, config.commentIndicator()),
+            Arguments.of(ParsingState.Fields, config.trigger(Block.KEYWORD)),
+    
+            Arguments.of(ParsingState.Vocabularies, config.commentIndicator()),
+            Arguments.of(ParsingState.Vocabularies, config.trigger(Block.KEYWORD)),
+            Arguments.of(ParsingState.Vocabularies, config.trigger(Field.KEYWORD))
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource("failingStateTransitionExamples")
+    void failingTransitions(final ParsingState source, final String triggerLine) throws ParserException {
+        ParserException ex = assertThrows(ParserException.class, () -> source.transitionState(triggerLine, config));
+    }
+    
+    static Stream<Arguments> successfulStateTransitionExamples() {
+        return Stream.of(
+            Arguments.of(ParsingState.Init, config.trigger(Block.KEYWORD), ParsingState.MetadataBlock),
+            Arguments.of(ParsingState.MetadataBlock, config.trigger(Field.KEYWORD), ParsingState.Fields),
+            Arguments.of(ParsingState.Fields, config.trigger(ControlledVocabulary.KEYWORD), ParsingState.Vocabularies)
+        );
+    }
+    
+    @ParameterizedTest
+    @MethodSource("successfulStateTransitionExamples")
+    void successfulTransitions(final ParsingState source, final String triggerLine, final ParsingState expected) throws ParserException {
+        assertEquals(expected, source.transitionState(triggerLine, config));
+    }
+
+}
\ No newline at end of file
diff --git a/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/ValidatorTest.java b/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/ValidatorTest.java
new file mode 100644
index 00000000000..5462c41130c
--- /dev/null
+++ b/modules/solr-configset/src/test/java/io/gdcc/solrteur/mdb/tsv/ValidatorTest.java
@@ -0,0 +1,80 @@
+package io.gdcc.solrteur.mdb.tsv;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.NullAndEmptySource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class ValidatorTest {
+    
+    private static final Logger logger = Logger.getLogger(ValidatorTest.class.getCanonicalName());
+    
+    @Nested
+    class UtilsTest {
+        @ParameterizedTest
+        @CsvSource(nullValues = "NULL",
+            value = {
+                "false,NULL",
+                "false,''",
+                "false,hello",
+                "false,https://",
+                "false,www.foo.bar",
+                "false,://foo.bar.com",
+                "true,https://wwww.foobar.com",
+                "true,https://wwww.foobar.com/hello",
+                "true,https://wwww.foobar.com:1214/hello",
+                "true,https://host/hello",
+            })
+        void urlValidation(boolean expected, String sut) {
+            Assertions.assertEquals(expected, Validator.isValidUrl(sut));
+        }
+    }
+    
+    @Nested
+    class ValidateBlockHeader {
+        List<String> blockHeaders = Block.Header.getHeaders();
+    
+        @ParameterizedTest
+        @NullAndEmptySource
+        @ValueSource(strings = {
+            "hello",
+            "#metadataBlock test",
+            "#metadataBlock\tname\tdataverseAlias\tdisplayName",
+            "\t#metadataBlock\tname\tdataverseAlias\tdisplayName\tblockURI",
+            "#metadataBlock\tname\tdataverseAlias\tdisplayName\tblockURI\tfoobar",
+            "#metadataBlock\tname\tdataverseAlias\tdisplayName\tdisplayName\tblockURI",
+            "dataverseAlias\tdisplayName\tblockURI\t#metadataBlock\tname"
+        })
+        void validateHeaderLine_Block_Throws(String line) {
+            ParserException exception = assertThrows(ParserException.class, () -> Validator.validateHeaderLine(line, blockHeaders, Configuration.defaultConfig()));
+            assertTrue(exception.hasSubExceptions());
+            logger.log(Level.FINE,
+                exception.getSubExceptions().stream().map(Throwable::getMessage).collect(Collectors.joining("\n"))
+            );
+        }
+    
+        @ParameterizedTest
+        @ValueSource(strings = {
+            "#metadataBlock\tname\tdataverseAlias\tdisplayName\tblockURI",
+            "#metadataBlock\tNAME\tDataversealias\tDisplayname\tBlockURI"
+        })
+        void validateHeaderLine_Block_True(String line) throws ParserException {
+            List<String> headers = Validator.validateHeaderLine(line, blockHeaders, Configuration.defaultConfig());
+            assertFalse(headers.isEmpty());
+            // we expect the normalized form, so the arrays should match!
+            assertEquals(blockHeaders, headers);
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/solr-configset/src/test/resources/fields/valid_fields.csv b/modules/solr-configset/src/test/resources/fields/valid_fields.csv
new file mode 100644
index 00000000000..13fd8c956ee
--- /dev/null
+++ b/modules/solr-configset/src/test/resources/fields/valid_fields.csv
@@ -0,0 +1,12 @@
+;title;Title;The main title of the Dataset;;text;0;;TRUE;FALSE;FALSE;FALSE;TRUE;TRUE;;citation;http://purl.org/dc/terms/title
+;subtitle;Subtitle;A secondary title that amplifies or states certain limitations on the main title;;text;1;;FALSE;FALSE;FALSE;FALSE;FALSE;FALSE;;citation;
+;alternativeURL;Alternative URL;Another URL where one can view or access the data in the Dataset, e.g. a project or personal webpage;https://;url;3;<a href="#VALUE" target="_blank">#VALUE</a>;FALSE;FALSE;FALSE;FALSE;FALSE;FALSE;;citation;https://schema.org/distribution
+;author;Author;The entity, e.g. a person or organization, that created the Dataset;;none;7;;FALSE;FALSE;TRUE;FALSE;TRUE;TRUE;;citation;http://purl.org/dc/terms/creator
+;authorName;Name;The name of the author, such as the person's name or the name of an organization;1) Family Name, Given Name or 2) Organization XYZ;text;8;#VALUE;TRUE;FALSE;FALSE;TRUE;TRUE;TRUE;author;citation;
+;authorAffiliation;Affiliation;The name of the entity affiliated with the author, e.g. an organization's name;Organization XYZ;text;9;(#VALUE);TRUE;FALSE;FALSE;TRUE;TRUE;FALSE;author;citation;
+;authorIdentifierScheme;Identifier Type;The type of identifier that uniquely identifies the author (e.g. ORCID, ISNI);;text;10;- #VALUE:;FALSE;TRUE;FALSE;FALSE;TRUE;FALSE;author;citation;http://purl.org/spar/datacite/AgentIdentifierScheme
+;authorIdentifier;Identifier;Uniquely identifies the author when paired with an identifier type;;text;11;#VALUE;FALSE;FALSE;FALSE;FALSE;TRUE;FALSE;author;citation;http://purl.org/spar/datacite/AgentIdentifier
+;datasetContactEmail;E-mail;The point of contact's email address;name@email.xyz;email;15;#EMAIL;FALSE;FALSE;FALSE;FALSE;TRUE;TRUE;datasetContact;citation;
+;dsDescriptionValue;Text;A summary describing the purpose, nature, and scope of the Dataset;;textbox;17;#VALUE;TRUE;FALSE;FALSE;FALSE;TRUE;TRUE;dsDescription;citation;
+;dsDescriptionDate;Date;The date when the description was added to the Dataset. If the Dataset contains more than one description, e.g. the data producer supplied one description and the data repository supplied another, this date is used to distinguish between the descriptions;YYYY-MM-DD;date;18;(#VALUE);FALSE;FALSE;FALSE;FALSE;TRUE;FALSE;dsDescription;citation;
+;keywordVocabularyURI;Controlled Vocabulary URL;The URL where one can access information about the term's controlled vocabulary;https://;url;23;<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>;FALSE;FALSE;FALSE;FALSE;TRUE;FALSE;keyword;citation;
diff --git a/pom.xml b/pom.xml
index b4636c9aac6..3a1134d697b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,7 +283,6 @@
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
-            <version>8.11.1</version>
         </dependency>
         <dependency>
             <groupId>colt</groupId>
@@ -539,7 +538,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/scripts/installer/Makefile b/scripts/installer/Makefile
index a1fbfab782e..5fffcd774c1 100644
--- a/scripts/installer/Makefile
+++ b/scripts/installer/Makefile
@@ -55,9 +55,9 @@ ${JHOVE_SCHEMA}:	../../conf/jhove/jhoveConfig.xsd ${INSTALLER_ZIP_DIR}
 	@echo copying jhove schema file
 	/bin/cp ../../conf/jhove/jhoveConfig.xsd ${INSTALLER_ZIP_DIR}
 
-${SOLR_SCHEMA}:		../../conf/solr/8.11.1/schema.xml ../../conf/solr/8.11.1/update-fields.sh ${INSTALLER_ZIP_DIR}
+${SOLR_SCHEMA}:		../../conf/solr/8.11.1/schema.xml ../../modules/solr-configset/src/main/scripts/update-fields.sh ${INSTALLER_ZIP_DIR}
 	@echo copying Solr schema file
-	/bin/cp ../../conf/solr/8.11.1/schema.xml ../../conf/solr/8.11.1/update-fields.sh ${INSTALLER_ZIP_DIR}
+	/bin/cp ../../conf/solr/8.11.1/schema.xml ../../modules/solr-configset/src/main/scripts/update-fields.sh ${INSTALLER_ZIP_DIR}
 
 ${SOLR_CONFIG}:		../../conf/solr/8.11.1/solrconfig.xml ${INSTALLER_ZIP_DIR}
 	@echo copying Solr config file
diff --git a/tests/shell/spec/update_fields_spec.sh b/tests/shell/spec/update_fields_spec.sh
index e77121672dd..be86444d8a6 100644
--- a/tests/shell/spec/update_fields_spec.sh
+++ b/tests/shell/spec/update_fields_spec.sh
@@ -1,16 +1,16 @@
 #shellcheck shell=sh
 
 update_fields() {
-  ../../conf/solr/8.11.1/update-fields.sh "$@"
+  ../../modules/solr-configset/src/main/scripts/update-fields.sh "$@"
 }
 
 Describe "Update fields command"
 
   Describe "can operate on upstream data"
-    copyUpstreamSchema() { cp ../../conf/solr/8.11.1/schema.xml data/solr/upstream-schema.xml; }
+    copyUpstreamSchema() { cp ../../modules/solr-configset/src/main/resources/schema.xml data/solr/upstream-schema.xml; }
     AfterAll 'copyUpstreamSchema'
 
-    Path schema-xml="../../conf/solr/8.11.1/schema.xml"
+    Path schema-xml="../../modules/solr-configset/src/main/resources/schema.xml"
     It "needs upstream schema.xml"
       The path schema-xml should be exist
     End