From 5c2f858f9642eccdace838396a2fa0b28ab90619 Mon Sep 17 00:00:00 2001
From: Rogiel Sulzbach <rogiel@rogiel.com>
Date: Sun, 1 Jul 2012 12:45:03 -0300
Subject: [PATCH] Update maven dependencies to latest released version

---
 l2jserver2-common/pom.xml                     | 32 +++++++++----------
 .../XMLConfigurationService.java              | 32 -------------------
 .../data/.gitignore                           |  1 +
 l2jserver2-loginserver/pom.xml                |  2 +-
 pom.xml                                       |  7 +---
 5 files changed, 18 insertions(+), 56 deletions(-)
 create mode 100644 l2jserver2-gameserver/l2jserver2-gameserver-freya/data/.gitignore

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 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.6.4</version>
+			<version>1.6.6</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.6.4</version>
+			<version>1.6.6</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -65,13 +65,13 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
-			<version>1.6.4</version>
+			<version>1.6.6</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.16</version>
+			<version>1.2.17</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -99,7 +99,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>12.0</version>
+			<version>13.0-rc1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -130,7 +130,7 @@
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-sql</artifactId>
-			<version>2.5.0</version>
+			<version>2.7.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -143,56 +143,54 @@
 		<dependency>
 			<groupId>com.orientechnologies</groupId>
 			<artifactId>orient-commons</artifactId>
-			<version>1.0rc9</version>
-			<scope>compile</scope>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.orientechnologies</groupId>
 			<artifactId>orientdb-core</artifactId>
-			<version>1.0rc9</version>
-			<scope>compile</scope>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.3.166</version>
+			<version>1.3.167</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
-			<version>10.8.2.2</version>
+			<version>10.9.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>de.schlichtherle.truezip</groupId>
 			<artifactId>truezip-kernel</artifactId>
-			<version>7.5.4</version>
+			<version>7.5.5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>de.schlichtherle.truezip</groupId>
 			<artifactId>truezip-driver-zip</artifactId>
-			<version>7.5.4</version>
+			<version>7.5.5</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>de.schlichtherle.truezip</groupId>
 			<artifactId>truezip-driver-file</artifactId>
-			<version>7.5.4</version>
+			<version>7.5.5</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>de.schlichtherle.truezip</groupId>
 			<artifactId>truezip-path</artifactId>
-			<version>7.5.4</version>
+			<version>7.5.5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.0.1</version>
+			<version>3.1</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
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 <T>
-	 *            the annotation type
-	 * @param annotationClass
-	 *            the annotation class
-	 * @param clazz
-	 *            the class to look for annotations
-	 * @return the annotation found
-	 */
-	private <T extends Annotation> T findAnnotation(Class<T> 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 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.6.4</version>
+			<version>1.6.6</version>
 			<type>jar</type>
 			<scope>runtime</scope>
 		</dependency>
diff --git a/pom.xml b/pom.xml
index 40b369e5c..20ee18c9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
-	
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -226,10 +226,5 @@
 			<url>http://download.java.net/maven/2</url>
 			<layout>default</layout>
 		</repository>
-		<repository>
-			<id>orientechnologies-repository</id>
-			<name>Orient Technologies Maven2 Repository</name>
-			<url>http://www.orientechnologies.com/listing/m2</url>
-		</repository>
 	</repositories>
 </project>