From 373ab15a487d0069d7967bf738004a8067bfde0e Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sat, 26 Jan 2019 13:24:37 -0300
Subject: [PATCH] Updating dependencies
JDK11, we recommend OpenJDK for both Linux and Windows.
Updating Bitbutcket Pipeline OpenJDK11.
Updating Gradle Wrapper to 5.1.1.
---
.settings/org.eclipse.jdt.core.prefs | 6 +++---
bitbucket-pipelines.yml | 2 +-
build.gradle | 6 +++---
gradle/wrapper/gradle-wrapper.properties | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index e504933df8..cea06e787a 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=10
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -127,7 +127,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=10
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 6ec462bfe8..b7ed64cd92 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -1,4 +1,4 @@
-image: openjdk:10.0.2-13-jre-sid
+image: openjdk:11-jre-slim
pipelines:
default:
diff --git a/build.gradle b/build.gradle
index de7f966f8a..968ceb9550 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'eclipse'
defaultTasks('zip')
-sourceCompatibility = JavaVersion.VERSION_1_10
-targetCompatibility = JavaVersion.VERSION_1_10
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
sourceSets {
mainSource {
@@ -27,7 +27,7 @@ dependencies {
compile files('../L2J_Server/dist/libs/mmocore.jar')
compile project(':L2J_Server')
testCompile 'org.testng:testng:6.14.3'
- testCompile 'org.mockito:mockito-core:2.20.1'
+ testCompile 'org.mockito:mockito-core:2.23.4'
}
task zip(type: Zip) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a95009c3b9..558870dad5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
--
GitLab