Skip to content

Commit f06e5d8

Browse files
vaish3496ravisuhag
vaish3496
authored and
ravisuhag
committed
chore: Update gradle version to 7.2 (raystack#101)
* Updated gradle version to 6.8.3 * Update gradle version to 7.2 * Update build.gradle * Minor changes * Minor changes * Remove max heap * Change runtime to runtimeOnly * Minor changes * Minor changes * Revert few changes
1 parent e3f321c commit f06e5d8

File tree

5 files changed

+117
-89
lines changed

5 files changed

+117
-89
lines changed

‎build.gradle

+47-40
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
maven { url 'https://plugins.gradle.org/m2/' }
44
}
55
dependencies {
6-
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
6+
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
77
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.4.7"
88
classpath "org.ajoberstar:gradle-git:1.6.0"
99
}
@@ -14,12 +14,19 @@ plugins {
1414
id 'idea'
1515
id 'checkstyle'
1616
id 'jacoco'
17-
id "com.google.protobuf" version "0.8.7"
18-
id 'nebula.ospackage' version '3.5.0'
17+
id "com.google.protobuf" version "0.8.17"
18+
id 'nebula.ospackage' version '8.6.3'
1919
id 'io.franzbecker.gradle-lombok' version '1.14'
2020
id 'maven-publish'
2121
}
2222

23+
configurations {
24+
compile
25+
testCompile
26+
compileClasspath
27+
runtime
28+
}
29+
2330
lombok {
2431
version = '1.18.4'
2532
sha256 = ""
@@ -37,7 +44,7 @@ repositories {
3744
mavenCentral()
3845
jcenter()
3946
maven {
40-
url "http://packages.confluent.io/maven"
47+
url "https://packages.confluent.io/maven"
4148
}
4249
}
4350

@@ -51,44 +58,44 @@ private Properties loadEnv() {
5158
def mainClassName = "io.odpf.firehose.launch.Main"
5259

5360
dependencies {
54-
compile group: 'com.google.protobuf', name: 'protobuf-java', version: '3.1.0'
55-
compile group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.1.0'
56-
compile group: 'com.newrelic.agent.java', name: 'newrelic-api', version: '3.31.1'
57-
compile group: 'com.timgroup', name: 'java-statsd-client', version: '3.1.0'
58-
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.2'
59-
compile group: 'org.aeonbits.owner', name: 'owner', version: '1.0.9'
60-
compile group: 'com.zaxxer', name: 'HikariCP', version: '2.6.0'
61-
compile group: 'com.google.guava', name: 'guava', version: '23.5-jre'
62-
compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1'
63-
compile group: 'com.samskivert', name: 'jmustache', version: '1.13'
64-
compile group: 'org.postgresql', name: 'postgresql', version: '9.4.1212'
65-
compile group: 'org.apache.kafka', name: 'kafka-clients', version: '2.4.0'
66-
compile group: 'org.apache.commons', name: 'commons-jexl', version: '2.1'
67-
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
68-
compile group: 'com.google.code.gson', name: 'gson', version: '2.7'
69-
compile group: 'com.gojek', name: 'stencil', version: '4.2.0' exclude group: 'org.slf4j'
70-
compile group: 'org.influxdb', name: 'influxdb-java', version: '2.5'
71-
compile group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0'
72-
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.7'
73-
compile group: 'redis.clients', name: 'jedis', version: '3.0.1'
74-
compile group: 'io.opentracing', name: 'opentracing-api', version: '0.33.0'
75-
compile group: 'io.opentracing.contrib', name: 'opentracing-kafka-client', version: '0.1.4'
76-
compile group: 'io.jaegertracing', name: 'jaeger-client', version: '1.0.0'
77-
compile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-high-level-client', version: '6.3.1'
78-
compile 'io.confluent:monitoring-interceptors:3.0.0'
79-
compile "io.grpc:grpc-all:1.18.0"
80-
compile group: 'org.jfrog.buildinfo', name: 'build-info-extractor', version: '2.6.3'
81-
compile group: 'com.google.gradle', name: 'osdetector-gradle-plugin', version: '1.2.1'
82-
compile group: 'org.apache.ivy', name: 'ivy', version: '2.2.0'
83-
compile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.12.8'
61+
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.1.0'
62+
implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.1.0'
63+
implementation group: 'com.newrelic.agent.java', name: 'newrelic-api', version: '3.31.1'
64+
implementation group: 'com.timgroup', name: 'java-statsd-client', version: '3.1.0'
65+
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.2'
66+
implementation group: 'org.aeonbits.owner', name: 'owner', version: '1.0.9'
67+
implementation group: 'com.zaxxer', name: 'HikariCP', version: '2.6.0'
68+
implementation group: 'com.google.guava', name: 'guava', version: '23.5-jre'
69+
implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1'
70+
implementation group: 'com.samskivert', name: 'jmustache', version: '1.13'
71+
implementation group: 'org.postgresql', name: 'postgresql', version: '9.4.1212'
72+
implementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.4.0'
73+
implementation group: 'org.apache.commons', name: 'commons-jexl', version: '2.1'
74+
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
75+
implementation group: 'com.google.code.gson', name: 'gson', version: '2.7'
76+
implementation group: 'com.gojek', name: 'stencil', version: '4.2.0' exclude group: 'org.slf4j'
77+
implementation group: 'org.influxdb', name: 'influxdb-java', version: '2.5'
78+
implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0'
79+
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.7'
80+
implementation group: 'redis.clients', name: 'jedis', version: '3.0.1'
81+
implementation group: 'io.opentracing', name: 'opentracing-api', version: '0.33.0'
82+
implementation group: 'io.opentracing.contrib', name: 'opentracing-kafka-client', version: '0.1.4'
83+
implementation group: 'io.jaegertracing', name: 'jaeger-client', version: '1.0.0'
84+
implementation group: 'org.elasticsearch.client', name: 'elasticsearch-rest-high-level-client', version: '6.3.1'
85+
implementation 'io.confluent:monitoring-interceptors:3.0.0'
86+
implementation "io.grpc:grpc-all:1.18.0"
87+
implementation group: 'org.jfrog.buildinfo', name: 'build-info-extractor', version: '2.6.3'
88+
implementation group: 'com.google.gradle', name: 'osdetector-gradle-plugin', version: '1.2.1'
89+
implementation group: 'org.apache.ivy', name: 'ivy', version: '2.2.0'
90+
implementation group: 'org.mongodb', name: 'mongo-java-driver', version: '3.12.8'
8491

8592

86-
testCompile group: 'junit', name: 'junit', version: '4.11'
87-
testCompile 'org.mockito:mockito-core:2.0.99-beta'
88-
testCompile "com.github.tomakehurst:wiremock:2.3.1"
89-
testCompile group: 'io.opentracing', name: 'opentracing-mock', version: '0.33.0'
90-
testCompile group: 'org.mock-server', name: 'mockserver-netty', version: '3.10.5'
91-
testCompile gradleTestKit()
93+
testImplementation group: 'junit', name: 'junit', version: '4.11'
94+
testImplementation 'org.mockito:mockito-core:2.0.99-beta'
95+
testImplementation "com.github.tomakehurst:wiremock:2.3.1"
96+
testImplementation group: 'io.opentracing', name: 'opentracing-mock', version: '0.33.0'
97+
testImplementation group: 'org.mock-server', name: 'mockserver-netty', version: '3.10.5'
98+
testImplementation gradleTestKit()
9299
}
93100

94101
protobuf {

‎gradle/wrapper/gradle-wrapper.jar

6.13 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Feb 17 12:14:22 IST 2017
1+
#Wed Aug 25 23:42:32 IST 2021
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
23
distributionBase=GRADLE_USER_HOME
34
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
6+
zipStoreBase=GRADLE_USER_HOME

‎gradlew

+43-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
218

319
##############################################################################
420
##
@@ -28,16 +44,16 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS=''
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"
3551

36-
warn ( ) {
52+
warn () {
3753
echo "$*"
3854
}
3955

40-
die ( ) {
56+
die () {
4157
echo
4258
echo "$*"
4359
echo
@@ -66,6 +82,7 @@ esac
6682

6783
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6884

85+
6986
# Determine the Java command to use to start the JVM.
7087
if [ -n "$JAVA_HOME" ] ; then
7188
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
109126
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110127
fi
111128

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
116134
JAVACMD=`cygpath --unix "$JAVACMD"`
117135

118136
# We build the pattern for arguments to be converted via cygpath
@@ -138,32 +156,30 @@ if $cygwin ; then
138156
else
139157
eval `echo args$i`="\"$arg\""
140158
fi
141-
i=$((i+1))
159+
i=`expr $i + 1`
142160
done
143161
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154172
esac
155173
fi
156174

157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
175+
# Escape application args
176+
save () {
177+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
178+
echo " "
160179
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
180+
APP_ARGS=`save "$@"`
163181

164-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
165-
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
166-
cd "$(dirname "$0")"
167-
fi
182+
# Collect all arguments for the java command, following the shell quoting and substitution rules
183+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
168184

169-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
185+
exec "$JAVACMD" "$@"

‎gradlew.bat

+24-19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
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+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
1329
set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
1635
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
36+
set DEFAULT_JVM_OPTS=""
1837

1938
@rem Find java.exe
2039
if defined JAVA_HOME goto findJavaFromJavaHome
2140

2241
set JAVA_EXE=java.exe
2342
%JAVA_EXE% -version >NUL 2>&1
24-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
2544

2645
echo.
2746
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
3554
set JAVA_HOME=%JAVA_HOME:"=%
3655
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
3756

38-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
3958

4059
echo.
4160
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
4564

4665
goto fail
4766

48-
:init
49-
@rem Get command-line arguments, handling Windows variants
50-
51-
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
53-
:win9xME_args
54-
@rem Slurp the command line arguments.
55-
set CMD_LINE_ARGS=
56-
set _SKIP=2
57-
58-
:win9xME_args_slurp
59-
if "x%~1" == "x" goto execute
60-
61-
set CMD_LINE_ARGS=%*
62-
6367
:execute
6468
@rem Setup the command line
6569

6670
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
6771

72+
6873
@rem Execute Gradle
69-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
7075

7176
:end
7277
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)