This is likely related to the concerns recently raised in this thread: https://lists.apache.org/thread/ybmp5xz3c9549opqgktdb4cxlpmdmwy4
A short-term workaround is to rebase on upstream main, I think. Michael On Fri, Aug 25, 2023 at 1:00 PM Isabelle Giguere <igigu...@opentext.com.invalid> wrote: > > Hi again; > > My PR build keeps failing because of unrelated patches being applied. > > The PR branch has no conflicts with master, and the fork is up-to-date (as of > writing this, could change any minute), so I don't understand why these > patches are being applied. > > Note that I will not have time to look into this in the next few weeks. > > If anyone with some knowledge of SOLR-16861 and/or SOLR-16809 wants to look > into this, feel free to use the fork. > > Thank you > > ------------------------------ > Applying: SOLR-16861: Correct(override) MDC info forerror: patch failed: > solr/core/src/java/org/apache/solr/core/NodeConfig.java:145 > error: solr/core/src/java/org/apache/solr/core/NodeConfig.java: patch does > not apply > hint: Use 'git am --show-current-patch=diff' to see the failed patch > `CoordinatorHttpSolrCall` (#1753) > Applying: SOLR-15734: Add "Major Changes" note for 9.3 v2 API changes > Applying: SOLR-16809: Converge logic for hidden sysProps > > Patch failed at 0115 SOLR-16809: Converge logic for hidden sysProps > ... > ------------------------------- > > Isabelle Giguère > > > ________________________________ > De : Isabelle Giguere <igigu...@opentext.com.INVALID> > Envoyé : 23 août 2023 15:13 > À : Mike Drob <md...@mdrob.com> > Cc : dev solr <dev@solr.apache.org> > Objet : Re: [EXTERNAL] - Re: PR reviewed > > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe. If you feel that the email is suspicious, please report it > using PhishAlarm. > > > Hi Mike; > > Thanks for the heads-up. > > Task "validateSourcePatterns" fails if there's no logger specific to the test > class! > > I'll fix that... But... Should "validateSourcePatterns" be so picky about > logging in test classes? > Just a thought. > > Isabelle Giguère > > > ________________________________ > De : Mike Drob <md...@mdrob.com> > Envoyé : 23 août 2023 12:14 > À : Isabelle Giguere <igigu...@opentext.com> > Cc : dev solr <dev@solr.apache.org> > Objet : [EXTERNAL] - Re: PR reviewed > > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe. If you feel that the email is suspicious, please report it > using PhishAlarm. > > Resending with corrected email address > > On Wed, Aug 23, 2023 at 11:13 AM Mike Drob > <md...@mdrob.com<mailto:md...@mdrob.com>> wrote: > Hi Isabelle, > > It looks like there is a precommit check issue with the code still, can you > take a look and address that? You should be able to click on "details" for > the failing check, or run it locally using ./gradlew check -x test > > Thanks for your contribution! > > On Wed, Aug 23, 2023 at 9:52 AM Isabelle Giguere > <igigu...@opentext.com.invalid> wrote: > Hello Solr committers! > > This PR was reviewed by Christine > Poerschke<https://urldefense.com/v3/__https://github.com/cpoerschke__;!!Obbck6kTJA!duKnEIiSaXVHBEWj835rekhNLQQNmKDttzEvh0as8goQtakJlinf3RMOV1dceYMQVHMyxeHHQXhYjZ0AqmqjPupy72w$ > > <https://urldefense.com/v3/__https://github.com/cpoerschke__;!!Obbck6kTJA!apdgjI2Vf7UM6mj_LfBCJLMlYsIQTv5AmJN5uV6Jp8Bw9pO7Uw8kGnMJtHAmpjWqSaPV3UHSzhcbBw$>> > and Alex > D<https://urldefense.com/v3/__https://github.com/stillalex__;!!Obbck6kTJA!duKnEIiSaXVHBEWj835rekhNLQQNmKDttzEvh0as8goQtakJlinf3RMOV1dceYMQVHMyxeHHQXhYjZ0AqmqjIprbmAI$ > > <https://urldefense.com/v3/__https://github.com/stillalex__;!!Obbck6kTJA!apdgjI2Vf7UM6mj_LfBCJLMlYsIQTv5AmJN5uV6Jp8Bw9pO7Uw8kGnMJtHAmpjWqSaPV3UHitnUfYw$>>. > Thank you both 🙂 > > IMHO, the code is as clean as it's going to get. I hope it can be merged > some day. > > https://urldefense.com/v3/__https://github.com/apache/solr/pull/1632__;!!Obbck6kTJA!duKnEIiSaXVHBEWj835rekhNLQQNmKDttzEvh0as8goQtakJlinf3RMOV1dceYMQVHMyxeHHQXhYjZ0AqmqjSTGD-Bw$ > > <https://urldefense.com/v3/__https://github.com/apache/solr/pull/1632__;!!Obbck6kTJA!apdgjI2Vf7UM6mj_LfBCJLMlYsIQTv5AmJN5uV6Jp8Bw9pO7Uw8kGnMJtHAmpjWqSaPV3UHpLPkKqA$> > > Regards; > > Isabelle Giguère > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@solr.apache.org For additional commands, e-mail: dev-h...@solr.apache.org
