Skip to content

Commit d32f9dd

Browse files
author
Julien Ruaux
committed
Upgraded dependencies and gradle wrapper
1 parent 22ee051 commit d32f9dd

File tree

5 files changed

+129
-98
lines changed

5 files changed

+129
-98
lines changed

‎gradle.properties

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
group=com.redis
22

3-
bootPluginVersion=2.6.1
3+
bootPluginVersion=2.6.4
44
dependencyPluginVersion=1.0.11.RELEASE
55
dockerPluginVersion=0.32.0
66
kordampBuildVersion=2.6.0
77
kordampPluginVersion=0.47.0
88

9-
lettucemodVersion=1.8.1
10-
testcontainersRedisVersion=1.4.6
9+
airliftVersion=214
10+
antlrVersion=4.9.3
11+
lettucemodVersion=2.16.0
12+
testcontainersRedisVersion=1.5.5
1113
jredisearchVersion=2.2.0
12-
trinoVersion=370
13-
ulidVersion=4.1.2
14+
sliceVersion=0.41
15+
trinoVersion=374
16+
ulidVersion=4.1.2
17+
unitsVersion=1.6

‎gradle/wrapper/gradle-wrapper.jar

285 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew.bat

Lines changed: 89 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,89 @@
1-
@rem
2-
@rem Copyright 2015 the original author or authors.
3-
@rem
4-
@rem Licensed under the Apache License, Version 2.0 (the "License");
5-
@rem you may not use this file except in compliance with the License.
6-
@rem You may obtain a copy of the License at
7-
@rem
8-
@rem https://www.apache.org/licenses/LICENSE-2.0
9-
@rem
10-
@rem Unless required by applicable law or agreed to in writing, software
11-
@rem distributed under the License is distributed on an "AS IS" BASIS,
12-
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
@rem See the License for the specific language governing permissions and
14-
@rem limitations under the License.
15-
@rem
16-
17-
@if "%DEBUG%" == "" @echo off
18-
@rem ##########################################################################
19-
@rem
20-
@rem Gradle startup script for Windows
21-
@rem
22-
@rem ##########################################################################
23-
24-
@rem Set local scope for the variables with windows NT shell
25-
if "%OS%"=="Windows_NT" setlocal
26-
27-
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
29-
set APP_BASE_NAME=%~n0
30-
set APP_HOME=%DIRNAME%
31-
32-
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33-
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34-
35-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
36-
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
37-
38-
@rem Find java.exe
39-
if defined JAVA_HOME goto findJavaFromJavaHome
40-
41-
set JAVA_EXE=java.exe
42-
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
44-
45-
echo.
46-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47-
echo.
48-
echo Please set the JAVA_HOME variable in your environment to match the
49-
echo location of your Java installation.
50-
51-
goto fail
52-
53-
:findJavaFromJavaHome
54-
set JAVA_HOME=%JAVA_HOME:"=%
55-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
56-
57-
if exist "%JAVA_EXE%" goto execute
58-
59-
echo.
60-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61-
echo.
62-
echo Please set the JAVA_HOME variable in your environment to match the
63-
echo location of your Java installation.
64-
65-
goto fail
66-
67-
:execute
68-
@rem Setup the command line
69-
70-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
71-
72-
73-
@rem Execute Gradle
74-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
75-
76-
:end
77-
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
79-
80-
:fail
81-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
82-
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
85-
86-
:mainEnd
87-
if "%OS%"=="Windows_NT" endlocal
88-
89-
:omega
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
17+
@if "%DEBUG%" == "" @echo off
18+
@rem ##########################################################################
19+
@rem
20+
@rem Gradle startup script for Windows
21+
@rem
22+
@rem ##########################################################################
23+
24+
@rem Set local scope for the variables with windows NT shell
25+
if "%OS%"=="Windows_NT" setlocal
26+
27+
set DIRNAME=%~dp0
28+
if "%DIRNAME%" == "" set DIRNAME=.
29+
set APP_BASE_NAME=%~n0
30+
set APP_HOME=%DIRNAME%
31+
32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
35+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
36+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
37+
38+
@rem Find java.exe
39+
if defined JAVA_HOME goto findJavaFromJavaHome
40+
41+
set JAVA_EXE=java.exe
42+
%JAVA_EXE% -version >NUL 2>&1
43+
if "%ERRORLEVEL%" == "0" goto execute
44+
45+
echo.
46+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47+
echo.
48+
echo Please set the JAVA_HOME variable in your environment to match the
49+
echo location of your Java installation.
50+
51+
goto fail
52+
53+
:findJavaFromJavaHome
54+
set JAVA_HOME=%JAVA_HOME:"=%
55+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
56+
57+
if exist "%JAVA_EXE%" goto execute
58+
59+
echo.
60+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61+
echo.
62+
echo Please set the JAVA_HOME variable in your environment to match the
63+
echo location of your Java installation.
64+
65+
goto fail
66+
67+
:execute
68+
@rem Setup the command line
69+
70+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
71+
72+
73+
@rem Execute Gradle
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
75+
76+
:end
77+
@rem End local scope for the variables with windows NT shell
78+
if "%ERRORLEVEL%"=="0" goto mainEnd
79+
80+
:fail
81+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
82+
rem the _cmd.exe /c_ return code!
83+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84+
exit /b 1
85+
86+
:mainEnd
87+
if "%OS%"=="Windows_NT" endlocal
88+
89+
:omega

‎subprojects/trino-redisearch/trino-redisearch.gradle

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,44 @@ plugins {
33
}
44

55
dependencies {
6-
implementation group: 'io.trino', name: 'trino-plugin-toolkit', version: trinoVersion
7-
compileOnly group: 'io.trino', name: 'trino-spi', version: trinoVersion
86
implementation group: 'com.redis', name: 'lettucemod', version: lettucemodVersion
97
implementation group: 'com.redislabs', name: 'jredisearch', version: jredisearchVersion
108
implementation group: 'com.github.f4b6a3', name: 'ulid-creator', version: ulidVersion
11-
testImplementation group: 'com.redis.testcontainers', name: 'testcontainers-redis-junit-jupiter', version: testcontainersRedisVersion
9+
implementation group: 'io.trino', name: 'trino-collect', version: trinoVersion
10+
implementation group: 'io.trino', name: 'trino-matching', version: trinoVersion
11+
implementation group: 'io.trino', name: 'trino-plugin-toolkit', version: trinoVersion
12+
implementation group: 'io.airlift', name: 'bootstrap', version: airliftVersion
13+
implementation group: 'io.airlift', name: 'concurrent', version: airliftVersion
14+
implementation group: 'io.airlift', name: 'configuration', version: airliftVersion
15+
implementation group: 'io.airlift', name: 'http-client', version: airliftVersion
16+
implementation group: 'io.airlift', name: 'json', version: airliftVersion
17+
implementation group: 'io.airlift', name: 'log', version: airliftVersion
18+
implementation group: 'io.airlift', name: 'log-manager', version: airliftVersion
19+
implementation group: 'io.airlift', name: 'units', version: unitsVersion
20+
implementation 'com.fasterxml.jackson.core:jackson-core'
21+
implementation 'com.fasterxml.jackson.core:jackson-databind'
22+
implementation 'com.google.guava:guava'
23+
implementation 'com.google.inject:guice'
24+
implementation 'javax.inject:javax.inject'
25+
implementation 'javax.validation:validation-api'
26+
runtimeOnly group: 'org.antlr', name: 'antlr4-runtime', version: antlrVersion
27+
compileOnly group: 'io.trino', name: 'trino-spi', version: trinoVersion
28+
compileOnly group: 'io.airlift', name: 'slice', version: sliceVersion
29+
compileOnly 'com.fasterxml.jackson.core:jackson-annotations'
30+
compileOnly 'org.openjdk.jol:jol-core'
31+
testImplementation group: 'com.redis.testcontainers', name: 'testcontainers-redis-junit', version: testcontainersRedisVersion
1232
testImplementation group: 'com.redis', name: 'lettucemod', version: lettucemodVersion, classifier: 'tests'
33+
testImplementation group: 'io.trino', name: 'trino-client', version: trinoVersion
34+
testImplementation group: 'io.trino', name: 'trino-main', version: trinoVersion
35+
testImplementation group: 'io.trino', name: 'trino-main', classifier: 'tests', version: trinoVersion
1336
testImplementation(group: 'io.trino', name: 'trino-testing', version: trinoVersion) {
1437
exclude group: 'org.testcontainers', module: 'testcontainers-java'
1538
}
1639
testImplementation group: 'io.trino', name: 'trino-jmx', version: trinoVersion
40+
testImplementation group: 'io.airlift', name: 'http-server', version: airliftVersion
41+
testImplementation group: 'io.airlift', name: 'node', version: airliftVersion
42+
testImplementation group: 'io.airlift', name: 'testing', version: airliftVersion
43+
testImplementation group: 'javax.servlet', name: 'javax.servlet-api'
1744
}
1845

1946
test {

0 commit comments

Comments
 (0)