[Git][java-team/cglib][master] 4 commits: New upstream version 3.2.9
Markus Koschany
gitlab at salsa.debian.org
Thu Nov 8 13:38:44 GMT 2018
Markus Koschany pushed to branch master at Debian Java Maintainers / cglib
Commits:
2840b855 by Markus Koschany at 2018-11-08T13:30:41Z
New upstream version 3.2.9
- - - - -
2b977433 by Markus Koschany at 2018-11-08T13:30:46Z
Update upstream source from tag 'upstream/3.2.9'
Update to upstream version '3.2.9'
with Debian dir ddfa3753a8ec2a7d3670c8a69e704a62bfd4fdf3
- - - - -
b3ed7bfb by Markus Koschany at 2018-11-08T13:31:49Z
Update changelog
- - - - -
cc8f03a2 by Markus Koschany at 2018-11-08T13:35:17Z
Tighten B-D on libasm-java.
- - - - -
10 changed files:
- cglib-integration-test/pom.xml
- cglib-jmh/pom.xml
- cglib-nodep/pom.xml
- cglib-sample/pom.xml
- cglib/pom.xml
- cglib/src/main/java/net/sf/cglib/core/AsmApi.java
- cglib/src/test/java/net/sf/cglib/core/AsmApiTest.java
- debian/changelog
- debian/control
- pom.xml
Changes:
=====================================
cglib-integration-test/pom.xml
=====================================
@@ -9,7 +9,7 @@
<parent>
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
</parent>
<!-- ====================================================================== -->
=====================================
cglib-jmh/pom.xml
=====================================
@@ -7,7 +7,7 @@
<parent>
<artifactId>cglib-parent</artifactId>
<groupId>cglib</groupId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=====================================
cglib-nodep/pom.xml
=====================================
@@ -9,7 +9,7 @@
<parent>
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
</parent>
<!-- ====================================================================== -->
=====================================
cglib-sample/pom.xml
=====================================
@@ -9,7 +9,7 @@
<parent>
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
</parent>
<!-- ====================================================================== -->
=====================================
cglib/pom.xml
=====================================
@@ -9,7 +9,7 @@
<parent>
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
</parent>
<!-- ====================================================================== -->
=====================================
cglib/src/main/java/net/sf/cglib/core/AsmApi.java
=====================================
@@ -1,31 +1,14 @@
package net.sf.cglib.core;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
import org.objectweb.asm.Opcodes;
final class AsmApi {
- private static final String EXPERIMENTAL_ASM7_PROPERTY_NAME = "net.sf.cglib.experimental_asm7";
-
/**
- * Returns the latest stable ASM API value in {@link Opcodes} unless overridden via the
- * net.sf.cglib.experimental_asm7 property.
+ * Returns the latest stable ASM API value in {@link Opcodes}.
*/
static int value() {
- boolean experimentalAsm7;
- try {
- experimentalAsm7 = Boolean.parseBoolean(AccessController.doPrivileged(
- new PrivilegedAction<String>() {
- public String run() {
- return System.getProperty(EXPERIMENTAL_ASM7_PROPERTY_NAME);
- }
- }));
- } catch (Exception ignored) {
- experimentalAsm7 = false;
- }
- return experimentalAsm7 ? Opcodes.ASM7_EXPERIMENTAL : Opcodes.ASM6;
+ return Opcodes.ASM7;
}
private AsmApi() {
=====================================
cglib/src/test/java/net/sf/cglib/core/AsmApiTest.java
=====================================
@@ -9,28 +9,28 @@ public class AsmApiTest {
@Test
public void testValue() {
- assertEquals(Opcodes.ASM6, AsmApi.value());
+ assertEquals(Opcodes.ASM7, AsmApi.value());
}
+ /**
+ * With the release of ASM 7.0 beta, Opcodes.ASM7_EXPERIMENTAL
+ * has been replaced by Opcodes.ASM7 so we simply ignore
+ * the system property and default to the newest stable
+ * version.
+ */
@Test
- public void testValueWithSystemPropertyTrue() {
- int asmApi = setSystemPropertyAndGetValue("true");
- assertEquals(Opcodes.ASM7_EXPERIMENTAL, asmApi);
- }
+ public void testValueWithAsm7Experimental() {
+ int asmApi = setAsm7ExperimentalAndGetValue("true");
+ assertEquals(Opcodes.ASM7, asmApi);
- @Test
- public void testValueWithSystemPropertyEmptyString() {
- int asmApi = setSystemPropertyAndGetValue("");
- assertEquals(Opcodes.ASM6, asmApi);
- }
+ asmApi = setAsm7ExperimentalAndGetValue("");
+ assertEquals(Opcodes.ASM7, asmApi);
- @Test
- public void testValueWithSystemPropertyFalse() {
- int asmApi = setSystemPropertyAndGetValue("false");
- assertEquals(Opcodes.ASM6, asmApi);
+ asmApi = setAsm7ExperimentalAndGetValue("false");
+ assertEquals(Opcodes.ASM7, asmApi);
}
- private int setSystemPropertyAndGetValue(String value) {
+ private int setAsm7ExperimentalAndGetValue(String value) {
String propName = "net.sf.cglib.experimental_asm7";
System.setProperty(propName, value);
try {
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+cglib (3.2.9-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream version 3.2.9.
+ - Fix FTBFS with ASM 7. (Closes: #912645)
+
+ -- Markus Koschany <apo at debian.org> Thu, 08 Nov 2018 14:31:16 +0100
+
cglib (3.2.8-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Build-Depends: ant,
debhelper (>= 11),
default-jdk,
junit4,
- libasm-java (>= 6.0),
+ libasm-java (>= 7.0),
libjarjar-maven-plugin-java,
libmaven-javadoc-plugin-java,
maven-debian-helper (>= 2.0.4)
=====================================
pom.xml
=====================================
@@ -14,7 +14,7 @@
<!-- ====================================================================== -->
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
<packaging>pom</packaging>
<name>Code Generation Library</name>
@@ -54,7 +54,7 @@
<java.version.source>1.5</java.version.source>
<java.version.target>1.5</java.version.target>
- <asm.version>6.2.1</asm.version>
+ <asm.version>7.0</asm.version>
<ant.version>1.10.3</ant.version>
<jmh.version>1.21</jmh.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
View it on GitLab: https://salsa.debian.org/java-team/cglib/compare/932f3730bb6846dd9db936661fa3ad79e1a93d67...cc8f03a2213893fe56732497b54554d8b0935716
--
View it on GitLab: https://salsa.debian.org/java-team/cglib/compare/932f3730bb6846dd9db936661fa3ad79e1a93d67...cc8f03a2213893fe56732497b54554d8b0935716
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181108/338934bd/attachment.html>
More information about the pkg-java-commits
mailing list