honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Rename] Fix env variables and old es maven repo (#439) 

This commit fixes some straggling es. environment variables along with a
reference to old elasticsearch versions from an opensearch maven repo that
doesn't exist.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
This commit is contained in:
Nick Knize 2021-03-22 12:17:54 -05:00 committed by GitHub
parent 764884f785
commit 1babf43777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distribution/src/bin/opensearch-cli.bat
View File

@ -18,9 +18,9 @@ set OPENSEARCH_JAVA_OPTS=-Xms4m -Xmx64m -XX:+UseSerialGC %OPENSEARCH_JAVA_OPTS%
%JAVA% ^ %JAVA% ^
%OPENSEARCH_JAVA_OPTS% ^ %OPENSEARCH_JAVA_OPTS% ^
-Des.path.home="%OPENSEARCH_HOME%" ^ -Dopensearch.path.home="%OPENSEARCH_HOME%" ^
-Des.path.conf="%OPENSEARCH_PATH_CONF%" ^ -Dopensearch.path.conf="%OPENSEARCH_PATH_CONF%" ^
-Des.distribution.type="%OPENSEARCH_DISTRIBUTION_TYPE%" ^ -Dopensearch.distribution.type="%OPENSEARCH_DISTRIBUTION_TYPE%" ^
-cp "%OPENSEARCH_CLASSPATH%" ^ -cp "%OPENSEARCH_CLASSPATH%" ^
"%OPENSEARCH_MAIN_CLASS%" ^ "%OPENSEARCH_MAIN_CLASS%" ^
%* %*

2
distribution/src/bin/opensearch-service.bat
View File

@ -194,7 +194,7 @@ if "%JVM_SS%" == "" (
set OTHER_JAVA_OPTS=%OTHER_JAVA_OPTS:"=% set OTHER_JAVA_OPTS=%OTHER_JAVA_OPTS:"=%
set OTHER_JAVA_OPTS=%OTHER_JAVA_OPTS:~1% set OTHER_JAVA_OPTS=%OTHER_JAVA_OPTS:~1%
set OPENSEARCH_PARAMS=-Dopensearch;-Des.path.home="%OPENSEARCH_HOME%";-Des.path.conf="%OPENSEARCH_PATH_CONF%";-Des.distribution.type="%OPENSEARCH_DISTRIBUTION_TYPE%";-Des.bundled_jdk="%OPENSEARCH_BUNDLED_JDK%" set OPENSEARCH_PARAMS=-Dopensearch;-Dopensearch.path.home="%OPENSEARCH_HOME%";-Dopensearch.path.conf="%OPENSEARCH_PATH_CONF%";-Dopensearch.distribution.type="%OPENSEARCH_DISTRIBUTION_TYPE%";-Dopensearch.bundled_jdk="%OPENSEARCH_BUNDLED_JDK%"
if "%OPENSEARCH_START_TYPE%" == "" set OPENSEARCH_START_TYPE=manual if "%OPENSEARCH_START_TYPE%" == "" set OPENSEARCH_START_TYPE=manual
if "%OPENSEARCH_STOP_TIMEOUT%" == "" set OPENSEARCH_STOP_TIMEOUT=0 if "%OPENSEARCH_STOP_TIMEOUT%" == "" set OPENSEARCH_STOP_TIMEOUT=0

6
distribution/src/bin/opensearch.bat
View File

@ -98,9 +98,9 @@ SET KEYSTORE_PASSWORD=!KEYSTORE_PASSWORD:^>=^^^>!
SET KEYSTORE_PASSWORD=!KEYSTORE_PASSWORD:^\=^^^\! SET KEYSTORE_PASSWORD=!KEYSTORE_PASSWORD:^\=^^^\!
ECHO.!KEYSTORE_PASSWORD!| %JAVA% %OPENSEARCH_JAVA_OPTS% -Dopensearch ^ ECHO.!KEYSTORE_PASSWORD!| %JAVA% %OPENSEARCH_JAVA_OPTS% -Dopensearch ^
-Des.path.home="%OPENSEARCH_HOME%" -Des.path.conf="%OPENSEARCH_PATH_CONF%" ^ -Dopensearch.path.home="%OPENSEARCH_HOME%" -Dopensearch.path.conf="%OPENSEARCH_PATH_CONF%" ^
-Des.distribution.type="%OPENSEARCH_DISTRIBUTION_TYPE%" ^ -Dopensearch.distribution.type="%OPENSEARCH_DISTRIBUTION_TYPE%" ^
-Des.bundled_jdk="%OPENSEARCH_BUNDLED_JDK%" ^ -Dopensearch.bundled_jdk="%OPENSEARCH_BUNDLED_JDK%" ^
-cp "%OPENSEARCH_CLASSPATH%" "org.opensearch.bootstrap.OpenSearch" !newparams! -cp "%OPENSEARCH_CLASSPATH%" "org.opensearch.bootstrap.OpenSearch" !newparams!
endlocal endlocal

6
modules/reindex/build.gradle
View File

@ -94,9 +94,9 @@ dependencies {
/* Right now we just test against the latest version of each major we expect /* Right now we just test against the latest version of each major we expect
* reindex-from-remote to work against. We could randomize the versions but * reindex-from-remote to work against. We could randomize the versions but
* that doesn't seem worth it at this point. */ * that doesn't seem worth it at this point. */
es2 'org.opensearch.distribution.zip:elasticsearch:2.4.5@zip' es2 'org.elasticsearch.distribution.zip:elasticsearch:2.4.5@zip'
es1 'org.opensearch:elasticsearch:1.7.6@zip' es1 'org.elasticsearch:elasticsearch:1.7.6@zip'
es090 'org.opensearch:elasticsearch:0.90.13@zip' es090 'org.elasticsearch:elasticsearch:0.90.13@zip'
} }
jdks { jdks {