geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r921316 - /geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml
Date Wed, 10 Mar 2010 11:47:25 GMT
Author: rickmcguire
Date: Wed Mar 10 11:47:25 2010
New Revision: 921316

URL: http://svn.apache.org/viewvc?rev=921316&view=rev
Log:
non-class resources were not getting included in merged bundle

Modified:
    geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml

Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml?rev=921316&r1=921315&r2=921316&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml Wed Mar
10 11:47:25 2010
@@ -72,6 +72,55 @@
     <build>
         <plugins>
             <plugin>
+                <!-- NOTE:  The shade build step is an important step in getting the bundle
+                     built correctly.  This step copies all of the OSGI-INF/services and
META-INF/*
+                     resources into the local build target, and then the bundle plugin merges
those
+                     resources with the class files pulled from the dependency jars to create
the
+                     final result.  Without this extra step, only the class files make it
into the
+                     final bundle.-->
+
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
+                                    <include>org.apache.geronimo.javamail:geronimo-javamail_1.4_provider</include>
+                                    <include>${project.groupId}:${project.artifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</artifact>
+                                    <!-- All of the class files need to be excluded to
avoid bnd errors about split packages -->
+                                    <excludes>
+                                        <exclude>javax/**</exclude>
+                                        <exclude>org/apache/geronimo/mail/**</exclude>
+                                        <exclude>org/apache/geronimo/osgi/**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.apache.geronimo.javamail:geronimo-javamail_1.4_provider</artifact>
+                                    <excludes>
+                                        <exclude>org/apache/geronimo/javamail/**</exclude>
+                                        <exclude>org/apache/geronimo/osgi/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>



Mime
View raw message