Branch: refs/heads/feature-deploy-solr9
Home: https://github.com/xwiki/xwiki-platform
Commit: 50a91a427d398159b73983bad3123df234b36bf5
https://github.com/xwiki/xwiki-platform/commit/50a91a427d398159b73983bad312…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/src/main/java/org/xwiki/ratings/internal/averagerating/XObjectAverageRatingManager.java
Log Message:
-----------
[misc] Fix wrong StringUtils
Commit: d1f79a405066a553d86623c22891d9a3b6813bdd
https://github.com/xwiki/xwiki-platform/commit/d1f79a405066a553d86623c22891…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M pom.xml
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/pom.xml
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/main/java/org/xwiki/search/solr/internal/AbstractSolr.java
M 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
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/main/java/org/xwiki/search/solr/internal/RemoteSolr.java
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/main/java/org/xwiki/search/solr/internal/reference/DocumentSolrReferenceResolver.java
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/main/java/org/xwiki/search/solr/internal/reference/ObjectSolrReferenceResolver.java
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/main/java/org/xwiki/search/solr/internal/reference/SpaceSolrReferenceResolver.java
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/main/java/org/xwiki/search/solr/internal/reference/WikiSolrReferenceResolver.java
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/test/java/org/xwiki/search/solr/internal/EmbeddedSolrInitializationTest.java
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/solrconfig.xml
Log Message:
-----------
XWIKI-20477: Upgrade to Solr 9.4.0
Commit: 2e5439304e82900d314e13d37452f5e2aa78b6f9
https://github.com/xwiki/xwiki-platform/commit/2e5439304e82900d314e13d37452…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/pom.xml
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/main/java/org/xwiki/search/solr/internal/DefaultSolrConfiguration.java
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/test/java/org/xwiki/search/solr/internal/EmbeddedSolrInitializationTest.java
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/pom.xml
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/pom.xml
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/assembly/distribution.xml
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/currency.xml
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/elevate.xml
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/contractions_ca.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/contractions_fr.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/contractions_ga.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/contractions_it.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/hyphenations_ga.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stemdict_nl.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stoptags_ja.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_ar.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_bg.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_ca.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_cz.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_da.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_de.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_el.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_en.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_es.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_et.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_eu.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_fa.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_fi.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_fr.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_ga.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_gl.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_hi.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_hu.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_hy.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_id.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_it.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_ja.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_lv.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_nl.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_no.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_pt.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_pt_BR.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_ro.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_ru.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_sk.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_sv.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_th.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/stopwords_tr.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/lang/userdict_ja.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/managed-schema
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/mapping-FoldToASCII.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/mapping-ISOLatin1Accent.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/protwords.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/solrconfig.xml
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/spellings.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/stopwords.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/synonyms.txt
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/conf/update-script.js
A xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-search/src/main/resources/core.properties
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/pom.xml
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/currency.xml
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/elevate.xml
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/contractions_ca.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/contractions_fr.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/contractions_ga.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/contractions_it.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/hyphenations_ga.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stemdict_nl.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stoptags_ja.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_ar.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_bg.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_ca.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_cz.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_da.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_de.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_el.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_en.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_es.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_et.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_eu.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_fa.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_fi.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_fr.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_ga.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_gl.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_hi.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_hu.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_hy.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_id.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_it.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_ja.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_lv.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_nl.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_no.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_pt.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_pt_BR.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_ro.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_ru.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_sk.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_sv.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_th.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/stopwords_tr.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/lang/userdict_ja.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/managed-schema
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/mapping-FoldToASCII.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/mapping-ISOLatin1Accent.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/protwords.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/solrconfig.xml
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/spellings.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/stopwords.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/synonyms.txt
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/conf/update-script.js
R xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/src/main/resources/core.properties
M xwiki-platform-distribution/xwiki-platform-distribution-debian/pom.xml
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/pom.xml
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/pom.xml
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/src/deb/control/control
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/src/deb/control/postinst
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/src/deb/control/postrm
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/pom.xml
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-events/pom.xml
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-events/src/deb/control/control
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-events/src/deb/control/postinst
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-events/src/deb/control/postrm
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-extension_index/pom.xml
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-extension_index/src/deb/control/control
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-extension_index/src/deb/control/postinst
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-extension_index/src/deb/control/postrm
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-ratings/pom.xml
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-ratings/src/deb/control/control
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-ratings/src/deb/control/postinst
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-ratings/src/deb/control/postrm
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-search/pom.xml
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-search/src/deb/control/control
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-search/src/deb/control/postinst
A xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-search/src/deb/control/postrm
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-events/pom.xml
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-events/src/deb/control/control
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-events/src/deb/control/postinst
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-events/src/deb/control/postrm
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-extension_index/pom.xml
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-extension_index/src/deb/control/control
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-extension_index/src/deb/control/postinst
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-extension_index/src/deb/control/postrm
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-ratings/pom.xml
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-ratings/src/deb/control/control
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-ratings/src/deb/control/postinst
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-ratings/src/deb/control/postrm
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-search/pom.xml
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-search/src/deb/control/control
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-search/src/deb/control/postinst
R xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-search/src/deb/control/postrm
Log Message:
-----------
XWIKI-20477: Upgrade to Solr 9.4.0
* update package naming
Commit: b6a4974ac3bf3544441f3d37248323d930b5d360
https://github.com/xwiki/xwiki-platform/commit/b6a4974ac3bf3544441f3d372483…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M pom.xml
Log Message:
-----------
XWIKI-20477: Upgrade to Solr 9.4.0
* remove now unnecessary exclusions
Commit: 7a0b13136eed990c7886c219f20ab7282edcac22
https://github.com/xwiki/xwiki-platform/commit/7a0b13136eed990c7886c219f20a…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M pom.xml
M xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml
M xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-api/pom.xml
M xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-rest/pom.xml
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/pom.xml
M xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-api/pom.xml
M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/pom.xml
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-api/pom.xml
M xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/pom.xml
Log Message:
-----------
XWIKI-20477: Upgrade to Solr 9.4.0
XWIKI-12955: Upgrade to JAX-RS 2 (JSR339)
Commit: 733d2864be5880db0fbe8c81f6c8a1fe996a72ed
https://github.com/xwiki/xwiki-platform/commit/733d2864be5880db0fbe8c81f6c8…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M pom.xml
M xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/representations/AbstractFormUrlEncodedAnnotationRequestReader.java
M xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/src/main/java/org/xwiki/attachment/validation/internal/AttachmentValidationExceptionMapper.java
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/test/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntriesResourceTest.java
M xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/pom.xml
M xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionFileRESTResource.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/pom.xml
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/ComponentsObjectFactory.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/XWikiFilter.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/XWikiRestletJaxRsApplication.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/XWikiRestletServlet.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/XWikiSetupCleanupFilter.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/exceptions/XWikiRestExceptionMapper.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/representations/comments/FormUrlEncodedCommentReader.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/representations/objects/FormUrlEncodedObjectReader.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/representations/objects/FormUrlEncodedPropertyReader.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/representations/pages/FormUrlEncodedPageReader.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/representations/tags/FormUrlEncodedTagsReader.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/resources/BrowserAuthenticationResource.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/src/test/it/org/xwiki/rest/test/SpacesResourceIT.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/src/test/it/org/xwiki/rest/test/WikisResourceIT.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/src/test/it/org/xwiki/rest/test/framework/AbstractHttpIT.java
M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-integration/pom.xml
M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-rest/src/main/java/org/xwiki/test/extension/JobExecutor.java
M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/pom.xml
M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/WEB-INF/web.xml
M xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-api/pom.xml
M xwiki-platform-tools/xwiki-platform-tool-provision-plugin/src/main/java/org/xwiki/tool/provision/InstallMojo.java
Log Message:
-----------
XWIKI-12955: Upgrade to JAX-RS 2 (JSR339)
Commit: dbc643f65a1283dc70c7c01312ad40b73a04f8fa
https://github.com/xwiki/xwiki-platform/commit/dbc643f65a1283dc70c7c01312ad…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/AnnotationsRESTResource.java
M xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/representations/AbstractFormUrlEncodedAnnotationRequestReader.java
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/test/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntriesResourceTest.java
M xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionFileRESTResource.java
R xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/ComponentsObjectFactory.java
R xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/XWikiFilter.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/XWikiJaxRsApplication.java
R xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/XWikiRestletJaxRsApplication.java
R xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/XWikiRestletServlet.java
R xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/XWikiSetupCleanupFilter.java
A xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/jersey/Hello.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/representations/comments/FormUrlEncodedCommentReader.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/representations/objects/FormUrlEncodedObjectReader.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/representations/objects/FormUrlEncodedPropertyReader.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/representations/pages/FormUrlEncodedPageReader.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/representations/tags/FormUrlEncodedTagsReader.java
R xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/resources/BrowserAuthenticationResource.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/resources/META-INF/components.txt
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/src/test/it/org/xwiki/rest/test/SpacesResourceIT.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/src/test/it/org/xwiki/rest/test/WikisResourceIT.java
M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-rest/pom.xml
M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/WEB-INF/web.xml
Log Message:
-----------
XWIKI-12955: Upgrade to JAX-RS 2 (JSR339)
Compare: https://github.com/xwiki/xwiki-platform/compare/e4980d51cc14...dbc643f65a12
Branch: refs/heads/master
Home: https://github.com/xwiki-contrib/application-antispam
Commit: 23240ffc8ef7311a9f44366661749d476dfc3b2d
https://github.com/xwiki-contrib/application-antispam/commit/23240ffc8ef731…
Author: Vincent Massol <vincent(a)massol.net>
Date: 2023-12-03 (Sun, 03 Dec 2023)
Changed paths:
M application-antispam-api/pom.xml
M application-antispam-simple/pom.xml
M application-antispam-test/application-antispam-test-docker/pom.xml
M application-antispam-test/application-antispam-test-pageobjects/pom.xml
M application-antispam-test/pom.xml
M application-antispam-ui/pom.xml
M pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Branch: refs/heads/master
Home: https://github.com/xwiki-contrib/application-antispam
Commit: 23e26d318dc28634b9aa9a5949d99dd85a850ffe
https://github.com/xwiki-contrib/application-antispam/commit/23e26d318dc286…
Author: Vincent Massol <vincent(a)massol.net>
Date: 2023-12-03 (Sun, 03 Dec 2023)
Changed paths:
M application-antispam-api/pom.xml
M application-antispam-simple/pom.xml
M application-antispam-test/application-antispam-test-docker/pom.xml
M application-antispam-test/application-antispam-test-pageobjects/pom.xml
M application-antispam-test/pom.xml
M application-antispam-ui/pom.xml
M pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release application-antispam-1.10
Branch: refs/heads/master
Home: https://github.com/xwiki-contrib/application-antispam
Commit: 82b02721a8320b02f0f0cca6cfb412d6b42bbd49
https://github.com/xwiki-contrib/application-antispam/commit/82b02721a8320b…
Author: Vincent Massol <vincent(a)massol.net>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M application-antispam-api/src/main/java/org/xwiki/contrib/antispam/SpamCleaner.java
M application-antispam-api/src/main/java/org/xwiki/contrib/antispam/script/AntiSpamScriptService.java
M application-antispam-simple/src/main/java/org/xwiki/contrib/antispam/internal/simple/DefaultSpamCleaner.java
M application-antispam-test/application-antispam-test-docker/src/test/it/org/xwiki/contrib/antispam/test/ui/AntiSpamIT.java
M application-antispam-ui/src/main/resources/AntiSpam/WebHome.xml
M pom.xml
Log Message:
-----------
ANTISPAM-70: We can't bulk remove all events from users with a deleted profile page
* Also sort related pages with their natural order for consistent results
Branch: refs/heads/master
Home: https://github.com/xwiki-contrib/application-antispam
Commit: cdcd0f6e615782ea1b6319b251ed7f4107d2a324
https://github.com/xwiki-contrib/application-antispam/commit/cdcd0f6e615782…
Author: Vincent Massol <vincent(a)massol.net>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M application-antispam-api/src/main/java/org/xwiki/contrib/antispam/SpamChecker.java
A application-antispam-api/src/main/java/org/xwiki/contrib/antispam/SpamCheckerResult.java
M application-antispam-api/src/main/java/org/xwiki/contrib/antispam/script/AntiSpamScriptService.java
M application-antispam-simple/src/main/java/org/xwiki/contrib/antispam/internal/simple/DefaultSpamCheckerModel.java
M application-antispam-simple/src/main/java/org/xwiki/contrib/antispam/internal/simple/SimpleSpamChecker.java
M application-antispam-simple/src/main/java/org/xwiki/contrib/antispam/internal/simple/SimpleSpamCheckerListener.java
M application-antispam-simple/src/main/java/org/xwiki/contrib/antispam/internal/simple/SpamCheckerModel.java
M application-antispam-simple/src/test/java/org/xwiki/contrib/antispam/internal/simple/SimpleSpamCheckerListenerTest.java
M application-antispam-simple/src/test/java/org/xwiki/contrib/antispam/internal/simple/SimpleSpamCheckerTest.java
M application-antispam-test/application-antispam-test-docker/src/test/it/org/xwiki/contrib/antispam/test/ui/AntiSpamIT.java
M application-antispam-ui/src/main/resources/AntiSpam/WebHome.xml
M pom.xml
Log Message:
-----------
ANTISPAM-73: Provide the reason for the save to be considered as spam
Branch: refs/heads/main
Home: https://github.com/xwiki-contrib/cristal
Commit: 655d95b8bf0384de10552651a08864c1dcd24e27
https://github.com/xwiki-contrib/cristal/commit/655d95b8bf0384de10552651a08…
Author: Ludovic Dubost <ludovic(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M api/package.json
M ds/dsfr/package.json
M ds/shoelace/package.json
M ds/vuetify/package.json
M electron/main/package.json
M electron/preload/package.json
M electron/renderer/package.json
M extension-manager/package.json
M extensions/menubuttons/package.json
M lib/package.json
M macros/package.json
M rendering/rendering/package.json
M rendering/wikimodel/package.json
M sample-module/package.json
M sharedworker/api/package.json
M sharedworker/impl/package.json
M skin/package.json
M storage/package.json
M web/package.json
Log Message:
-----------
misc: updated vue and vue-tsc versions
Commit: 743ba578f5e7c562374eba9e853464d14441ff14
https://github.com/xwiki-contrib/cristal/commit/743ba578f5e7c562374eba9e853…
Author: Ludovic Dubost <ludovic(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M sharedworker/api/vite.config.ts
M sharedworker/impl/vite.config.ts
Log Message:
-----------
misc: changed shareworker module name, fix formatting
Commit: 4f02532cbbfbd448701df083bcfa05b96c3f6167
https://github.com/xwiki-contrib/cristal/commit/4f02532cbbfbd448701df083bcf…
Author: Ludovic Dubost <ludovic(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M ds/dsfr/src/vue/x-dialog.vue
M ds/vuetify/src/vue/x-dialog.vue
M skin/src/vue/c-header.vue
Log Message:
-----------
Fix dialog box component. It was not working for config box link on the logo
Compare: https://github.com/xwiki-contrib/cristal/compare/92079c4ecef8...4f02532cbbfb
Branch: refs/heads/XWIKI-21659
Home: https://github.com/xwiki/xwiki-platform
Commit: c8b4e9aae6465bf63f4772cf339bb726b192dce9
https://github.com/xwiki/xwiki-platform/commit/c8b4e9aae6465bf63f4772cf339b…
Author: Manuel Leduc <manuel.leduc(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/cards/LayoutCards.spec.js
A xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/cards/LayoutCardsCard.spec.js
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/table/LayoutTable.spec.js
A xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/table/LayoutTableRow.spec.js
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/cards/LayoutCards.vue
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/cards/LayoutCardsCard.vue
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTable.vue
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTableRow.vue
Log Message:
-----------
XWIKI-21659: Provide entry index in data attribute of LiveData
Branch: refs/heads/stable-15.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 9032c87117644d55edd58f3d5d893c184015d133
https://github.com/xwiki/xwiki-platform/commit/9032c87117644d55edd58f3d5d89…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/src/main/java/org/xwiki/ratings/internal/SolrRatingsManager.java
M xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/src/test/java/org/xwiki/ratings/internal/SolrRatingsManagerTest.java
Log Message:
-----------
XWIKI-21577: Ratings improperly remove ratings with 0 even if zero stored is allowed
* Fix storage of ratings when 0 should be stored
(cherry picked from commit 4e9d23f1d5b6a2aaebdbf614c9daed6dbb82de7d)
Branch: refs/heads/master
Home: https://github.com/xwiki/xwiki-platform
Commit: 4e9d23f1d5b6a2aaebdbf614c9daed6dbb82de7d
https://github.com/xwiki/xwiki-platform/commit/4e9d23f1d5b6a2aaebdbf614c9da…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/src/main/java/org/xwiki/ratings/internal/SolrRatingsManager.java
M xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/src/test/java/org/xwiki/ratings/internal/SolrRatingsManagerTest.java
Log Message:
-----------
XWIKI-21577: Ratings improperly remove ratings with 0 even if zero stored is allowed
* Fix storage of ratings when 0 should be stored
Branch: refs/heads/stable-15.5.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 24e8ad87790caeb4034d39a6c8359d20fb674939
https://github.com/xwiki/xwiki-platform/commit/24e8ad87790caeb4034d39a6c835…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/DefaultLiveDataSourceManager.java
Log Message:
-----------
XWIKI-21609: DefaultLiveDataSourceManager is silently ignoring component initialization errors
* Provide proper log errors in case of initialization problem instead
of ignoring it
(cherry picked from commit e87052f43ad91265abfbe40e5ed81c2341c1fa80)
Branch: refs/heads/stable-14.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: b9f7643e1662806b5c72d1e1e1694a743da2fe37
https://github.com/xwiki/xwiki-platform/commit/b9f7643e1662806b5c72d1e1e169…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/DefaultLiveDataSourceManager.java
Log Message:
-----------
XWIKI-21609: DefaultLiveDataSourceManager is silently ignoring component initialization errors
* Provide proper log errors in case of initialization problem instead
of ignoring it
(cherry picked from commit e87052f43ad91265abfbe40e5ed81c2341c1fa80)
Branch: refs/heads/stable-15.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: b1421369b1e010c76d5e5253cae3b2c42b40c5b1
https://github.com/xwiki/xwiki-platform/commit/b1421369b1e010c76d5e5253cae3…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/DefaultLiveDataSourceManager.java
Log Message:
-----------
XWIKI-21609: DefaultLiveDataSourceManager is silently ignoring component initialization errors
* Provide proper log errors in case of initialization problem instead
of ignoring it
(cherry picked from commit e87052f43ad91265abfbe40e5ed81c2341c1fa80)
Branch: refs/heads/master
Home: https://github.com/xwiki/xwiki-platform
Commit: e87052f43ad91265abfbe40e5ed81c2341c1fa80
https://github.com/xwiki/xwiki-platform/commit/e87052f43ad91265abfbe40e5ed8…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/DefaultLiveDataSourceManager.java
Log Message:
-----------
XWIKI-21609: DefaultLiveDataSourceManager is silently ignoring component initialization errors
* Provide proper log errors in case of initialization problem instead
of ignoring it
Branch: refs/heads/stable-14.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: a1c31ca64b52e876011a55bacd7de856e7e2b685
https://github.com/xwiki/xwiki-platform/commit/a1c31ca64b52e876011a55bacd7d…
Author: Michael Hamann <michael.hamann(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/EntityReference.java
M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/reference/EntityReferenceTest.java
M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/src/main/java/org/xwiki/security/internal/XWikiBridge.java
M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/src/main/java/org/xwiki/security/internal/DefaultXWikiBridge.java
M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/src/test/java/org/xwiki/security/internal/DefaultXWikiBridgeTest.java
Log Message:
-----------
XWIKI-21439: Security Cache ConflictingInsertionException (#2673)
* Remove parameters from entity references when constructing a security reference.
* Add a method for removing parameters to EntityReference
* Make sure to keep entity references unmodified when possible
(cherry picked from commit c80c1ff8b8d668d7736343b2b49a2928ccd67792)
Branch: refs/heads/stable-15.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 44af46aec7431bef062ddcac7eb3f53849efd900
https://github.com/xwiki/xwiki-platform/commit/44af46aec7431bef062ddcac7eb3…
Author: Michael Hamann <michael.hamann(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/EntityReference.java
M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/reference/EntityReferenceTest.java
M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/src/main/java/org/xwiki/security/internal/XWikiBridge.java
M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/src/main/java/org/xwiki/security/internal/DefaultXWikiBridge.java
M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/src/test/java/org/xwiki/security/internal/DefaultXWikiBridgeTest.java
Log Message:
-----------
XWIKI-21439: Security Cache ConflictingInsertionException (#2673)
* Remove parameters from entity references when constructing a security reference.
* Add a method for removing parameters to EntityReference
* Make sure to keep entity references unmodified when possible
(cherry picked from commit c80c1ff8b8d668d7736343b2b49a2928ccd67792)
Branch: refs/heads/master
Home: https://github.com/xwiki/xwiki-platform
Commit: c80c1ff8b8d668d7736343b2b49a2928ccd67792
https://github.com/xwiki/xwiki-platform/commit/c80c1ff8b8d668d7736343b2b49a…
Author: Michael Hamann <michael.hamann(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/EntityReference.java
M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/reference/EntityReferenceTest.java
M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/src/main/java/org/xwiki/security/internal/XWikiBridge.java
M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/src/main/java/org/xwiki/security/internal/DefaultXWikiBridge.java
M xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/src/test/java/org/xwiki/security/internal/DefaultXWikiBridgeTest.java
Log Message:
-----------
XWIKI-21439: Security Cache ConflictingInsertionException (#2673)
* Remove parameters from entity references when constructing a security reference.
* Add a method for removing parameters to EntityReference
* Make sure to keep entity references unmodified when possible
Branch: refs/heads/XWIKI-21659
Home: https://github.com/xwiki/xwiki-platform
Commit: ecbf94a2400f97332a2cc5993e6bdfdeda6f0a94
https://github.com/xwiki/xwiki-platform/commit/ecbf94a2400f97332a2cc5993e6b…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/cards/LayoutCards.spec.js
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/table/LayoutTable.spec.js
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/cards/LayoutCards.vue
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTable.vue
Log Message:
-----------
XWIKI-21659: Provide entry index in data attribute of LiveData
* Use a better data-attribute name
* Also add the entryId as data-attribute
* Provide some tests
Branch: refs/heads/MARKDOWN-80
Home: https://github.com/xwiki-contrib/syntax-markdown
Commit: 107a84a12c090fb16ed8b693db0b9b4ec110259f
https://github.com/xwiki-contrib/syntax-markdown/commit/107a84a12c090fb16ed…
Author: Vincent Massol <vincent(a)massol.net>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M syntax-markdown-commonmark12/pom.xml
M syntax-markdown-commonmark12/src/main/java/org/xwiki/contrib/rendering/markdown/commonmark12/internal/AbstractMarkdownConfiguration.java
M syntax-markdown-commonmark12/src/main/java/org/xwiki/contrib/rendering/markdown/commonmark12/internal/parser/AbbreviationNodeVisitor.java
M syntax-markdown-commonmark12/src/main/java/org/xwiki/contrib/rendering/markdown/commonmark12/internal/parser/AbstractNodeVisitor.java
M syntax-markdown-commonmark12/src/main/java/org/xwiki/contrib/rendering/markdown/commonmark12/internal/parser/HTMLNodeVisitor.java
M syntax-markdown-commonmark12/src/main/java/org/xwiki/contrib/rendering/markdown/commonmark12/internal/parser/TableNodeVisitor.java
M syntax-markdown-commonmark12/src/test/java/org/xwiki/contrib/rendering/markdown/commonmark12/internal/Markdown12SpecificTest.java
M syntax-markdown-commonmark12/src/test/resources/markdown12/specific/abbreviation.test
M syntax-markdown-commonmark12/src/test/resources/markdown12/specific/html1.test
M syntax-markdown-commonmark12/src/test/resources/markdown12/specific/html2.test
M syntax-markdown-commonmark12/src/test/resources/markdown12/specific/html3.test
M syntax-markdown-commonmark12/src/test/resources/markdown12/specific/symbol1.test
M syntax-markdown-commonmark12/src/test/resources/markdown12/specific/table1.test
R syntax-markdown-github10/src/test/resources/github10/specific/link3.test
R syntax-markdown-github10/src/test/resources/github10/specific/table1.test
Log Message:
-----------
MARKDOWN-80: Replace usage of RawBlock by the HTML macro
* Several problems remaining (see jira issue)
Branch: refs/heads/XWIKI-21659
Home: https://github.com/xwiki/xwiki-platform
Commit: 674c9adbb56401edf1b03ae397283ddc88ba5cc6
https://github.com/xwiki/xwiki-platform/commit/674c9adbb56401edf1b03ae39728…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/cards/LayoutCards.vue
M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTable.vue
Log Message:
-----------
XWIKI-21659: Provide entry index in data attribute of LiveData
* Add data-index attributes on the parent DOM node of the entries, for
both cards and table layouts
Branch: refs/heads/stable-15.5.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 42230a414aecadc79739d2f52b6f65d87b33e72a
https://github.com/xwiki/xwiki-platform/commit/42230a414aecadc79739d2f52b6f…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M pom.xml
M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/pom.xml
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml
Log Message:
-----------
[misc] Exclude optional jdbc connectors dependencies (they are not supposed to be needed in XWiki context and they can cause conflicts)
(cherry picked from commit fce99fa274e23bc865665b421488336a5c65e7f9)
Branch: refs/heads/stable-14.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 70021e6b4d73a380738c384086165e6b5d1f3f40
https://github.com/xwiki/xwiki-platform/commit/70021e6b4d73a380738c38408616…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M pom.xml
M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/pom.xml
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml
Log Message:
-----------
[misc] Exclude optional jdbc connectors dependencies (they are not supposed to be needed in XWiki context and they can cause conflicts)
(cherry picked from commit fce99fa274e23bc865665b421488336a5c65e7f9)
Branch: refs/heads/stable-15.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 6bbb55e4bf12a6b882b542eb4765b8a91c4d7f8c
https://github.com/xwiki/xwiki-platform/commit/6bbb55e4bf12a6b882b542eb4765…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M pom.xml
M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/pom.xml
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml
Log Message:
-----------
[misc] Exclude optional jdbc connectors dependencies (they are not supposed to be needed in XWiki context and they can cause conflicts)
(cherry picked from commit fce99fa274e23bc865665b421488336a5c65e7f9)
Branch: refs/heads/master
Home: https://github.com/xwiki/xwiki-platform
Commit: fce99fa274e23bc865665b421488336a5c65e7f9
https://github.com/xwiki/xwiki-platform/commit/fce99fa274e23bc865665b421488…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M pom.xml
M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/pom.xml
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml
Log Message:
-----------
[misc] Exclude optional jdbc connectors dependencies (they are not supposed to be needed in XWiki context and they can cause conflicts)
Branch: refs/heads/stable-15.5.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 285319ac232fb0402e7d3e93baaa713996e18410
https://github.com/xwiki/xwiki-platform/commit/285319ac232fb0402e7d3e93baaa…
Author: Sereza7 <lucas.charpentier(a)imt-atlantique.net>
Date: 2023-12-01 (Fri, 01 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ContentSheet.xml
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/htmlheader.vm
M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/office.vm
Log Message:
-----------
XWIKI-21579: Invalid lang HTML Tag when "German (Germany)" locale is set (#2627)
* Used the method from the java Locale object that's appropriate for our use case
(cherry picked from commit bb19b6a21664b59ce8ccf77a508a08350fccc01c)
(cherry picked from commit 887aa678ae39ed9eef285ee0c21faa1b8f4910e9)