From 6061d2705d16a8ce7b6c4cfbd81693cc5d2b3e0e Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sat, 22 Aug 2020 21:18:14 -0300
Subject: [PATCH] Update to Java 14
---
.settings/org.eclipse.core.resources.prefs | 1 +
.settings/org.eclipse.jdt.core.prefs | 6 +++---
README.md | 2 +-
bitbucket-pipelines.yml | 10 +++++-----
pom.xml | 8 ++++----
src/main/resources/data/MerchantPriceConfig.xml | 10 +++++-----
6 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index cf6931b950..365bbd6097 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 7befde4b80..1d0261b644 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=14
+org.eclipse.jdt.core.compiler.compliance=14
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=14
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/README.md b/README.md
index 0f232f2c34..a4371d692d 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Links
- [Forums](http://www.l2jserver.com/forum/)
-- [Live Support](https://gitter.im/L2J/L2J_Server)
+- [Discord](https://discord.gg/jMnKZA)
- [Trello](https://trello.com/b/qjLoH966)
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index ee02f148ba..e5f1a55597 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -1,4 +1,4 @@
-image: maven:3.6.3-jdk-11-slim
+image: openjdk:14-alpine
pipelines:
branches:
@@ -7,17 +7,17 @@ pipelines:
caches:
- maven
script:
- - apt-get update -y
- - apt-get install -y git
+ - apk update
+ - apk add git
- git clone --depth=1 https://bitbucket.org/l2jserver/l2j-server-game.git
- cd l2j-server-game
- - mvn install -DskipTests
+ - /bin/sh mvnw install -DskipTests
- cd ..
- step:
caches:
- maven
script:
- - mvn install
+ - /bin/sh mvnw install
artifacts:
- target/*.zip
- step:
diff --git a/pom.xml b/pom.xml
index 1b56593c26..3cdf5b4eb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,16 +6,16 @@
<version>2.6.2.0-SNAPSHOT</version>
<name>L2J DataPack</name>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>14</maven.compiler.source>
+ <maven.compiler.target>14</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<slf4j.version>1.7.30</slf4j.version>
<!-- L2J -->
<l2j-server-game.version>2.6.2.0-SNAPSHOT</l2j-server-game.version>
<!-- Test -->
- <testng.version>7.1.0</testng.version>
- <mockito.version>3.4.0</mockito.version>
+ <testng.version>7.3.0</testng.version>
+ <mockito.version>3.5.2</mockito.version>
<!-- Plugins -->
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
diff --git a/src/main/resources/data/MerchantPriceConfig.xml b/src/main/resources/data/MerchantPriceConfig.xml
index dc0a27884a..99e69d5546 100644
--- a/src/main/resources/data/MerchantPriceConfig.xml
+++ b/src/main/resources/data/MerchantPriceConfig.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Documentation: -->
-<!-- defaultPriceConfig -> ID of one of the price configs defined to be used when NPC has no price config. Can be ANY of the defined priceConfigs. Cannot be ommited, althrough you can emulate this by creating a dummy priceConfig. -->
+<!-- defaultPriceConfig -> ID of one of the price configs defined to be used when NPC has no price config. Can be ANY of the defined priceConfigs. Required, although you can emulate this by creating a dummy priceConfig. -->
<!-- id -> Defines the ID for relational references. -->
-<!-- name -> Name of the area, for human-friendlyness and debugging, cannot be ommited. -->
-<!-- baseTax -> Used on merchant item price calculation (see formula in the end), cannot be ommited. -->
-<!-- castleId -> ID of the castle that controls merchants of this config, castle tax will apply to merchants price. Can be ommited (causes it to assume that no castle controls this config). -->
+<!-- name -> Name of the area, for human-friendliness and debugging. -->
+<!-- baseTax -> Used on merchant item price calculation (see formula in the end). -->
+<!-- castleId -> ID of the castle that controls merchants of this config, castle tax will apply to merchants price. Optional (causes it to assume that no castle controls this config). -->
<!-- zoneId -> Attaches a given Town Zone to this priceConfig for convenience. -->
-<!-- Merchant NPCs that dont explicit define an priceConfig will check if they are inside of the zone of an priceConfig, if yes that priceConfig is used for that npc. Can be ommited, then no NPC will be added based on zone (ie priceConfig direct assigned to NPCs through config or when used as the default priceConfig). -->
+<!-- Merchant NPCs that don't explicit define an priceConfig will check if they are inside of the zone of an priceConfig, if yes that priceConfig is used for that NPC. Optional, then no NPC will be added based on zone (ie priceConfig direct assigned to NPCs through config or when used as the default priceConfig). -->
<!-- Merchant Price Formula price = baseItemPrice * (1 + baseTax/100 + castleTax/100) -->
<merchantPriceConfig defaultPriceConfig="18" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/MerchantPriceConfig.xsd">
<priceConfig id="0" name="Giran Town" baseTax="10" castleId="3" zoneId="11020" />
--
GitLab