geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r906260 - in /geronimo/xbean/trunk: pom.xml xbean-finder-shaded/pom.xml
Date Wed, 03 Feb 2010 21:46:56 GMT
Author: jlaskowski
Date: Wed Feb  3 21:46:55 2010
New Revision: 906260

URL: http://svn.apache.org/viewvc?rev=906260&view=rev
Log:
Upgrade maven-shade-plugin to 1.3.1 and fix an issue with shading in xbean-finder-shaded module

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=906260&r1=906259&r2=906260&view=diff
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Wed Feb  3 21:46:55 2010
@@ -251,7 +251,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>1.2.1</version>
+                    <version>1.3.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.xbean</groupId>

Modified: geronimo/xbean/trunk/xbean-finder-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder-shaded/pom.xml?rev=906260&r1=906259&r2=906260&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder-shaded/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder-shaded/pom.xml Wed Feb  3 21:46:55 2010
@@ -54,42 +54,58 @@
                                     <shadedPattern>org.apache.xbean.asm</shadedPattern>
                                 </relocation>
                             </relocations>
-                            <!-- this doesn't seem to work... what am I doing wrong? -->
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.apache.xbean:xbean-asm-shaded</exclude>
-                                </excludes>
-                            </artifactSet>
+                          <artifactSet>
+                            <includes>
+                              <include>org.apache.xbean:xbean-finder</include>
+                            </includes>
+                            <excludes>
+                              <exclude>org.apache.xbean:xbean-asm-shaded</exclude>
+                              <exclude>junit:junit</exclude>
+                            </excludes>
+                          </artifactSet>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <!--
-                       - It won't work as CLASSPATH references the file to be processed and
blows up
-                       - Dunno how it should work
-                    <excludeDependencies>true</excludeDependencies>
-                    -->
-                    <instructions>
-                        <Import-Package>!org.objectweb.asm.*,!org.apache.xbean.finder.*,org.apache.xbean.asm,*;resolution:=optional</Import-Package>
-                        <Private-Package />
-                        <_nouses>true</_nouses>
-                        <_classpath>target/xbean-finder-shaded-${pom.version}.jar</_classpath>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>bundle</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-antrun-plugin</artifactId>
+              <executions>
+                  <execution>
+                      <phase>package</phase>
+                      <goals>
+                          <goal>run</goal>
+                      </goals>
+                      <configuration>
+                          <tasks>
+                              <delete dir="${project.build.directory}/classes" />
+                              <unzip src="${project.build.directory}/xbean-finder-shaded-${pom.version}.jar"
dest="${project.build.directory}/classes" />
+                          </tasks>
+                      </configuration>
+                  </execution>
+              </executions>
+          </plugin>
+          <plugin>
+              <groupId>org.apache.felix</groupId>
+              <artifactId>maven-bundle-plugin</artifactId>
+              <configuration>
+                  <excludeDependencies>true</excludeDependencies>
+                  <instructions>
+                      <Import-Package>!org.objectweb.asm.*,!org.apache.xbean.finder.*,org.apache.xbean.asm,*;resolution:=optional</Import-Package>
+                      <Private-Package />
+                      <_nouses>true</_nouses>
+                  </instructions>
+              </configuration>
+              <executions>
+                  <execution>
+                      <id>bundle-manifest</id>
+                      <phase>package</phase>
+                      <goals>
+                          <goal>bundle</goal>
+                      </goals>
+                  </execution>
+              </executions>
+          </plugin>
         </plugins>
     </build>
     <dependencies>
@@ -97,22 +113,11 @@
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-finder</artifactId>
             <version>${version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-commons</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-        <!-- see above note in shade plugin configuration -->
-        <!--<dependency>-->
-        <!--<groupId>org.apache.xbean</groupId>-->
-        <!--<artifactId>xbean-asm-shaded</artifactId>-->
-        <!--<version>${version}</version>-->
-        <!--</dependency>-->
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-asm-shaded</artifactId>
+        <version>${version}</version>
+      </dependency>
     </dependencies>
 </project>



Mime
View raw message