Forráskód Böngészése

Minor dependency update

Zoey76 5 éve
szülő
commit
7f168af4bf
3 módosított fájl, 10 hozzáadás és 9 törlés
  1. 2 0
      .settings/org.eclipse.jdt.core.prefs
  2. 1 3
      README.md
  3. 7 6
      pom.xml

+ 2 - 0
.settings/org.eclipse.jdt.core.prefs

@@ -1,6 +1,8 @@
 eclipse.preferences.version=1
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 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.release=disabled
 org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.compiler.source=11

+ 1 - 3
README.md

@@ -44,8 +44,6 @@ Links
 
 
 - [Live Support](https://gitter.im/L2J/L2J_Server)
 - [Live Support](https://gitter.im/L2J/L2J_Server)
 
 
-- [Downloads](http://www.l2jserver.com/#downloads)
-
-- [Documentation](https://bitbucket.org/l2jserver/l2j_server/wiki)
+- [Trello](https://trello.com/b/qjLoH966)
 
 
 - [@l2jserver](https://twitter.com/l2jserver)
 - [@l2jserver](https://twitter.com/l2jserver)

+ 7 - 6
pom.xml

@@ -9,8 +9,9 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		<maven.compiler.target>11</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<slf4j.version>1.7.26</slf4j.version>
-		<log4j.version>2.11.1</log4j.version>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<slf4j.version>1.7.28</slf4j.version>
+		<log4j.version>2.12.1</log4j.version>
 		<InMemoryJavaCompiler.version>1.3.0</InMemoryJavaCompiler.version>
 		<InMemoryJavaCompiler.version>1.3.0</InMemoryJavaCompiler.version>
 		<gson.version>2.8.5</gson.version>
 		<gson.version>2.8.5</gson.version>
 		<weupnp.version>0.1.4</weupnp.version>
 		<weupnp.version>0.1.4</weupnp.version>
@@ -18,10 +19,10 @@
 		<l2j-server-commons.version>2.6.1.1</l2j-server-commons.version>
 		<l2j-server-commons.version>2.6.1.1</l2j-server-commons.version>
 		<l2j-server-geo-driver.version>2.6.1.0</l2j-server-geo-driver.version>
 		<l2j-server-geo-driver.version>2.6.1.0</l2j-server-geo-driver.version>
 		<!-- Test -->
 		<!-- Test -->
-		<testng.version>6.14.3</testng.version>
-		<mockito-core.version>2.24.5</mockito-core.version>
+		<testng.version>7.0.0</testng.version>
+		<mockito-core.version>3.0.0</mockito-core.version>
 		<!-- Plugins -->
 		<!-- Plugins -->
-		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+		<maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
 		<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
 		<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
 	</properties>
 	</properties>
 	<repositories>
 	<repositories>
@@ -50,7 +51,7 @@
 			<plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${maven-assembly-plugin.version}</version>
+				<version>${maven-assembly-plugin.version}</version><!--$NO-MVN-MAN-VER$-->
 				<executions>
 				<executions>
 					<execution>
 					<execution>
 						<phase>package</phase>
 						<phase>package</phase>