[spock] 02/02: Switch to ASM 5 and CGLIB 3
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Oct 3 21:20:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository spock.
commit 2c6184ff689bfad15817cb9a1f3459c23223f338
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Oct 3 23:17:06 2014 +0200
Switch to ASM 5 and CGLIB 3
---
debian/build.xml | 6 +++---
debian/changelog | 5 +++--
debian/control | 8 ++++----
debian/maven.rules | 3 ++-
debian/patches/01-upgrade-asm.patch | 40 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/spock-core.pom | 8 ++++----
7 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/debian/build.xml b/debian/build.xml
index e0952a5..f958d91 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -22,7 +22,7 @@ http://pkgs.fedoraproject.org/cgit/spock.git/
<path id="groovyc.classpath">
<fileset dir="/usr/share/java" includes="commons-cli.jar"/>
<fileset dir="/usr/share/java" includes="groovy-all.jar"/>
- <fileset dir="/usr/share/java" includes="asm3-all.jar"/>
+ <fileset dir="/usr/share/java" includes="asm4-all.jar"/>
<fileset dir="/usr/share/java" includes="antlr.jar"/>
</path>
@@ -30,7 +30,7 @@ http://pkgs.fedoraproject.org/cgit/spock.git/
<path refid="groovyc.classpath"/>
<pathelement location="${core.build.dir}/**"/>
<fileset dir="/usr/share/java" includes="ant.jar"/>
- <fileset dir="/usr/share/java" includes="cglib.jar"/>
+ <fileset dir="/usr/share/java" includes="cglib3.jar"/>
<fileset dir="/usr/share/java" includes="hamcrest-core.jar"/>
<fileset dir="/usr/share/java" includes="hamcrest-library.jar"/>
<fileset dir="/usr/share/java" includes="junit4.jar"/>
@@ -51,7 +51,7 @@ http://pkgs.fedoraproject.org/cgit/spock.git/
<fileset dir="${guice.dir}/build/libs" includes="spock-guice-${impl.version}.jar"/>
<fileset dir="/usr/share/java" includes="ant.jar"/>
<fileset dir="/usr/share/java" includes="aopalliance.jar"/>
- <fileset dir="/usr/share/java" includes="cglib.jar"/>
+ <fileset dir="/usr/share/java" includes="cglib3.jar"/>
<fileset dir="/usr/share/java" includes="guice.jar"/>
<fileset dir="/usr/share/java" includes="hamcrest-core.jar"/>
<fileset dir="/usr/share/java" includes="hamcrest-library.jar"/>
diff --git a/debian/changelog b/debian/changelog
index a1f0808..26d2c6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-spock (0.6-groovy-1.8-3) UNRELEASED; urgency=medium
+spock (0.6-groovy-1.8-3) unstable; urgency=medium
* Team upload.
+ * Switch to ASM 5 and CGLIB 3
* Standards-Version updated to 3.9.6 (no changes)
- -- Emmanuel Bourg <ebourg at apache.org> Mon, 29 Sep 2014 14:50:49 +0200
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 03 Oct 2014 23:08:21 +0200
spock (0.6-groovy-1.8-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e193315..e06862a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Build-Depends: ant, debhelper (>= 9), default-jdk
Build-Depends-Indep: groovy,
junit4,
libaopalliance-java,
- libasm3-java,
- libcglib-java,
+ libasm4-java,
+ libcglib3-java,
libguice-java,
libhamcrest-java,
libobjenesis-java,
@@ -25,8 +25,8 @@ Depends: ant,
groovy,
junit4,
libaopalliance-java,
- libasm3-java,
- libcglib-java,
+ libasm4-java,
+ libcglib3-java,
libguice-java,
libhamcrest-java,
libobjenesis-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index bf43aaa..17a384f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,5 +16,6 @@
# and version starting with 3., replacing the version with 3.x
# junit junit jar s/3\..*/3.x/
-asm asm jar s/.*/3.x/
junit s/junit-dep/junit/ jar s/.*/4.x/
+cglib cglib-nodep * s/.*/3.x/ * *
+org.ow2.asm asm * s/.*/4.x/ * *
diff --git a/debian/patches/01-upgrade-asm.patch b/debian/patches/01-upgrade-asm.patch
new file mode 100644
index 0000000..02b6ebd
--- /dev/null
+++ b/debian/patches/01-upgrade-asm.patch
@@ -0,0 +1,40 @@
+Description: Update to ASM 5
+Origin: backport, https://github.com/spockframework/spock/commit/83c2cc7
+--- a/spock-core/src/main/java/org/spockframework/buildsupport/EmptyAnnotationVisitor.java
++++ b/spock-core/src/main/java/org/spockframework/buildsupport/EmptyAnnotationVisitor.java
+@@ -14,9 +14,14 @@
+
+ package org.spockframework.buildsupport;
+
++import org.objectweb.asm.Opcodes;
+ import org.objectweb.asm.AnnotationVisitor;
+
+-class EmptyAnnotationVisitor implements AnnotationVisitor {
++class EmptyAnnotationVisitor extends AnnotationVisitor {
++ public EmptyAnnotationVisitor() {
++ super(Opcodes.ASM5);
++ }
++
+ public void visit(String s, Object o) {}
+
+ public void visitEnum(String s, String s1, String s2) {}
+--- a/spock-core/src/main/java/org/spockframework/buildsupport/SpecClassFileVisitor.java
++++ b/spock-core/src/main/java/org/spockframework/buildsupport/SpecClassFileVisitor.java
+@@ -18,12 +18,16 @@
+
+ import org.objectweb.asm.*;
+
+-class SpecClassFileVisitor implements ClassVisitor {
++class SpecClassFileVisitor extends ClassVisitor {
+ private final AnnotationVisitor annVisitor = new EmptyAnnotationVisitor();
+
+ private boolean hasSpecMetadataAnnotation = false;
+ private boolean isAbstract;
+
++ SpecClassFileVisitor() {
++ super(Opcodes.ASM5);
++ }
++
+ public boolean isSpec() {
+ return hasSpecMetadataAnnotation;
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..824043b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-upgrade-asm.patch
diff --git a/debian/spock-core.pom b/debian/spock-core.pom
index 46108a1..df6bfe6 100644
--- a/debian/spock-core.pom
+++ b/debian/spock-core.pom
@@ -60,16 +60,16 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>3.2</version>
+ <version>5.0.3</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.2</version>
+ <version>3.1</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@@ -80,4 +80,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/spock.git
More information about the pkg-java-commits
mailing list