[Git][java-team/bridge-method-injector][master] 6 commits: New upstream version 1.23
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Tue Jun 14 05:20:27 BST 2022
Tony Mancill pushed to branch master at Debian Java Maintainers / bridge-method-injector
Commits:
62384ce8 by tony mancill at 2022-06-13T21:07:00-07:00
New upstream version 1.23
- - - - -
b52475a9 by tony mancill at 2022-06-13T21:07:00-07:00
Refresh patches for new upstream version
- - - - -
8751d584 by tony mancill at 2022-06-13T21:07:00-07:00
Freshen years in debian/copyright
- - - - -
a310a558 by tony mancill at 2022-06-13T21:07:00-07:00
Bump Standards-Version to 4.6.1
- - - - -
ef7d5a08 by tony mancill at 2022-06-13T21:14:07-07:00
Use junit4
- - - - -
f5fb3596 by tony mancill at 2022-06-13T21:14:07-07:00
Prepare changelog for upload to unstable
- - - - -
11 changed files:
- annotation/pom.xml
- debian/changelog
- debian/control
- debian/copyright
- debian/maven.rules
- debian/patches/01-java9-compatibility.patch
- injector/pom.xml
- injector/src/main/java/com/infradna/tool/bridge_method_injector/ClassAnnotationInjector.java
- injector/src/main/java/com/infradna/tool/bridge_method_injector/MethodInjector.java
- injector/src/main/java/com/infradna/tool/bridge_method_injector/ProcessMojo.java
- pom.xml
Changes:
=====================================
annotation/pom.xml
=====================================
@@ -3,7 +3,7 @@
<parent>
<groupId>com.infradna.tool</groupId>
<artifactId>bridge-method-injector-parent</artifactId>
- <version>1.18</version>
+ <version>1.23</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>bridge-method-annotation</artifactId>
@@ -13,7 +13,14 @@
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
- <version>1.4</version>
+ <version>1.15</version>
</dependency>
</dependencies>
+
+ <repositories>
+ <repository>
+ <id>Jenkins-CI</id>
+ <url>http://repo.jenkins-ci.org/releases/</url>
+ </repository>
+ </repositories>
</project>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+bridge-method-injector (1.23-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream version 1.23
+ * Use junit4
+ * Refresh patches for new upstream version
+ * Freshen years in debian/copyright
+ * Bump Standards-Version to 4.6.1
+
+ -- tony mancill <tmancill at debian.org> Mon, 13 Jun 2022 21:05:20 -0700
+
bridge-method-injector (1.18-3) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Build-Depends:
debhelper-compat (= 13),
default-jdk,
default-jdk-doc,
- junit (>= 3.8.1),
+ junit4,
libannotation-indexer-java (>= 1.12),
libasm-java (>= 5.0),
libmaven-antrun-plugin-java,
@@ -15,7 +15,7 @@ Build-Depends:
libmaven-plugin-tools-java,
libmaven3-core-java,
maven-debian-helper (>= 2.0)
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/bridge-method-injector.git
Vcs-Browser: https://salsa.debian.org/java-team/bridge-method-injector
Homepage: https://github.com/infradna/bridge-method-injector
=====================================
debian/copyright
=====================================
@@ -4,11 +4,12 @@ Upstream-Contact: Kohsuke Kawaguchi as Developer
Source: https://github.com/infradna/bridge-method-injector
Files: *
-Copyright: 2010, InfraDNA, Inc.
+Copyright: 2010-2022, InfraDNA, Inc.
License: MIT
Files: debian/*
-Copyright: 2010, Canonical Ltd (http://www.canonical.com)
+Copyright: 2010-2022, Canonical Ltd (http://www.canonical.com)
+ 2012-2022, tony mancill <tmancill at debian.org>
License: GPL-3
License: GPL-3
=====================================
debian/maven.rules
=====================================
@@ -16,6 +16,6 @@
# and version starting with 3., replacing the version with 3.x
# junit junit jar s/3\\..*/3.x/
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
s/org.jvnet.hudson/org.jenkins-ci/ annotation-indexer * s/.*/debian/ * *
org.apache.maven maven-* * s/.*/3.x/ * *
=====================================
debian/patches/01-java9-compatibility.patch
=====================================
@@ -12,14 +12,3 @@ Forwarded: no
// no need to process this class. it's already up-to-date.
return;
} catch (IOException e) {
---- a/injector/src/main/java/com/infradna/tool/bridge_method_injector/ProcessMojo.java
-+++ b/injector/src/main/java/com/infradna/tool/bridge_method_injector/ProcessMojo.java
-@@ -69,7 +69,7 @@
- } finally {
- try {
- if (r!=null) r.close();
-- } catch (IOException _) {
-+ } catch (IOException e) {
- }
- }
- }
=====================================
injector/pom.xml
=====================================
@@ -3,7 +3,7 @@
<parent>
<groupId>com.infradna.tool</groupId>
<artifactId>bridge-method-injector-parent</artifactId>
- <version>1.18</version>
+ <version>1.23</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>bridge-method-injector</artifactId>
@@ -12,13 +12,23 @@
<name>bridge-method-injector</name>
<description>Evolve your classes without breaking compatibility</description>
+ <properties>
+ <asm.version>9.2</asm.version>
+ </properties>
+
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.6.0</version>
+ </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
@@ -136,7 +146,7 @@
<scm>
<connection>scm:git:git at github.com:infradna/bridge-method-injector.git</connection>
- <tag>bridge-method-injector-parent-1.18</tag>
+ <tag>bridge-method-injector-parent-1.23</tag>
</scm>
<developers>
@@ -162,13 +172,18 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-debug-all</artifactId>
- <version>5.2</version>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
=====================================
injector/src/main/java/com/infradna/tool/bridge_method_injector/ClassAnnotationInjector.java
=====================================
@@ -35,7 +35,7 @@ import org.objectweb.asm.Opcodes;
*/
abstract class ClassAnnotationInjector extends ClassVisitor {
ClassAnnotationInjector(ClassVisitor cv) {
- super(Opcodes.ASM5, cv);
+ super(Opcodes.ASM9, cv);
}
private boolean emitted = false;
=====================================
injector/src/main/java/com/infradna/tool/bridge_method_injector/MethodInjector.java
=====================================
@@ -139,12 +139,12 @@ public class MethodInjector {
protected List<Type> types = new ArrayList<Type>();
public WithBridgeMethodsAnnotationVisitor(AnnotationVisitor av) {
- super(Opcodes.ASM5, av);
+ super(Opcodes.ASM9, av);
}
@Override
public AnnotationVisitor visitArray(String name) {
- return new AnnotationVisitor(Opcodes.ASM5, super.visitArray(name)) {
+ return new AnnotationVisitor(Opcodes.ASM9, super.visitArray(name)) {
public void visit(String name, Object value) {
if (value instanceof Type) {
@@ -284,7 +284,7 @@ public class MethodInjector {
}
Transformer(ClassVisitor cv) {
- super(Opcodes.ASM5, cv);
+ super(Opcodes.ASM9, cv);
}
@Override
@@ -306,7 +306,7 @@ public class MethodInjector {
@Override
public MethodVisitor visitMethod(final int access, final String name, final String mdesc, final String signature, final String[] exceptions) {
MethodVisitor mv = super.visitMethod(access, name, mdesc, signature, exceptions);
- return new MethodVisitor(Opcodes.ASM5, mv) {
+ return new MethodVisitor(Opcodes.ASM9, mv) {
@Override
public AnnotationVisitor visitAnnotation(String adesc, boolean visible) {
AnnotationVisitor av = super.visitAnnotation(adesc, visible);
=====================================
injector/src/main/java/com/infradna/tool/bridge_method_injector/ProcessMojo.java
=====================================
@@ -27,17 +27,18 @@ import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLClassLoader;
+import org.jvnet.hudson.annotation_indexer.Index;
/**
* @author Kohsuke Kawaguchi
* @goal process
* @phase process-classes
* @requiresDependencyResolution runtime
+ * @threadSafe
*/
public class ProcessMojo extends AbstractMojo {
/**
@@ -49,28 +50,14 @@ public class ProcessMojo extends AbstractMojo {
private File classesDirectory;
public void execute() throws MojoExecutionException, MojoFailureException {
- File index = new File(classesDirectory, "META-INF/annotations/" + WithBridgeMethods.class.getName());
- if (!index.exists()) {
- getLog().debug("Skipping because there's no "+index);
- return;
- }
-
- BufferedReader r = null;
try {
- r = new BufferedReader(new InputStreamReader(new FileInputStream(index),"UTF-8"));
- String line;
- while ((line=r.readLine())!=null) {
+ for (String line : Index.listClassNames(WithBridgeMethods.class, new URLClassLoader(new URL[] {classesDirectory.toURI().toURL()}, ClassLoader.getSystemClassLoader().getParent()))) {
File classFile = new File(classesDirectory,line.replace('.','/')+".class");
getLog().debug("Processing "+line);
new MethodInjector().handle(classFile);
}
} catch (IOException e) {
throw new MojoExecutionException("Failed to process @WithBridgeMethods",e);
- } finally {
- try {
- if (r!=null) r.close();
- } catch (IOException _) {
- }
}
}
}
=====================================
pom.xml
=====================================
@@ -3,7 +3,7 @@
<groupId>com.infradna.tool</groupId>
<artifactId>bridge-method-injector-parent</artifactId>
- <version>1.18</version>
+ <version>1.23</version>
<packaging>pom</packaging>
<name>Bridge Method Injection Parent POM</name>
@@ -19,9 +19,10 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
@@ -52,24 +53,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>
- <extensions>
- <extension>
- <groupId>org.jvnet.wagon-svn</groupId>
- <artifactId>wagon-svn</artifactId>
- <version>1.9</version>
- </extension>
- </extensions>
</build>
+ <repositories>
+ <repository>
+ <id>repo.jenkins-ci.org</id>
+ <url>https://repo.jenkins-ci.org/public/</url>
+ </repository>
+ </repositories>
+
<scm>
<connection>scm:git:git at github.com:infradna/bridge-method-injector.git</connection>
<url>https://github.com/infradna/bridge-method-injector</url>
- <tag>bridge-method-injector-parent-1.18</tag>
+ <tag>bridge-method-injector-parent-1.23</tag>
</scm>
<developers>
@@ -112,7 +114,7 @@
</plugin>
</plugins>
</reporting>
-
+
<profiles>
<profile>
<id>release</id>
View it on GitLab: https://salsa.debian.org/java-team/bridge-method-injector/-/compare/134d3703cc922a5a934d7a74ac0652bfd230e11f...f5fb3596c4e79ae49ecf86a214d6bec3aa352a06
--
View it on GitLab: https://salsa.debian.org/java-team/bridge-method-injector/-/compare/134d3703cc922a5a934d7a74ac0652bfd230e11f...f5fb3596c4e79ae49ecf86a214d6bec3aa352a06
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/20220614/639a60a0/attachment.htm>
More information about the pkg-java-commits
mailing list