[Git][java-team/cglib][master] 6 commits: New upstream version 3.2.11
Emmanuel Bourg
gitlab at salsa.debian.org
Mon Jul 15 09:20:14 BST 2019
Emmanuel Bourg pushed to branch master 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
- - - - -
b2220b72 by Emmanuel Bourg at 2019-07-15T08:14:09Z
Update upstream source from tag 'upstream/3.2.12'
Update to upstream version '3.2.12'
with Debian dir 868cc9ab93733557eb4801b280b25b517e06a7f0
- - - - -
38f11df6 by Emmanuel Bourg at 2019-07-15T08:16:32Z
Refreshed the patches
- - - - -
27c09490 by Emmanuel Bourg at 2019-07-15T08:16:38Z
Standards-Version updated to 4.4.0
- - - - -
2a2bdea9 by Emmanuel Bourg at 2019-07-15T08:19:42Z
Upload to unstable
- - - - -
13 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
- debian/changelog
- debian/control
- debian/patches/03-cglib-version.patch
- − debian/patches/04-optional-ant-dependency.patch
- debian/patches/series
- 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);
}
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+cglib (3.2.12-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+ * Standards-Version updated to 4.4.0
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 15 Jul 2019 10:19:37 +0200
+
cglib (3.2.10-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -12,7 +12,7 @@ Build-Depends:
libjarjar-maven-plugin-java,
libmaven-javadoc-plugin-java,
maven-debian-helper (>= 2.0.4)
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
Vcs-Git: https://salsa.debian.org/java-team/cglib.git
Vcs-Browser: https://salsa.debian.org/java-team/cglib
Homepage: http://cglib.sourceforge.net
=====================================
debian/patches/03-cglib-version.patch
=====================================
@@ -4,7 +4,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/cglib-nodep/pom.xml
+++ b/cglib-nodep/pom.xml
-@@ -89,6 +89,7 @@
+@@ -100,6 +100,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cglib</artifactId>
=====================================
debian/patches/04-optional-ant-dependency.patch deleted
=====================================
@@ -1,36 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 2 Oct 2018 20:27:22 +0200
-Subject: 04-optional-ant-dependency
-
-Really make the Ant dependency optional
-Bug-Upstream: https://github.com/cglib/cglib/pull/87
-Bug-Debian: https://bugs.debian.org/830204
----
- cglib/pom.xml | 1 +
- pom.xml | 1 -
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cglib/pom.xml b/cglib/pom.xml
-index 632138d..76fabaf 100644
---- a/cglib/pom.xml
-+++ b/cglib/pom.xml
-@@ -64,6 +64,7 @@
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
-+ <optional>true</optional>
- </dependency>
-
- <dependency>
-diff --git a/pom.xml b/pom.xml
-index 3a03f26..d68f3d9 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -232,7 +232,6 @@
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${ant.version}</version>
-- <optional>true</optional>
- </dependency>
-
- <dependency>
=====================================
debian/patches/series
=====================================
@@ -1,2 +1 @@
03-cglib-version.patch
-04-optional-ant-dependency.patch
=====================================
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/d867915951f82b728aeb605836d692cd119ce8dc...2a2bdea92261a84b2517d0885bbfea42f834630e
--
View it on GitLab: https://salsa.debian.org/java-team/cglib/compare/d867915951f82b728aeb605836d692cd119ce8dc...2a2bdea92261a84b2517d0885bbfea42f834630e
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/361ff0c9/attachment.html>
More information about the pkg-java-commits
mailing list