geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1582001 - in /geronimo/xbean/trunk: ./ xbean-asm5-shaded/ xbean-asm5-shaded/src/ xbean-asm5-shaded/src/main/ xbean-asm5-shaded/src/main/appended-resources/ xbean-asm5-shaded/src/main/appended-resources/META-INF/ xbean-asm5-shaded/src/main/...
Date Wed, 26 Mar 2014 18:39:20 GMT
Author: rmannibucau
Date: Wed Mar 26 18:39:19 2014
New Revision: 1582001

URL: http://svn.apache.org/r1582001
Log:
XBEAN-260 add asm5 shade

Added:
    geronimo/xbean/trunk/xbean-asm5-shaded/
    geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml   (with props)
    geronimo/xbean/trunk/xbean-asm5-shaded/src/
    geronimo/xbean/trunk/xbean-asm5-shaded/src/main/
    geronimo/xbean/trunk/xbean-asm5-shaded/src/main/appended-resources/
    geronimo/xbean/trunk/xbean-asm5-shaded/src/main/appended-resources/META-INF/
    geronimo/xbean/trunk/xbean-asm5-shaded/src/main/appended-resources/META-INF/LICENSE.vm
    geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/
    geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/
    geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/
    geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/xbean/
    geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/xbean/asm5/
    geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/xbean/asm5/original/
    geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/xbean/asm5/original/commons/
    geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java
Modified:
    geronimo/xbean/trunk/pom.xml
    geronimo/xbean/trunk/xbean-finder-shaded/pom.xml

Modified: geronimo/xbean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/pom.xml?rev=1582001&r1=1582000&r2=1582001&view=diff
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Wed Mar 26 18:39:19 2014
@@ -419,6 +419,7 @@
         <module>maven-xbean-plugin</module>
         <module>xbean-asm-shaded</module>
         <module>xbean-asm4-shaded</module>
+        <module>xbean-asm5-shaded</module>
         <module>xbean-finder-shaded</module>
     </modules>
 

Added: geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml?rev=1582001&view=auto
==============================================================================
--- geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml (added)
+++ geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml Wed Mar 26 18:39:19 2014
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+
+<!-- $Rev: 1454287 $ $Date: 2013-03-08 09:41:25 +0100 (Fri, 08 Mar 2013) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>xbean</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <version>3.17-SNAPSHOT</version>
+    </parent>
+    <artifactId>xbean-asm5-shaded</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache XBean :: ASM 5 shaded (repackaged)</name>
+
+    <description>Repackaged and shaded asm 5.x jars</description>
+    <licenses>
+        <license>
+            <url>http://asm.ow2.org/license.html</url>
+        </license>
+        <license>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <asm.version>5.0.1</asm.version>
+        <xbean.osgi.export>
+            org.apache.xbean.asm5.shade.commons;version=${asm.version},
+            org.apache.xbean.asm5;version=${asm.version},
+            org.apache.xbean.asm5.signature;version=${asm.version},
+            org.apache.xbean.asm5.commons;version=${asm.version},
+            org.apache.xbean.asm5.tree;version=${asm.version}
+        </xbean.osgi.export>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createSourcesJar>true</createSourcesJar>
+                            <relocations>
+                                <relocation> <!-- we need a different package because
we build against both -->
+                                    <pattern>org.apache.xbean.asm5.original.commons</pattern>
+                                    <shadedPattern>org.apache.xbean.asm5.shade.commons</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.objectweb.asm</pattern>
+                                    <shadedPattern>org.apache.xbean.asm5</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <manifestEntries>
+                                        <Bundle-License>http://asm.ow2.org/license.html</Bundle-License>
+                                        <Bundle-SymbolicName>org.apache.xbean.asm5-shaded</Bundle-SymbolicName>
+                                        <Export-Package>${xbean.osgi.export}</Export-Package>
+                                        <Import-Package>${xbean.osgi.export}</Import-Package>
+                                    </manifestEntries>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>${asm.version}</version>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: geronimo/xbean/trunk/xbean-asm5-shaded/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm5-shaded/src/main/appended-resources/META-INF/LICENSE.vm?rev=1582001&view=auto
==============================================================================
--- geronimo/xbean/trunk/xbean-asm5-shaded/src/main/appended-resources/META-INF/LICENSE.vm
(added)
+++ geronimo/xbean/trunk/xbean-asm5-shaded/src/main/appended-resources/META-INF/LICENSE.vm
Wed Mar 26 18:39:19 2014
@@ -0,0 +1,54 @@
+--------------------------------------
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##  http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+## $Rev$ $Date$
+##
+
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+

Added: geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java?rev=1582001&view=auto
==============================================================================
--- geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java
(added)
+++ geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java
Wed Mar 26 18:39:19 2014
@@ -0,0 +1,394 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.xbean.asm5.original.commons;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.TypePath;
+
+public class EmptyVisitor extends ClassVisitor {
+    protected final AnnotationVisitor av = new AnnotationVisitor(Opcodes.ASM4) {
+        @Override
+        public void visit(String name, Object value) {
+            EmptyVisitor.this.visit(name, value);
+        }
+
+        @Override
+        public void visitEnum(String name, String desc, String value) {
+            EmptyVisitor.this.visitEnum(name, desc, value);
+        }
+
+        @Override
+        public AnnotationVisitor visitAnnotation(String name, String desc) {
+            return EmptyVisitor.this.visitAnnotation(name, desc);
+        }
+
+        @Override
+        public AnnotationVisitor visitArray(String name) {
+            return EmptyVisitor.this.visitArray(name);
+        }
+
+        @Override
+        public void visitEnd() {
+            EmptyVisitor.this.visitEnd();
+        }
+    };
+
+    protected final FieldVisitor fv = new FieldVisitor(Opcodes.ASM4) {
+        @Override
+        public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+            return EmptyVisitor.this.visitAnnotation(desc, visible);
+        }
+
+        @Override
+        public void visitAttribute(Attribute attribute) {
+            EmptyVisitor.this.visitAttribute(attribute);
+        }
+
+        @Override
+        public void visitEnd() {
+            EmptyVisitor.this.visitEnd();
+        }
+    };
+    protected final MethodVisitor mv = new MethodVisitor(Opcodes.ASM4) {
+        @Override
+        public AnnotationVisitor visitAnnotationDefault() {
+            return EmptyVisitor.this.visitAnnotationDefault();
+        }
+
+        @Override
+        public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+            return EmptyVisitor.this.visitAnnotation(desc, visible);
+        }
+
+        @Override
+        public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean
visible) {
+            return EmptyVisitor.this.visitMethodParameterAnnotation(parameter, desc, visible);
+        }
+
+        @Override
+        public void visitAttribute(Attribute attribute) {
+            EmptyVisitor.this.visitAttribute(attribute);
+        }
+
+        @Override
+        public void visitCode() {
+            EmptyVisitor.this.visitCode();
+        }
+
+        @Override
+        public void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[]
stack) {
+            EmptyVisitor.this.visitFrame(type, nLocal, local, nStack, stack);
+        }
+
+        @Override
+        public void visitInsn(int opcode) {
+            EmptyVisitor.this.visitInsn(opcode);
+        }
+
+        @Override
+        public void visitJumpInsn(int i, Label label) {
+            EmptyVisitor.this.visitJumpInsn(i, label);
+        }
+
+        @Override
+        public void visitLabel(Label label) {
+            EmptyVisitor.this.visitLabel(label);
+        }
+
+        @Override
+        public void visitLdcInsn(Object cst) {
+            EmptyVisitor.this.visitLdcInsn(cst);
+        }
+
+        @Override
+        public void visitIincInsn(int var, int increment) {
+            EmptyVisitor.this.visitIincInsn(var, increment);
+        }
+
+        @Override
+        public void visitTableSwitchInsn(int i, int i2, Label label, Label... labels) {
+            EmptyVisitor.this.visitTableSwitchInsn(i, i2, label, labels);
+        }
+
+        @Override
+        public void visitLookupSwitchInsn(Label label, int[] ints, Label[] labels) {
+            EmptyVisitor.this.visitLookupSwitchInsn(label, ints, labels);
+        }
+
+        @Override
+        public void visitMultiANewArrayInsn(String desc, int dims) {
+            EmptyVisitor.this.visitMultiANewArrayInsn(desc, dims);
+        }
+
+        @Override
+        public void visitTryCatchBlock(Label label, Label label2, Label label3, String s)
{
+            EmptyVisitor.this.visitTryCatchBlock(label, label2, label3, s);
+        }
+
+        @Override
+        public void visitLocalVariable(String s, String s2, String s3, Label label, Label
label2, int i) {
+            EmptyVisitor.this.visitLocalVariable(s, s2, s3, label, label2, i);
+        }
+
+        @Override
+        public void visitLineNumber(int i, Label label) {
+            EmptyVisitor.this.visitLineNumber(i, label);
+        }
+
+        @Override
+        public void visitMaxs(int maxStack, int maxLocals) {
+            EmptyVisitor.this.visitMaxs(maxStack, maxLocals);
+        }
+
+        @Override
+        public void visitEnd() {
+            EmptyVisitor.this.visitEnd();
+        }
+
+        @Override
+        public void visitIntInsn(int opcode, int operand) {
+            EmptyVisitor.this.visitIntInsn(opcode, operand);
+        }
+
+        @Override
+        public void visitVarInsn(int opcode, int var) {
+            EmptyVisitor.this.visitVarInsn(opcode, var);
+        }
+
+        @Override
+        public void visitTypeInsn(int opcode, String type) {
+            EmptyVisitor.this.visitTypeInsn(opcode, type);
+        }
+
+        @Override
+        public void visitFieldInsn(int opcode, String owner, String name, String desc) {
+            EmptyVisitor.this.visitFieldInsn(opcode, owner, name, desc);
+        }
+
+        @Override
+        public void visitMethodInsn(int opcode, String owner, String name, String desc) {
+            EmptyVisitor.this.visitMethodInsn(opcode, owner, name, desc);
+        }
+
+        @Override
+        public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean
itf) {
+            EmptyVisitor.this.visitMethodInsn(opcode, owner, name, desc);
+        }
+
+        @Override
+        public void visitInvokeDynamicInsn(String s, String s2, Handle handle, Object...
objects) {
+            EmptyVisitor.this.visitInvokeDynamicInsn(s, s2, handle, objects);
+        }
+    };
+
+    public EmptyVisitor() {
+        super(Opcodes.ASM4);
+    }
+
+    protected AnnotationVisitor visitAnnotationDefault() {
+        return av;
+    }
+
+    protected AnnotationVisitor visitArray(String name) {
+        return av;
+    }
+
+    protected AnnotationVisitor visitAnnotation(String name, String desc) {
+        return av;
+    }
+
+    protected void visitEnum(String name, String desc, String value) {
+        // no-op
+    }
+
+    protected void visit(String name, Object value) {
+        // no-op
+    }
+
+    protected void visitVarInsn(int opcode, int var) {
+        // no-op
+    }
+
+    protected void visitTypeInsn(int opcode, String type) {
+        // no-op
+    }
+
+    protected void visitFieldInsn(int opcode, String owner, String name, String desc) {
+        // no-op
+    }
+
+    protected void visitMethodInsn(int opcode, String owner, String name, String desc) {
+        // no-op
+    }
+
+    protected void visitInvokeDynamicInsn(String s, String s2, Handle handle, Object[] objects)
{
+        // no-op
+    }
+
+    protected void visitIntInsn(int opcode, int operand) {
+        // no-op
+    }
+
+    protected void visitJumpInsn(int i, Label label) {
+        // no-op
+    }
+
+    protected void visitLabel(Label label) {
+        // no-op
+    }
+
+    protected void visitLdcInsn(Object cst) {
+        // no-op
+    }
+
+    protected void visitIincInsn(int var, int increment) {
+        // no-op
+    }
+
+    protected void visitTableSwitchInsn(int i, int i2, Label label, Label[] labels) {
+        // no-op
+    }
+
+    protected void visitLookupSwitchInsn(Label label, int[] ints, Label[] labels) {
+        // no-op
+    }
+
+    protected void visitMultiANewArrayInsn(String desc, int dims) {
+        // no-op
+    }
+
+    protected void visitTryCatchBlock(Label label, Label label2, Label label3, String s)
{
+        // no-op
+    }
+
+    protected void visitLocalVariable(String s, String s2, String s3, Label label, Label
label2, int i) {
+        // no-op
+    }
+
+    protected void visitLineNumber(int i, Label label) {
+        // no-op
+    }
+
+    protected void visitMaxs(int maxStack, int maxLocals) {
+        // no-op
+    }
+
+    protected void visitInsn(int opcode) {
+        // no-op
+    }
+
+    protected void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[]
stack) {
+        // no-op
+    }
+
+    protected void visitCode() {
+        // no-op
+    }
+
+    protected AnnotationVisitor visitMethodParameterAnnotation(int parameter, String desc,
boolean visible) {
+        return av;
+    }
+
+    protected AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean
visible) {
+        return av;
+    }
+
+    @Override
+    public void visit(int version, int access, String name, String signature,
+                      String superName, String[] interfaces) {
+        if (cv != null) {
+            cv.visit(version, access, name, signature, superName, interfaces);
+        }
+    }
+
+    @Override
+    public void visitSource(String source, String debug) {
+        if (cv != null) {
+            cv.visitSource(source, debug);
+        }
+    }
+
+    @Override
+    public void visitOuterClass(String owner, String name, String desc) {
+        if (cv != null) {
+            cv.visitOuterClass(owner, name, desc);
+        }
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+        return av;
+    }
+
+    @Override
+    public void visitAttribute(Attribute attr) {
+        if (cv != null) {
+            cv.visitAttribute(attr);
+        }
+    }
+
+    @Override
+    public void visitInnerClass(String name, String outerName,
+                                String innerName, int access) {
+        if (cv != null) {
+            cv.visitInnerClass(name, outerName, innerName, access);
+        }
+    }
+
+    @Override
+    public FieldVisitor visitField(int access, String name, String desc,
+                                   String signature, Object value) {
+        return fv;
+    }
+
+    @Override
+    public MethodVisitor visitMethod(int access, String name, String desc,
+                                     String signature, String[] exceptions) {
+        return mv;
+    }
+
+    @Override
+    public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, String desc,
boolean visible) {
+        return av;
+    }
+
+    @Override
+    public void visitEnd() {
+        if (cv != null) {
+            cv.visitEnd();
+        }
+    }
+
+    public AnnotationVisitor annotationVisitor() {
+        return av;
+    }
+
+    public FieldVisitor fieldVisitor() {
+        return fv;
+    }
+
+    public MethodVisitor methodVisitor() {
+        return mv;
+    }
+}

Modified: geronimo/xbean/trunk/xbean-finder-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder-shaded/pom.xml?rev=1582001&r1=1582000&r2=1582001&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder-shaded/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder-shaded/pom.xml Wed Mar 26 18:39:19 2014
@@ -33,7 +33,7 @@
 
     <properties>
         <xbean.osgi.export>org.apache.xbean.finder;version=${project.version}</xbean.osgi.export>
-        <xbean.osgi.import>org.apache.xbean.finder;version=${project.version},org.apache.xbean.asm4;version=4,org.apache.xbean.asm4.shade.commons;version=4</xbean.osgi.import>
+        <xbean.osgi.import>org.apache.xbean.finder;version=${project.version},org.apache.xbean.asm5;version=5,org.apache.xbean.asm5.shade.commons;version=5</xbean.osgi.import>
     </properties>
 
     <build>
@@ -51,12 +51,12 @@
                             <createSourcesJar>true</createSourcesJar>
                             <relocations>
                                 <relocation>
-                                    <pattern>org.apache.xbean.asm4.original.commons.EmptyVisitor</pattern>
-                                    <shadedPattern>org.apache.xbean.asm4.shade.commons.EmptyVisitor</shadedPattern>
+                                    <pattern>org.apache.xbean.asm5.original.commons.EmptyVisitor</pattern>
+                                    <shadedPattern>org.apache.xbean.asm5.shade.commons.EmptyVisitor</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.objectweb.asm</pattern>
-                                    <shadedPattern>org.apache.xbean.asm4</shadedPattern>
+                                    <shadedPattern>org.apache.xbean.asm5</shadedPattern>
                                 </relocation>
                             </relocations>
                             <artifactSet>
@@ -65,7 +65,7 @@
                                 </includes>
                                 <excludes>
                                     <exclude>*:*:sources</exclude>
-                                    <exclude>org.apache.xbean:xbean-asm4-shaded</exclude>
+                                    <exclude>org.apache.xbean:xbean-asm5-shaded</exclude>
                                     <exclude>org.apache.xbean:xbean-asm-util</exclude>
                                     <exclude>junit:junit</exclude>
                                 </excludes>
@@ -98,7 +98,7 @@
                 <configuration>
                     <excludeDependencies>true</excludeDependencies>
                     <instructions>
-                        <Import-Package>!org.objectweb.asm.*,!org.apache.xbean.finder.*,org.apache.xbean.asm4,*;resolution:=optional</Import-Package>
+                        <Import-Package>!org.objectweb.asm.*,!org.apache.xbean.finder.*,org.apache.xbean.asm5,*;resolution:=optional</Import-Package>
                         <Private-Package />
                         <_nouses>true</_nouses>
                     </instructions>
@@ -123,7 +123,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-asm4-shaded</artifactId>
+            <artifactId>xbean-asm5-shaded</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>



Mime
View raw message