diff --git a/l2jserver2-common/pom.xml b/l2jserver2-common/pom.xml
index 29f7ba9f5..3e868dec1 100644
--- a/l2jserver2-common/pom.xml
+++ b/l2jserver2-common/pom.xml
@@ -24,13 +24,13 @@
org.slf4j
slf4j-log4j12
- 1.6.4
+ 1.6.6
runtime
org.slf4j
slf4j-api
- 1.6.4
+ 1.6.6
compile
@@ -65,13 +65,13 @@
org.slf4j
jcl-over-slf4j
- 1.6.4
+ 1.6.6
runtime
log4j
log4j
- 1.2.16
+ 1.2.17
jar
compile
@@ -99,7 +99,7 @@
com.google.guava
guava
- 12.0
+ 13.0-rc1
compile
@@ -130,7 +130,7 @@
com.mysema.querydsl
querydsl-sql
- 2.5.0
+ 2.7.0
compile
@@ -143,56 +143,54 @@
com.orientechnologies
orient-commons
- 1.0rc9
- compile
+ 1.0.1
com.orientechnologies
orientdb-core
- 1.0rc9
- compile
+ 1.0.1
com.h2database
h2
- 1.3.166
+ 1.3.167
jar
compile
org.apache.derby
derby
- 10.8.2.2
+ 10.9.1.0
compile
de.schlichtherle.truezip
truezip-kernel
- 7.5.4
+ 7.5.5
compile
de.schlichtherle.truezip
truezip-driver-zip
- 7.5.4
+ 7.5.5
runtime
de.schlichtherle.truezip
truezip-driver-file
- 7.5.4
+ 7.5.5
runtime
de.schlichtherle.truezip
truezip-path
- 7.5.4
+ 7.5.5
compile
org.apache.commons
commons-lang3
- 3.0.1
+ 3.1
compile
diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/XMLConfigurationService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/XMLConfigurationService.java
index 9226515e0..2712ae5e3 100644
--- a/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/XMLConfigurationService.java
+++ b/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/XMLConfigurationService.java
@@ -16,7 +16,6 @@
*/
package com.l2jserver.service.configuration;
-import java.lang.annotation.Annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.InvocationHandler;
@@ -32,7 +31,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Node;
-import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.l2jserver.service.AbstractService;
import com.l2jserver.service.ConfigurableService;
@@ -293,34 +291,4 @@ public class XMLConfigurationService extends AbstractService implements
.evaluate(properties, XPathConstants.NODE);
}
}
-
- /**
- * Tries to find an annotation in the class or any parent-class.
- *
- * @param
- * the annotation type
- * @param annotationClass
- * the annotation class
- * @param clazz
- * the class to look for annotations
- * @return the annotation found
- */
- private T findAnnotation(Class annotationClass,
- Class> clazz) {
- Preconditions.checkNotNull(annotationClass, "annotationClass");
- Preconditions.checkNotNull(clazz, "clazz");
-
- T ann = clazz.getAnnotation(annotationClass);
- if (ann != null)
- return ann;
-
- for (Class> clazz2 : annotationClass.getInterfaces()) {
- if (clazz2 == clazz)
- continue;
- ann = findAnnotation(annotationClass, clazz2);
- if (ann != null)
- return ann;
- }
- return null;
- }
}
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/data/.gitignore b/l2jserver2-gameserver/l2jserver2-gameserver-freya/data/.gitignore
new file mode 100644
index 000000000..e2647cd44
--- /dev/null
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/data/.gitignore
@@ -0,0 +1 @@
+/database
diff --git a/l2jserver2-loginserver/pom.xml b/l2jserver2-loginserver/pom.xml
index 348850e20..b9b7cd4f1 100644
--- a/l2jserver2-loginserver/pom.xml
+++ b/l2jserver2-loginserver/pom.xml
@@ -34,7 +34,7 @@
org.slf4j
slf4j-log4j12
- 1.6.4
+ 1.6.6
jar
runtime
diff --git a/pom.xml b/pom.xml
index 40b369e5c..20ee18c9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
repo
-
+
UTF-8
@@ -226,10 +226,5 @@
http://download.java.net/maven/2
default
-
- orientechnologies-repository
- Orient Technologies Maven2 Repository
- http://www.orientechnologies.com/listing/m2
-