karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1457005 - /karaf/branches/karaf-2.x/main/pom.xml
Date Fri, 15 Mar 2013 16:24:42 GMT
Author: gnodet
Date: Fri Mar 15 16:24:42 2013
New Revision: 1457005

URL: http://svn.apache.org/r1457005
Log:
[KARAF-2221] Fix the main jar packaging to avoid using additional packages.
The main problem is that all bundles can see classes included in the main jar, so adding compendium
or util classes could be a problem for bundles.

Modified:
    karaf/branches/karaf-2.x/main/pom.xml

Modified: karaf/branches/karaf-2.x/main/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/main/pom.xml?rev=1457005&r1=1457004&r2=1457005&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/main/pom.xml (original)
+++ karaf/branches/karaf-2.x/main/pom.xml Fri Mar 15 16:24:42 2013
@@ -116,13 +116,17 @@
                             org.apache.karaf.main*,
                             org.apache.karaf.util.properties,
                             org.apache.felix.utils.properties,
-                            org.osgi.*;-split-package:=merge-first
+                            org.osgi.framework*;
+                            org.osgi.resource;
+                            org.osgi.service.packageadmin;
+                            org.osgi.service.startlevel;
+                            org.osgi.service.url;
+                            org.osgi.util.tracker;-split-package:=merge-first
                         </Private-Package>
                     </instructions>
                     <unpackBundle>true</unpackBundle>
                 </configuration>
             </plugin>
-            <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -135,35 +139,23 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>org.eclipse:osgi</include>
-                                    <include>org.apache.felix:org.apache.felix.framework</include>
                                     <include>${project.groupId}:${project.artifactId}</include>
                                 </includes>
                             </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>org.eclipse:osgi</artifact>
-                                    <includes>
-                                        <include>org/osgi/**</include>
-                                        <include>org/eclipse/**</include>
-                                        <include>hookconfigurators.properties</include>
-                                    </includes>
-                                </filter>
-                                <filter>
-                                    <artifact>org.apache.felix:org.apache.felix.framework</artifact>
-                                    <includes>
-                                        <include>org/apache/felix/**</include>
-                                    </includes>
-                                </filter>
-                            </filters>
-                            <createSourcesJar>${createSourcesJar}</createSourcesJar>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.apache.karaf.util.properties</pattern>
+                                    <shadedPattern>org.apache.karaf.main.util</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.felix.utils.properties</pattern>
+                                    <shadedPattern>org.apache.karaf.main.util</shadedPattern>
+                                </relocation>
+                             </relocations>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-        -->
         </plugins>
     </build>
 



Mime
View raw message