Skip to content

Commit

Permalink
update to test lastest Solr 7.7.1 and 8.0.0 releases.
Browse files Browse the repository at this point in the history
  • Loading branch information
apatrida committed Apr 28, 2019
1 parent 3f3dfc5 commit 30ed466
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 6 deletions.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
solr-undertow
=============

[![GitHub release](https://img.shields.io/github/release/kohesive/solr-undertow.svg)](https://github.com/kohesive/solr-undertow/releases) [![Maven Central](https://img.shields.io/maven-central/v/uy.kohesive.solr/solr-undertow.svg)](https://mvnrepository.com/artifact/uy.kohesive.solr) [![CircleCI branch](https://img.shields.io/circleci/project/kohesive/solr-undertow/master.svg)](https://circleci.com/gh/kohesive/solr-undertow/tree/master) [![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/kohesive/solr-undertow/blob/master/LICENSE.txt) [![Solr](https://img.shields.io/badge/solr-4.x-orange.svg)](http://lucene.apache.org/solr/) [![Solr](https://img.shields.io/badge/solr-5.x-orange.svg)](http://lucene.apache.org/solr/) [![Solr](https://img.shields.io/badge/solr-6.x-orange.svg)](http://lucene.apache.org/solr/) [![Solr](https://img.shields.io/badge/solr-7.x-orange.svg)](http://lucene.apache.org/solr/) [![Kotlin](https://img.shields.io/badge/kotlin-1.2.21-blue.svg)](http://kotlinlang.org)
[![GitHub release](https://img.shields.io/github/release/kohesive/solr-undertow.svg)](https://github.com/kohesive/solr-undertow/releases) [![Maven Central](https://img.shields.io/maven-central/v/uy.kohesive.solr/solr-undertow.svg)](https://mvnrepository.com/artifact/uy.kohesive.solr) [![CircleCI branch](https://img.shields.io/circleci/project/kohesive/solr-undertow/master.svg)](https://circleci.com/gh/kohesive/solr-undertow/tree/master) [![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/kohesive/solr-undertow/blob/master/LICENSE.txt) [![Solr](https://img.shields.io/badge/solr-4.x-orange.svg)](http://lucene.apache.org/solr/) [![Solr](https://img.shields.io/badge/solr-5.x-orange.svg)](http://lucene.apache.org/solr/) [![Solr](https://img.shields.io/badge/solr-6.x-orange.svg)](http://lucene.apache.org/solr/) [![Solr](https://img.shields.io/badge/solr-7.x-orange.svg)](http://lucene.apache.org/solr/) [![Solr](https://img.shields.io/badge/solr-8.x-orange.svg)](http://lucene.apache.org/solr/) [![Kotlin](https://img.shields.io/badge/kotlin-1.2.61-blue.svg)](http://kotlinlang.org)

[Solr](http://lucene.apache.org/solr/) and SolrCloud running in high performance server - Tiny, fast, easy, standalone deployment, simple to configure, and without an application server. Requires JDK 1.7 or newer, Solr 4.x, 5.x, 6.x, and 7.x. Less than 10MB download, starts instantly, performs inline or better than all application servers. Written in the [Kotlin language](http://kotlinlang.org) for the JVM (a better Java, not as complex as Scala).

Expand Down Expand Up @@ -36,7 +36,7 @@ solr.undertow: {
solrHome: "./solr-home"
solrLogs: "./solr-logs"
tempDir: "./solr-temp"
solrVersion: "7.2.1"
solrVersion: "7.7.1"
solrWarFile: ./solr-wars/solr-${solr.undertow.solrVersion}.zip
}
```
Expand Down Expand Up @@ -105,7 +105,8 @@ Quick links to common Solr distributions:
|6.4.2|http://archive.apache.org/dist/lucene/solr/6.4.2/solr-6.4.2.zip|
|6.6.2|http://archive.apache.org/dist/lucene/solr/6.6.2/solr-6.6.2.zip|
|7.2.1|http://archive.apache.org/dist/lucene/solr/7.2.1/solr-7.2.1.zip|

|7.7.1|http://archive.apache.org/dist/lucene/solr/7.7.1/solr-7.7.1.zip|
|8.0.0|http://archive.apache.org/dist/lucene/solr/8.0.0/solr-8.0.0.zip|

Solr-Undertow supports the following patterns of distribuions:

Expand All @@ -118,7 +119,7 @@ The smallest distribution is the WAR file, which you can create, or you can remo

**For Solr 4.x you can download Solr WAR files** from the Maven repository. For example [Solr 4.10.4 WAR](http://central.maven.org/maven2/org/apache/solr/solr/4.10.4/solr-4.10.4.war) and [find older versions here](http://mvnrepository.com/artifact/org.apache.solr/solr).

**For Solr 5.x and 6.x you download full distributions** from the main [Solr website](http://lucene.apache.org/solr/) or from the [past version archives](http://archive.apache.org/dist/lucene/solr/).
**For Solr 5.x, 6.x, 7.x, and 8.x you download full ZIP file distributions** from the main [Solr website](http://lucene.apache.org/solr/) or from the [past version archives](http://archive.apache.org/dist/lucene/solr/).

### Custom JVM Parameters

Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- run: gradle dependencies
- run: ./gradlew dependencies

- save_cache:
paths:
Expand Down
8 changes: 8 additions & 0 deletions example/example-solr-7.7.1.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
solr.undertow: {
httpClusterPort: 8983
solrHome: "./solr-home"
solrLogs: "./solr-logs"
tempDir: "./solr-temp"
solrVersion: "7.7.1"
solrWarFile: ./solr-wars/solr-${solr.undertow.solrVersion}.zip
}
8 changes: 8 additions & 0 deletions example/example-solr-8.0.0.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
solr.undertow: {
httpClusterPort: 8983
solrHome: "./solr-home"
solrLogs: "./solr-logs"
tempDir: "./solr-temp"
solrVersion: "8.0.0"
solrWarFile: ./solr-wars/solr-${solr.undertow.solrVersion}.zip
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ systemProp.file.encoding=UTF-8
version_kotlin=1.2.61

version_undertow=1.4.22.Final
version_solr=7.2.1
version_solr=8.0.0

version_klutter=2.3.1
version_typesafe_config=1.3.2
Expand Down
22 changes: 22 additions & 0 deletions src/main/resources/solr-undertow-reference.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@ solr.undertow: {
# Port and Host for the main Solr listener (the one given to Zookeeper as well)
httpClusterPort: 8983
httpHost: "0.0.0.0"

# Defaults to number of cores Runtime.getRuntime().availableProcessors()
httpIoThreads: -1

# Defaults to 8 * number of cores Runtime.getRuntime().availableProcessors()*8
httpWorkerThreads: -1

# Defaults to false, no HTTP compression
httpCompression: false

# Shutdown options
shutdown: {
httpPort: 9983
Expand All @@ -14,40 +20,56 @@ solr.undertow: {
password: ""
gracefulDelay: "30s"
}

# Request limiting active profiles
activeRequestLimits: [ ]

# Request Limiting profiles
requestLimits: {
}

# REQUIRED:
solrHome: "setting solrHome in configuration is required and must contain solr.xml and zoo.cfg, indexes will be stored here"

# REQUIRED:
solrLogs: "setting solrLogs in configuration is required, point at a log directory"

# REQUIRED:
tempDir: "setting tempDir in configuration is required, point at a temp directory"

# Solr version, used to name cache directory and sometimes as variable expansion for solrWarFile setting
solrVersion: "UNKNOWN"

# REQUIRED:
solrWarFile: "setting solrWarFile in configuration is required, point at a solr war file matching solrVersion"

# Path within the web server for Solr
solrContextPath: "/solr"

# Same as zkRun Solr system property, overridden if -DzkRun is set in the VM
zkRun: false

# Same as zkHost Solr system property, overridden if -DzkHost is set in the VM
zkHost: ""

# Dir containing extra JAR files to put on the Solr classpath
libExtDir: ""

# Format for HTTP access logs
# accessLogFormat="common" produces "%h %l %u %t \"%r\" %s %b"
# accessLogFormat="combined" produces "%h %l %u %t \"%r\" %s %b \"%{i,Referer}\" \"%{i,User-Agent}\""
# acesssLogFormat=any other custom format string (see JavaDoc comments for: https://github.com/undertow-io/undertow/blob/master/core/src/main/java/io/undertow/server/handlers/accesslog/AccessLogHandler.java)
accessLogFormat: "%t %a %p \"%r\" %q %s %b %Dms %{o,X-Solr-QTime} ${o,X-Solr-Hits}"

# Should timing be tracked for each request, adds slight overhead
accessLogEnableRequestTiming: true

# If running embedded, the WAR file can be ommitted if the classpath contains Solr already
solrWarCanBeOmitted: false

# If tempDir contains symbolic links they are blocked for security reasons by default because web content is served from this dir, but can be enabled
tempDirSymLinksAllow: false

# If tempDir can contain symbolic links, to what ABSOLUTE paths are they allowed to access? (or empty for ALL)
tempDirSymLinksSafePaths: []
}
3 changes: 3 additions & 0 deletions test-data/solr-standalone/solr-temp/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/4*/
/5*/
/6*/
/7*/
/8*/
/hs_*/
11 changes: 11 additions & 0 deletions test-data/solr-standalone/standalone-7.7.1.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
solr.undertow: {
httpClusterPort: 8983
solrHome: "./solr-home"
solrLogs: "./solr-logs"
tempDir: "./solr-temp"
solrVersion: "7.7.1"
solrWarFile: ../solr-wars/solr-${solr.undertow.solrVersion}.zip
shutdown: {
password: "diediedie"
}
}
11 changes: 11 additions & 0 deletions test-data/solr-standalone/standalone-8.0.0.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
solr.undertow: {
httpClusterPort: 8983
solrHome: "./solr-home"
solrLogs: "./solr-logs"
tempDir: "./solr-temp"
solrVersion: "8.0.0"
solrWarFile: ../solr-wars/solr-${solr.undertow.solrVersion}.zip
shutdown: {
password: "diediedie"
}
}

0 comments on commit 30ed466

Please sign in to comment.