[bytecode-compatibility-transformer] Update to upstream version 1.4
Michal Srb
msrb at fedoraproject.org
Wed Nov 27 12:57:29 UTC 2013
commit a01ca0e8fe147af02a7d5c0e2cf310a21ebc78ed
Author: Michal Srb <msrb at redhat.com>
Date: Wed Nov 27 13:46:43 2013 +0100
Update to upstream version 1.4
.gitignore | 1 +
0001-Port-to-asm-asm.patch | 42 +++++++++++++++++++++++++-----
bytecode-compatibility-transformer.spec | 6 +++-
sources | 2 +-
4 files changed, 42 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 69ee3b5..0821ab2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/bytecode-compatibility-transformer-1.3.zip
/LICENSE.txt
+/bytecode-compatibility-transformer-1.4.zip
diff --git a/0001-Port-to-asm-asm.patch b/0001-Port-to-asm-asm.patch
index 65dfa81..77cafc6 100644
--- a/0001-Port-to-asm-asm.patch
+++ b/0001-Port-to-asm-asm.patch
@@ -1,18 +1,19 @@
-From 6ec9eb40783373d29ffec0668a38270adf9a29fe Mon Sep 17 00:00:00 2001
+From 3ada0e7f61fcf7bdc00f63c31ec044e878639b30 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
-Date: Tue, 1 Oct 2013 10:03:09 +0200
+Date: Wed, 27 Nov 2013 13:42:52 +0100
Subject: [PATCH] Port to asm:asm
---
src/main/java/org/jenkinsci/bytecode/AdaptField.java | 8 ++++----
+ .../org/jenkinsci/bytecode/ClassRewritingContext.java | 12 ++++++------
src/main/java/org/jenkinsci/bytecode/Kind.java | 2 +-
src/main/java/org/jenkinsci/bytecode/MemberAdapter.java | 4 ++--
.../java/org/jenkinsci/bytecode/MemberTransformSpec.java | 8 ++++----
src/main/java/org/jenkinsci/bytecode/Transformer.java | 16 ++++++++--------
- 5 files changed, 19 insertions(+), 19 deletions(-)
+ 6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/jenkinsci/bytecode/AdaptField.java b/src/main/java/org/jenkinsci/bytecode/AdaptField.java
-index fe85af8..cb1fea8 100644
+index 5e8a1d6..4701f6f 100644
--- a/src/main/java/org/jenkinsci/bytecode/AdaptField.java
+++ b/src/main/java/org/jenkinsci/bytecode/AdaptField.java
@@ -1,8 +1,8 @@
@@ -37,6 +38,33 @@ index fe85af8..cb1fea8 100644
/**
* Rewrites a field reference by adapting the type of the field.
+diff --git a/src/main/java/org/jenkinsci/bytecode/ClassRewritingContext.java b/src/main/java/org/jenkinsci/bytecode/ClassRewritingContext.java
+index ca0a0a6..2277fac 100644
+--- a/src/main/java/org/jenkinsci/bytecode/ClassRewritingContext.java
++++ b/src/main/java/org/jenkinsci/bytecode/ClassRewritingContext.java
+@@ -1,16 +1,16 @@
+ package org.jenkinsci.bytecode;
+
+-import org.kohsuke.asm3.ClassVisitor;
+-import org.kohsuke.asm3.Label;
+-import org.kohsuke.asm3.MethodVisitor;
+-import org.kohsuke.asm3.Opcodes;
+-import org.kohsuke.asm3.Type;
++import org.objectweb.asm.ClassVisitor;
++import org.objectweb.asm.Label;
++import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Opcodes;
++import org.objectweb.asm.Type;
+
+ import java.util.HashMap;
+ import java.util.Map;
+ import java.util.Map.Entry;
+
+-import static org.kohsuke.asm3.Opcodes.*;
++import static org.objectweb.asm.Opcodes.*;
+
+ /**
+ * Remembers what class is being rewritten and what helper methods need to be generated into this class.
diff --git a/src/main/java/org/jenkinsci/bytecode/Kind.java b/src/main/java/org/jenkinsci/bytecode/Kind.java
index e6edd62..43f5f7b 100644
--- a/src/main/java/org/jenkinsci/bytecode/Kind.java
@@ -50,7 +78,7 @@ index e6edd62..43f5f7b 100644
/**
* Rewriting a method reference and a field reference takes a very similar code path,
diff --git a/src/main/java/org/jenkinsci/bytecode/MemberAdapter.java b/src/main/java/org/jenkinsci/bytecode/MemberAdapter.java
-index c7f3027..4b9393e 100644
+index 1d1caaa..aa3a6fb 100644
--- a/src/main/java/org/jenkinsci/bytecode/MemberAdapter.java
+++ b/src/main/java/org/jenkinsci/bytecode/MemberAdapter.java
@@ -1,7 +1,7 @@
@@ -64,7 +92,7 @@ index c7f3027..4b9393e 100644
import java.lang.reflect.Member;
diff --git a/src/main/java/org/jenkinsci/bytecode/MemberTransformSpec.java b/src/main/java/org/jenkinsci/bytecode/MemberTransformSpec.java
-index 8854e1b..6f171a9 100644
+index ce99e85..02d5245 100644
--- a/src/main/java/org/jenkinsci/bytecode/MemberTransformSpec.java
+++ b/src/main/java/org/jenkinsci/bytecode/MemberTransformSpec.java
@@ -1,15 +1,15 @@
@@ -88,7 +116,7 @@ index 8854e1b..6f171a9 100644
/**
* All the adapters of {@linkplain #kind a specific member type} keyed by their name and descriptor.
diff --git a/src/main/java/org/jenkinsci/bytecode/Transformer.java b/src/main/java/org/jenkinsci/bytecode/Transformer.java
-index 6a5bc77..6dccc01 100644
+index aaa6a59..12dbf25 100644
--- a/src/main/java/org/jenkinsci/bytecode/Transformer.java
+++ b/src/main/java/org/jenkinsci/bytecode/Transformer.java
@@ -1,12 +1,12 @@
diff --git a/bytecode-compatibility-transformer.spec b/bytecode-compatibility-transformer.spec
index c74d279..3ee7833 100644
--- a/bytecode-compatibility-transformer.spec
+++ b/bytecode-compatibility-transformer.spec
@@ -1,5 +1,5 @@
Name: bytecode-compatibility-transformer
-Version: 1.3
+Version: 1.4
Release: 1%{?dist}
Summary: Evolve modular codebase without losing compatibility
@@ -21,6 +21,7 @@ BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
BuildRequires: mvn(org.jenkins-ci:annotation-indexer)
BuildRequires: mvn(org.jenkins-ci:constant-pool-scanner)
+BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
BuildArch: noarch
@@ -60,6 +61,9 @@ cp %{SOURCE1} .
%doc LICENSE.txt
%changelog
+* Wed Nov 27 2013 Michal Srb <msrb at redhat.com> - 1.4-1
+- Update to upstream version 1.4
+
* Tue Oct 01 2013 Michal Srb <msrb at redhat.com> - 1.3-1
- Initial packaging
diff --git a/sources b/sources
index 1c86834..e73e2a1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4426574ebb180317fdcda817e1dd9932 bytecode-compatibility-transformer-1.3.zip
1d87d0760b5698d0f43a61ba9261ea10 LICENSE.txt
+ecaecab0274664004b6b356ca293826f bytecode-compatibility-transformer-1.4.zip
More information about the scm-commits
mailing list