[Git][java-team/cglib][upstream] 2 commits: New upstream version 3.2.11
Emmanuel Bourg
gitlab at salsa.debian.org
Mon Jul 15 09:20:17 BST 2019
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / cglib
Commits:
a7722cad by Emmanuel Bourg at 2019-07-15T08:13:43Z
New upstream version 3.2.11
- - - - -
a2dfdec1 by Emmanuel Bourg at 2019-07-15T08:14:09Z
New upstream version 3.2.12
- - - - -
8 changed files:
- .travis.yml
- 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/CodeEmitter.java
- pom.xml
Changes:
=====================================
.travis.yml
=====================================
@@ -1,41 +1,29 @@
sudo: false
language: java
-before_script:
- - echo "MAVEN_OPTS='-Xmx512m -Dgpg.skip=true'" > ~/.mavenrc
- - if [[ "x$JDK" == *'x9'* ]]; then remove_dir_from_path $JAVA_HOME/bin; export JAVA_HOME=/usr/lib/jvm/java-9-oracle; export PATH=$JAVA_HOME/bin:$PATH; java -Xmx32m -version; fi
cache:
directories:
- '$HOME/.m2/repository'
-
-before_cache:
- # No sense in caching current build artifacts
- rm -rf $HOME/.m2/repository/cglib
-
-before_script:
- - wget https://archive.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip
- - unzip -qq apache-maven-3.2.5-bin.zip
- - export M2_HOME="$PWD/apache-maven-3.2.5"
- - export PATH="$M2_HOME/bin:$PATH"
- - echo "MAVEN_OPTS='-Xmx512m -Dgpg.skip=true'" > ~/.mavenrc
- - if [[ "x$JDK" == *'x9'* ]]; then remove_dir_from_path $JAVA_HOME/bin; export JAVA_HOME=/usr/lib/jvm/java-9-oracle; export PATH=$JAVA_HOME/bin:$PATH; java -Xmx32m -version; fi
-
+
# Skip default "mvn install" issued by Travis
install: true
+
script:
- - mvn test -B -V
+ - mvn -Dgpg.skip=true -B -V test
matrix:
+ include:
+ - jdk: openjdk8
+ env: JDK8
+ - jdk: openjdk9
+ env: JDK=9
+ - jdk: oraclejdk11
+ env: JDK=11
fast_finish: true
allow_failures:
- env: JDK=9
- include:
- - jdk: oraclejdk8
- - jdk: oraclejdk8
- addons:
- apt:
- packages:
- - oracle-java9-installer
- env: JDK=9
- - jdk: openjdk7
+ - env: JDK=11
+branches:
+ only:
+ - master
=====================================
cglib-integration-test/pom.xml
=====================================
@@ -9,7 +9,7 @@
<parent>
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.10</version>
+ <version>3.2.12</version>
</parent>
<!-- ====================================================================== -->
=====================================
cglib-jmh/pom.xml
=====================================
@@ -7,7 +7,7 @@
<parent>
<artifactId>cglib-parent</artifactId>
<groupId>cglib</groupId>
- <version>3.2.10</version>
+ <version>3.2.12</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.10</version>
+ <version>3.2.12</version>
</parent>
<!-- ====================================================================== -->
@@ -23,6 +23,17 @@
<!-- ====================================================================== -->
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>net.sf.cglib</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>jarjar-maven-plugin</artifactId>
=====================================
cglib-sample/pom.xml
=====================================
@@ -9,7 +9,7 @@
<parent>
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.10</version>
+ <version>3.2.12</version>
</parent>
<!-- ====================================================================== -->
=====================================
cglib/pom.xml
=====================================
@@ -9,7 +9,7 @@
<parent>
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.10</version>
+ <version>3.2.12</version>
</parent>
<!-- ====================================================================== -->
@@ -64,6 +64,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
=====================================
cglib/src/main/java/net/sf/cglib/core/CodeEmitter.java
=====================================
@@ -849,10 +849,10 @@ public class CodeEmitter extends LocalVariablesSorter {
Signature sig = method.getSignature();
if (sig.getName().equals(Constants.CONSTRUCTOR_NAME)) {
invoke_constructor(type, sig);
- } else if (TypeUtils.isInterface(classInfo.getModifiers())) {
- invoke_interface(type, sig);
} else if (TypeUtils.isStatic(method.getModifiers())) {
invoke_static(type, sig);
+ } else if (TypeUtils.isInterface(classInfo.getModifiers())) {
+ invoke_interface(type, sig);
} else {
invoke_virtual(virtualType, sig);
}
=====================================
pom.xml
=====================================
@@ -14,7 +14,7 @@
<!-- ====================================================================== -->
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.10</version>
+ <version>3.2.12</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>7.0</asm.version>
+ <asm.version>7.1</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>
@@ -232,7 +232,6 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>${ant.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
View it on GitLab: https://salsa.debian.org/java-team/cglib/compare/0f1cbc6d488929ea6b7cfefc7af7e34dd1749a2f...a2dfdec1a801a05fa2dc84f47b802447110cc840
--
View it on GitLab: https://salsa.debian.org/java-team/cglib/compare/0f1cbc6d488929ea6b7cfefc7af7e34dd1749a2f...a2dfdec1a801a05fa2dc84f47b802447110cc840
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/20190715/93419d91/attachment.html>
More information about the pkg-java-commits
mailing list