geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1486403 - in /geronimo/xbean/trunk: ./ xbean-asm-shaded/ xbean-asm-shaded/src/main/appended-resources/META-INF/ xbean-asm4-shaded/ xbean-asm4-shaded/src/ xbean-asm4-shaded/src/main/ xbean-asm4-shaded/src/main/appended-resources/ xbean-asm4...
Date Sun, 26 May 2013 08:44:51 GMT
Author: struberg
Date: Sun May 26 08:44:51 2013
New Revision: 1486403

URL: http://svn.apache.org/r1486403
Log:
XBEAN-230 add asm4 as shaded version 

I also fixed a few things in the asm-3 build, like the OSGi versions, etc

Added:
    geronimo/xbean/trunk/xbean-asm4-shaded/   (with props)
    geronimo/xbean/trunk/xbean-asm4-shaded/pom.xml   (with props)
    geronimo/xbean/trunk/xbean-asm4-shaded/src/
    geronimo/xbean/trunk/xbean-asm4-shaded/src/main/
    geronimo/xbean/trunk/xbean-asm4-shaded/src/main/appended-resources/
    geronimo/xbean/trunk/xbean-asm4-shaded/src/main/appended-resources/META-INF/
    geronimo/xbean/trunk/xbean-asm4-shaded/src/main/appended-resources/META-INF/LICENSE.vm
  (with props)
Modified:
    geronimo/xbean/trunk/pom.xml
    geronimo/xbean/trunk/xbean-asm-shaded/   (props changed)
    geronimo/xbean/trunk/xbean-asm-shaded/pom.xml
    geronimo/xbean/trunk/xbean-asm-shaded/src/main/appended-resources/META-INF/LICENSE.vm
    geronimo/xbean/trunk/xbean-finder-shaded/   (props changed)

Modified: geronimo/xbean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/pom.xml?rev=1486403&r1=1486402&r2=1486403&view=diff
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Sun May 26 08:44:51 2013
@@ -315,7 +315,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>1.3.2</version>
+                    <version>2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.xbean</groupId>
@@ -339,7 +339,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.0</version>
+                    <version>3.1</version>
                     <configuration>
                         <showDeprecation>false</showDeprecation>
                         <showWarnings>false</showWarnings>
@@ -382,6 +382,7 @@
         <module>xbean-telnet</module>
         <module>maven-xbean-plugin</module>
         <module>xbean-asm-shaded</module>
+        <module>xbean-asm4-shaded</module>
         <module>xbean-finder-shaded</module>
     </modules>
 

Propchange: geronimo/xbean/trunk/xbean-asm-shaded/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun May 26 08:44:51 2013
@@ -9,4 +9,4 @@ junit*.properties
 target
 .settings
 bin
-
+dependency-reduced-pom.xml

Modified: geronimo/xbean/trunk/xbean-asm-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm-shaded/pom.xml?rev=1486403&r1=1486402&r2=1486403&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-asm-shaded/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-asm-shaded/pom.xml Sun May 26 08:44:51 2013
@@ -42,7 +42,7 @@
     </licenses>
 
     <properties>
-        <xbean.osgi.export>org.apache.xbean.asm;version=3.1,org.apache.xbean.asm.signature;version=3.1,org.apache.xbean.asm.commons;version=3.1,org.apache.xbean.asm.tree;version=3.1</xbean.osgi.export>
+        <xbean.osgi.export>org.apache.xbean.asm;version=3.2,org.apache.xbean.asm.signature;version=3.2,org.apache.xbean.asm.commons;version=3.2,org.apache.xbean.asm.tree;version=3.2</xbean.osgi.export>
     </properties>
 
     <build>
@@ -57,6 +57,8 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <!-- ASM3 artifacts have no sources attached-->
+                            <createSourcesJar>false</createSourcesJar>
                             <relocations>
                                 <relocation>
                                     <pattern>org.objectweb.asm</pattern>
@@ -77,24 +79,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- the antrun plugin does not affect the contents of the jar but does somehow
make the jar available to other modules ???? -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <unzip src="${project.build.directory}/xbean-asm-shaded-${project.version}.jar"
dest="${project.build.directory}/classes" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <dependencies>

Modified: geronimo/xbean/trunk/xbean-asm-shaded/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm-shaded/src/main/appended-resources/META-INF/LICENSE.vm?rev=1486403&r1=1486402&r2=1486403&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-asm-shaded/src/main/appended-resources/META-INF/LICENSE.vm
(original)
+++ geronimo/xbean/trunk/xbean-asm-shaded/src/main/appended-resources/META-INF/LICENSE.vm
Sun May 26 08:44:51 2013
@@ -20,7 +20,7 @@
 ## $Rev$ $Date$
 ##
 
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2011 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Propchange: geronimo/xbean/trunk/xbean-asm4-shaded/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun May 26 08:44:51 2013
@@ -0,0 +1,11 @@
+*.iml
+*.ipr
+*.iws
+.project
+.classpath
+maven.log
+junit*.properties
+target
+.settings
+bin
+dependency-reduced-pom.xml

Added: geronimo/xbean/trunk/xbean-asm4-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm4-shaded/pom.xml?rev=1486403&view=auto
==============================================================================
--- geronimo/xbean/trunk/xbean-asm4-shaded/pom.xml (added)
+++ geronimo/xbean/trunk/xbean-asm4-shaded/pom.xml Sun May 26 08:44:51 2013
@@ -0,0 +1,96 @@
+<?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.14-SNAPSHOT</version>
+    </parent>
+    <artifactId>xbean-asm4-shaded</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache XBean :: ASM 4 shaded (repackaged)</name>
+
+    <description>Repackaged and shaded asm 4.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>4.1</asm.version>
+        <xbean.osgi.export>org.apache.xbean.asm4;version=${asm.version},org.apache.xbean.asm4.signature;version=${asm.version},org.apache.xbean.asm4.commons;version=${asm.version},org.apache.xbean.asm4.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>
+                                    <pattern>org.objectweb.asm</pattern>
+                                    <shadedPattern>org.apache.xbean.asm4</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.asm-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-asm4-shaded/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: geronimo/xbean/trunk/xbean-asm4-shaded/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm4-shaded/src/main/appended-resources/META-INF/LICENSE.vm?rev=1486403&view=auto
==============================================================================
--- geronimo/xbean/trunk/xbean-asm4-shaded/src/main/appended-resources/META-INF/LICENSE.vm
(added)
+++ geronimo/xbean/trunk/xbean-asm4-shaded/src/main/appended-resources/META-INF/LICENSE.vm
Sun May 26 08:44:51 2013
@@ -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.
+
+
+

Propchange: geronimo/xbean/trunk/xbean-asm4-shaded/src/main/appended-resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/xbean/trunk/xbean-finder-shaded/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun May 26 08:44:51 2013
@@ -9,4 +9,4 @@ junit*.properties
 target
 .settings
 bin
-
+dependency-reduced-pom.xml



Mime
View raw message