Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-06 07:32:46 +00:00
Code Releases Activity

Fix duplicated maven dependencies

Browse Source
This commit is contained in:
Rogiel Sulzbach
2011-12-04 13:09:53 -02:00
parent 6b34407142
commit f959661eff
3 changed files with 2 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
l2jserver2-common/pom.xml
View File

@@ -90,7 +90,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>10.0</version> <version>10.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>

66
l2jserver2-gameserver/pom.xml
View File

@@ -100,24 +100,6 @@
<version>3.2.4.Final</version> <version>3.2.4.Final</version>
</dependency> </dependency>
<!-- google guice --> <!-- google guice -->
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>3.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-assistedinject</artifactId>
<version>3.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
<version>3.0</version>
<type>jar</type>
</dependency>
<!-- logging --> <!-- logging -->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@@ -126,12 +108,6 @@
<type>jar</type> <type>jar</type>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.6.1</version>
<type>jar</type>
</dependency>
<!-- database --> <!-- database -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
@@ -159,12 +135,6 @@
<version>1.0rc5</version> <version>1.0rc5</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.4</version>
<type>jar</type>
</dependency>
<!-- cache --> <!-- cache -->
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
@@ -186,42 +156,6 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!-- utils --> <!-- utils -->
<dependency>
<groupId>javolution</groupId>
<artifactId>javolution</artifactId>
<version>5.5.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>r09</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.5.6</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
<version>2.2</version>
<type>jar</type>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId> <groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId> <artifactId>ecj</artifactId>

2
l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java
View File

@@ -284,7 +284,7 @@ public class WorldEventDispatcherImpl implements WorldEventDispatcher {
return false; return false;
if (complete) if (complete)
return false; return false;
return cancel(); return cancel(mayInterruptIfRunning);
} }
@Override @Override