Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xwiki-platform
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
XWiki
xwiki-platform
Commits
ef88080e
Commit
ef88080e
authored
2 years ago
by
Thomas Mortagne
Browse files
Options
Downloads
Patches
Plain Diff
XWIKI-18769: Upgrade to Solr 8.11.2
* disable the Solr Log Watcher until Solr support slf4j2
parent
c6f2f158
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/main/java/org/xwiki/search/solr/internal/EmbeddedSolr.java
+8
-2
8 additions, 2 deletions
...ain/java/org/xwiki/search/solr/internal/EmbeddedSolr.java
with
8 additions
and
2 deletions
xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/main/java/org/xwiki/search/solr/internal/EmbeddedSolr.java
+
8
−
2
View file @
ef88080e
...
...
@@ -47,9 +47,9 @@
import
org.apache.solr.client.solrj.SolrServerException
;
import
org.apache.solr.client.solrj.embedded.EmbeddedSolrServer
;
import
org.apache.solr.core.CoreContainer
;
import
org.apache.solr.core.SolrCore
;
import
org.apache.solr.core.CoreContainer.CoreLoadFailure
;
import
org.apache.solr.core.CoreDescriptor
;
import
org.apache.solr.core.SolrCore
;
import
org.xwiki.component.annotation.Component
;
import
org.xwiki.component.annotation.DisposePriority
;
import
org.xwiki.component.phase.Disposable
;
...
...
@@ -291,7 +291,13 @@ private void createHomeDirectory() throws IOException
Files
.
createDirectories
(
this
.
solrHomePath
);
// Copy the default solr.xml configuration file
FileUtils
.
write
(
this
.
solrHomePath
.
resolve
(
"solr.xml"
).
toFile
(),
"<solr/>"
,
StandardCharsets
.
UTF_8
);
StringBuilder
builder
=
new
StringBuilder
();
builder
.
append
(
"<solr>"
);
// Disable the log watcher until Solr support SLF4J 2
// FIXME: remove when Solr upgrade SLF4J (or stop logging a stack trace at least)
builder
.
append
(
"<logging><str name=\"enabled\">false</str></logging>"
);
builder
.
append
(
"</solr>"
);
FileUtils
.
write
(
this
.
solrHomePath
.
resolve
(
"solr.xml"
).
toFile
(),
builder
.
toString
(),
StandardCharsets
.
UTF_8
);
// [RETRO COMPATIBILITY for < 12.3]
// Check if the solr home is not already at the old location (/solr) and move things
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment