diff --git a/gerrit-common/pom.xml b/gerrit-common/pom.xml index a69142b101..1db35498a4 100644 --- a/gerrit-common/pom.xml +++ b/gerrit-common/pom.xml @@ -61,6 +61,11 @@ limitations under the License. gerrit-patch-jgit ${project.version} + + + com.google.code.findbugs + jsr305 + diff --git a/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/libraries.config b/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/libraries.config index b99267cb18..f4c58084cb 100644 --- a/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/libraries.config +++ b/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/libraries.config @@ -19,6 +19,6 @@ sha1 = 6327a5f7a3dc45e0fd735adb5d08c5a74c05c20c [library "mysqlDriver"] - name = MySQL Connector/J 5.1.10 - url = http://repo2.maven.org/maven2/mysql/mysql-connector-java/5.1.10/mysql-connector-java-5.1.10.jar - sha1 = b83574124f1a00d6f70d56ba64aa52b8e1588e6d + name = MySQL Connector/J 5.1.21 + url = http://repo2.maven.org/maven2/mysql/mysql-connector-java/5.1.21/mysql-connector-java-5.1.21.jar + sha1 = 7abbd19fc2e2d5b92c0895af8520f7fa30266be9 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterModules.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterModules.java index e8af06092c..eacdfa0ed1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterModules.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterModules.java @@ -299,7 +299,7 @@ class AutoRegisterModules { return data; } - private static class ClassData implements ClassVisitor { + private static class ClassData extends ClassVisitor { private static final String EXPORT = Type.getType(Export.class).getDescriptor(); private static final String LISTEN = Type.getType(Listen.class).getDescriptor(); @@ -308,6 +308,10 @@ class AutoRegisterModules { String exportedAsName; boolean listen; + ClassData() { + super(Opcodes.ASM4); + } + boolean isConcrete() { return (access & Opcodes.ACC_ABSTRACT) == 0 && (access & Opcodes.ACC_INTERFACE) == 0; @@ -370,8 +374,12 @@ class AutoRegisterModules { } } - private static abstract class AbstractAnnotationVisitor implements + private static abstract class AbstractAnnotationVisitor extends AnnotationVisitor { + AbstractAnnotationVisitor() { + super(Opcodes.ASM4); + } + @Override public AnnotationVisitor visitAnnotation(String arg0, String arg1) { return null; diff --git a/pom.xml b/pom.xml index b257992772..228e7f1d6f 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ limitations under the License. 2.0.0.201206130900-r.23-gb3dbf19 - 1.4 + 1.5 1.3 1.2.6 2.4.0 @@ -478,7 +478,7 @@ limitations under the License. com.google.guava guava - 12.0.1 + 13.0.1 @@ -762,13 +762,13 @@ limitations under the License. com.h2database h2 - 1.2.147 + 1.3.168 postgresql postgresql - 9.0-801.jdbc4 + 9.1-901-1.jdbc4 @@ -843,6 +843,17 @@ limitations under the License. pegdown 1.1.0 + + + org.parboiled + parboiled-core + 1.1 + + + org.parboiled + parboiled-java + 1.1 + @@ -862,11 +873,6 @@ limitations under the License. http://download.java.net/maven/2/ - - objectweb-repository - http://maven.objectweb.org/maven2/ - - clojars-repo http://clojars.org/repo @@ -876,5 +882,10 @@ limitations under the License. scala-tools http://scala-tools.org/repo-releases + + + parboiled-repo + http://repo.spray.cc/ +