summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml44
1 files changed, 25 insertions, 19 deletions
diff --git a/pom.xml b/pom.xml
index 6123b50d8e..0ef6d2df0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-parent</artifactId>
<packaging>pom</packaging>
- <version>2.1.3</version>
+ <version>2.1.4-SNAPSHOT</version>
<name>Gerrit Code Review - Parent</name>
<url>http://code.google.com/p/gerrit/</url>
@@ -46,12 +46,12 @@ limitations under the License.
</issueManagement>
<properties>
- <jgitVersion>0.8.4</jgitVersion>
+ <jgitVersion>0.8.4.87-g395d236</jgitVersion>
<gwtormVersion>1.1.4</gwtormVersion>
<gwtjsonrpcVersion>1.2.2</gwtjsonrpcVersion>
<gwtexpuiVersion>1.2.1</gwtexpuiVersion>
- <gwtVersion>2.0.3</gwtVersion>
- <slf4jVersion>1.5.8</slf4jVersion>
+ <gwtVersion>2.0.4</gwtVersion>
+ <slf4jVersion>1.6.1</slf4jVersion>
<guiceVersion>2.0</guiceVersion>
<jettyVersion>7.0.2.v20100331</jettyVersion>
<keyappletVersion>1.0</keyappletVersion>
@@ -82,6 +82,7 @@ limitations under the License.
<module>gerrit-reviewdb</module>
<module>gerrit-server</module>
<module>gerrit-sshd</module>
+ <module>gerrit-gwtdebug</module>
<module>gerrit-war</module>
<module>gerrit-gwtui</module>
@@ -402,12 +403,6 @@ limitations under the License.
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<dependencyManagement>
@@ -554,6 +549,12 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.5</version>
+ </dependency>
+
+ <dependency>
<groupId>eu.medsea.mimeutil</groupId>
<artifactId>mime-util</artifactId>
<version>2.1.3</version>
@@ -606,7 +607,7 @@ limitations under the License.
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.15</version>
+ <version>1.2.16</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -661,7 +662,7 @@ limitations under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.8.1</version>
</dependency>
<dependency>
@@ -692,13 +693,7 @@ limitations under the License.
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.5.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.4</version>
+ <version>3.0</version>
</dependency>
<dependency>
@@ -736,6 +731,12 @@ limitations under the License.
<artifactId>juniversalchardet</artifactId>
<version>1.0.3</version>
</dependency>
+
+ <dependency>
+ <groupId>dk.brics.automaton</groupId>
+ <artifactId>automaton</artifactId>
+ <version>1.11.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -769,5 +770,10 @@ limitations under the License.
<id>objectweb-repository</id>
<url>http://maven.objectweb.org/maven2/</url>
</repository>
+
+ <repository>
+ <id>clojars-repo</id>
+ <url>http://clojars.org/repo</url>
+ </repository>
</repositories>
</project>