Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

solr 9.2.0 #126571

Merged
merged 2 commits into from
Apr 1, 2023
Merged

solr 9.2.0 #126571

merged 2 commits into from
Apr 1, 2023

Conversation

ZhongRuoyu
Copy link
Member

Created by brew bump


Created with brew bump-formula-pr.

@BrewTestBot BrewTestBot added automerge-skip `brew pr-automerge` will skip this pull request bump-formula-pr PR was created using `brew bump-formula-pr` labels Mar 24, 2023
@ZhongRuoyu ZhongRuoyu added the pre-release Artifact is pre-release label Mar 24, 2023
@ZhongRuoyu

This comment was marked as outdated.

@Moisan Moisan mentioned this pull request Mar 25, 2023
@github-actions

This comment was marked as outdated.

@github-actions github-actions bot added the stale No recent activity label Mar 27, 2023
@ZhongRuoyu ZhongRuoyu added in progress Stale bot should stay away and removed stale No recent activity pre-release Artifact is pre-release labels Mar 27, 2023
@ZhongRuoyu
Copy link
Member Author

  Error: ==> Testing solr
  ==> /opt/homebrew/Cellar/solr/9.2.0/bin/solr -i
  Your current version of Java is too old to run this version of Solr.
  We found major version , using command '/opt/homebrew/opt/openjdk/libexec/openjdk.jdk/Contents/Home/bin/java -version', with response:
  Picked up _JAVA_OPTIONS: -Duser.home=/Users/brew/Library/Caches/Homebrew/java_cache -Djava.io.tmpdir=/private/tmp
  openjdk version "19.0.2" 2023-01-17
  OpenJDK Runtime Environment Homebrew (build 19.0.2)
  OpenJDK 64-Bit Server VM Homebrew (build 19.0.2, mixed mode, sharing)
  
  Please install latest version of Java 11 or set JAVA_HOME properly.

@ZhongRuoyu ZhongRuoyu added the upstream issue An upstream issue report is needed label Mar 27, 2023
@ZhongRuoyu
Copy link
Member Author

Related to apache/solr@025c030#diff-49c29c8f653341f48008c38f5f2cf970fa430cdca29181c819d7bdcfcc722980R164.

# test that Java exists, is executable and correct version
JAVA_VER=$("$JAVA" -version 2>&1)
# ...
JAVA_VER_NUM=$(echo "$JAVA_VER" | head -1 | awk -F '"' '/version/ {print $2}' | sed -e's/^1\.//' | sed -e's/[._-].*$//')

_JAVA_OPTIONS is set in our test environment, so the first line of output will not contain the version string:

Picked up _JAVA_OPTIONS: -Duser.home=/Users/ruoyu/Library/Caches/Homebrew/java_cache -Djava.io.tmpdir=/private/tmp
openjdk version "19.0.2" 2023-01-17
OpenJDK Runtime Environment Homebrew (build 19.0.2)
OpenJDK 64-Bit Server VM Homebrew (build 19.0.2, mixed mode, sharing)

Even though head -1 is used here, the Picked up _JAVA_OPTIONS output did not affect the version check because Bash truncates them into one line. But not when double quotes are added:

$ JAVA_VER=$(java -version 2>&1)
$ echo $JAVA_VER
Picked up _JAVA_OPTIONS: -Duser.home=/Users/ruoyu/Library/Caches/Homebrew/java_cache -Djava.io.tmpdir=/private/tmp openjdk version "19.0.2" 2023-01-17 OpenJDK Runtime Environment Homebrew (build 19.0.2) OpenJDK 64-Bit Server VM Homebrew (build 19.0.2, mixed mode, sharing)
$ echo "$JAVA_VER"
Picked up _JAVA_OPTIONS: -Duser.home=/Users/ruoyu/Library/Caches/Homebrew/java_cache -Djava.io.tmpdir=/private/tmp
openjdk version "19.0.2" 2023-01-17
OpenJDK Runtime Environment Homebrew (build 19.0.2)
OpenJDK 64-Bit Server VM Homebrew (build 19.0.2, mixed mode, sharing)

@ZhongRuoyu
Copy link
Member Author

Reported upstream at https://issues.apache.org/jira/browse/SOLR-16721.

@SMillerDev
Copy link
Member

We could use apache/solr#1502

@ZhongRuoyu
Copy link
Member Author

ZhongRuoyu commented Mar 29, 2023

  |diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
  |index b153cef5b8bc581cc02140ac52a5d9cdd54a563d..488c6016af9a9246277f49b59a3ff8644a4a4713 100644
  |--- a/solr/CHANGES.txt
  |+++ b/solr/CHANGES.txt
  --------------------------
  No file to patch.  Skipping patch.
  1 out of 1 hunk ignored
  can't find file to patch at input line 33
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |diff --git a/solr/bin/solr b/solr/bin/solr
  |index d4d6905bc2549b04[176](https://github.com/Homebrew/homebrew-core/actions/runs/4551899869/jobs/8026670495?pr=126571#step:7:178)b34032bff445668e47b38..8b2c6d7f1b803d964724c586a0edab8e808b7a2b 100644
  |--- a/solr/bin/solr
  |+++ b/solr/bin/solr
  --------------------------
  No file to patch.  Skipping patch.
  1 out of 1 hunk ignored

Needs :p2.

@janhoy
Copy link

janhoy commented Mar 29, 2023

Cool way of adding a patch to the formula!

@ZhongRuoyu ZhongRuoyu force-pushed the bump-solr-9.2.0 branch 2 times, most recently from bf9bbe5 to 1395c42 Compare March 31, 2023 21:17
@ZhongRuoyu ZhongRuoyu removed the upstream issue An upstream issue report is needed label Mar 31, 2023
@ZhongRuoyu ZhongRuoyu added the ready to merge PR can be merged once CI is green label Mar 31, 2023
solr: remove `oom_solr.sh`

This was removed upstream in apache/solr@7e28b75.

solr: add patch
@p-linnane p-linnane removed the in progress Stale bot should stay away label Apr 1, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Apr 1, 2023

@github-actions github-actions bot added the CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. label Apr 1, 2023
@BrewTestBot BrewTestBot added this pull request to the merge queue Apr 1, 2023
Merged via the queue into Homebrew:master with commit 5369933 Apr 1, 2023
5 checks passed
@ZhongRuoyu ZhongRuoyu deleted the bump-solr-9.2.0 branch April 1, 2023 05:52
@github-actions github-actions bot added the outdated PR was locked due to age label May 2, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 2, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge-skip `brew pr-automerge` will skip this pull request bump-formula-pr PR was created using `brew bump-formula-pr` CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. outdated PR was locked due to age ready to merge PR can be merged once CI is green
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants