Update dependencies to asm 4

Support ASM 4.0 by updating gwtorm. Match the rest of gwtorm's
dependencies at the same time, including bumping the H2, PostgreSQL
and MySQL database drivers.

Change-Id: I0e414f1482b0732cfa929ac7b125966c929089ab
This commit is contained in:
Shawn O. Pearce 2012-09-10 11:58:12 -07:00
parent 3153be519d
commit 92024008e1
4 changed files with 38 additions and 14 deletions

View File

@ -61,6 +61,11 @@ limitations under the License.
<artifactId>gerrit-patch-jgit</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
</dependencies>
<build>

View File

@ -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

View File

@ -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;

29
pom.xml
View File

@ -47,7 +47,7 @@ limitations under the License.
<properties>
<jgitVersion>2.0.0.201206130900-r.23-gb3dbf19</jgitVersion>
<gwtormVersion>1.4</gwtormVersion>
<gwtormVersion>1.5</gwtormVersion>
<gwtjsonrpcVersion>1.3</gwtjsonrpcVersion>
<gwtexpuiVersion>1.2.6</gwtexpuiVersion>
<gwtVersion>2.4.0</gwtVersion>
@ -478,7 +478,7 @@ limitations under the License.
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>12.0.1</version>
<version>13.0.1</version>
</dependency>
<dependency>
@ -762,13 +762,13 @@ limitations under the License.
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.2.147</version>
<version>1.3.168</version>
</dependency>
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.0-801.jdbc4</version>
<version>9.1-901-1.jdbc4</version>
</dependency>
<dependency>
@ -843,6 +843,17 @@ limitations under the License.
<artifactId>pegdown</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.parboiled</groupId>
<artifactId>parboiled-core</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.parboiled</groupId>
<artifactId>parboiled-java</artifactId>
<version>1.1</version>
</dependency>
</dependencies>
</dependencyManagement>
@ -862,11 +873,6 @@ limitations under the License.
<url>http://download.java.net/maven/2/</url>
</repository>
<repository>
<id>objectweb-repository</id>
<url>http://maven.objectweb.org/maven2/</url>
</repository>
<repository>
<id>clojars-repo</id>
<url>http://clojars.org/repo</url>
@ -876,5 +882,10 @@ limitations under the License.
<id>scala-tools</id>
<url>http://scala-tools.org/repo-releases</url>
</repository>
<repository>
<id>parboiled-repo</id>
<url>http://repo.spray.cc/</url>
</repository>
</repositories>
</project>