Skip to content

Commit 95658cd

Browse files
committed
Revert "Merge pull request #190 from Frederikam/bump-dependencies"
This reverts commit 6e40d00, reversing changes made to 7426132.
1 parent 978c2a6 commit 95658cd

File tree

5 files changed

+19
-64
lines changed

5 files changed

+19
-64
lines changed

build.gradle

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
buildscript {
22
ext {
3-
springBootVersion = '2.1.4.RELEASE'
4-
gradleGitVersion = '2.0.0'
5-
grgitVersion = '3.1.1'
6-
sonarqubeVersion = '2.7'
7-
kotlinVersion = '1.3.31'
3+
springBootVersion = '2.0.4.RELEASE'
4+
gradleGitVersion = '1.5.2'
5+
sonarqubeVersion = '2.6.2'
6+
kotlinVersion = '1.2.71'
87
testLoggerVersion = '1.6.0'
9-
versionsPluginVersion = '0.21.0'
108
}
119
repositories {
1210
maven { url "https://plugins.gradle.org/m2/" }
1311
maven { url 'http://repo.spring.io/plugins-release' }
1412
}
1513
dependencies {
1614
classpath "gradle.plugin.com.gorylenko.gradle-git-properties:gradle-git-properties:${gradleGitVersion}"
17-
classpath "org.ajoberstar.grgit:grgit-gradle:$grgitVersion"
1815
classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
1916
classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:${sonarqubeVersion}"
2017
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
2118
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
2219
classpath "com.adarshr:gradle-test-logger-plugin:$testLoggerVersion"
23-
classpath "com.github.ben-manes:gradle-versions-plugin:$versionsPluginVersion"
2420
}
2521
}
2622

@@ -39,8 +35,6 @@ allprojects {
3935
subprojects {
4036
apply plugin: 'java'
4137
apply plugin: 'idea'
42-
apply plugin: 'com.github.ben-manes.versions'
43-
4438
if (project.hasProperty("includeAnalysis")) {
4539
project.logger.lifecycle("applying analysis plugins")
4640
apply from: "../analysis.gradle"
@@ -63,32 +57,25 @@ subprojects {
6357
jappVersion = '1.3'
6458

6559
springBootVersion = "${springBootVersion}"
66-
springWebSocketVersion = '5.1.6.RELEASE'
60+
springWebSocketVersion = '5.0.8.RELEASE'
6761
logbackVersion = '1.2.3'
68-
sentryLogbackVersion = '1.7.22'
69-
oshiVersion = '3.13.2'
62+
sentryLogbackVersion = '1.7.7'
63+
oshiVersion = '3.13.0'
7064
jsonOrgVersion = '20180813'
71-
spotbugsAnnotationsVersion = '3.1.12'
72-
prometheusVersion = '0.6.0'
73-
commonsLangVersion = '3.9'
65+
spotbugsAnnotationsVersion = '3.1.6'
66+
prometheusVersion = '0.5.0'
67+
commonsLangVersion = '3.8'
7468

7569
//@formatter:on
7670
}
77-
78-
dependencyUpdates.resolutionStrategy {
79-
componentSelection { rules ->
80-
rules.all { ComponentSelection selection ->
81-
boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'preview', 'b', 'ea'].any { qualifier ->
82-
selection.candidate.version ==~ /(?i).*[.-]$qualifier[.\d-+]*/
83-
}
84-
if (rejected) {
85-
selection.reject('Release candidate')
86-
}
87-
}
88-
}
89-
}
9071
}
9172

9273
ext {
9374
moduleName = 'Lavalink-Parent'
9475
}
76+
77+
task wrapper(type: Wrapper) {
78+
gradleVersion = '4.10.2'
79+
//noinspection UnnecessaryQualifiedReference
80+
distributionType = Wrapper.DistributionType.ALL
81+
}

gradle/wrapper/gradle-wrapper.jar

561 Bytes
Binary file not shown.
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-5.4.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
11
#!/usr/bin/env sh
22

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-
# http://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-
#
18-
193
##############################################################################
204
##
215
## Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
4428
APP_BASE_NAME=`basename "$0"`
4529

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

4933
# Use the maximum available, or set MAX_FD != -1 to use that value.
5034
MAX_FD="maximum"

gradlew.bat

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
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 http://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-
171
@if "%DEBUG%" == "" @echo off
182
@rem ##########################################################################
193
@rem
@@ -30,7 +14,7 @@ set APP_BASE_NAME=%~n0
3014
set APP_HOME=%DIRNAME%
3115

3216
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
33-
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
17+
set DEFAULT_JVM_OPTS=
3418

3519
@rem Find java.exe
3620
if defined JAVA_HOME goto findJavaFromJavaHome

0 commit comments

Comments
 (0)