servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1384289 - in /servicemix/smx4/bundles/trunk: derbynet-10.8.1.2/pom.xml derbynet-10.8.2.2/pom.xml pom.xml
Date Thu, 13 Sep 2012 11:53:49 GMT
Author: jbonofre
Date: Thu Sep 13 11:53:49 2012
New Revision: 1384289

URL: http://svn.apache.org/viewvc?rev=1384289&view=rev
Log:
[SMX4-1232] Exclude derby from derbynet to avoid split-package

Modified:
    servicemix/smx4/bundles/trunk/derbynet-10.8.1.2/pom.xml
    servicemix/smx4/bundles/trunk/derbynet-10.8.2.2/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/derbynet-10.8.1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derbynet-10.8.1.2/pom.xml?rev=1384289&r1=1384288&r2=1384289&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/derbynet-10.8.1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/derbynet-10.8.1.2/pom.xml Thu Sep 13 11:53:49 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>9-SNAPSHOT</version>
+        <version>10</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -45,15 +45,30 @@
         <servicemix.osgi.import.pkg>
             javax.crypto*,
             javax.management,
-            javax.naming*,
             javax.net*,
             javax.security.auth,
             javax.servlet*,
             javax.sql,
             javax.transaction.xa,
-            javax.xml*,
-            org.w3c.dom*,
             org.xml.sax,
+            org.apache.derby.catalog,
+            org.apache.derby.iapi.db,
+            org.apache.derby.iapi.error,
+            org.apache.derby.iapi.jdbc,
+            org.apache.derby.iapi.services.i18n,
+            org.apache.derby.iapi.services.info,
+            org.apache.derby.iapi.services.io,
+            org.apache.derby.iapi.services.jmx,
+            org.apache.derby.iapi.services.monitor,
+            org.apache.derby.iapi.services.property,
+            org.apache.derby.iapi.services.stream,
+            org.apache.derby.iapi.store.access.xa,
+            org.apache.derby.iapi.tools.i18n,
+            org.apache.derby.iapi.util,
+            org.apache.derby.impl.jdbc,
+            org.apache.derby.jdbc,
+            org.apache.derby.mbeans,
+            org.apache.derby.security,
             org.osgi.framework,
             com.ibm.jvm;resolution:=optional
         </servicemix.osgi.import.pkg>
@@ -65,6 +80,12 @@
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.derby</groupId>
+                    <artifactId>derby</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- sources -->
@@ -99,9 +120,10 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                        <include>**/*.policy</include>
+                                    </includes>
                                 </filter>
                             </filters>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>

Modified: servicemix/smx4/bundles/trunk/derbynet-10.8.2.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derbynet-10.8.2.2/pom.xml?rev=1384289&r1=1384288&r2=1384289&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/derbynet-10.8.2.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/derbynet-10.8.2.2/pom.xml Thu Sep 13 11:53:49 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>9-SNAPSHOT</version>
+        <version>10</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -39,21 +39,39 @@
         <pkgGroupId>org.apache.derby</pkgGroupId>
         <pkgArtifactId>derbynet</pkgArtifactId>
         <pkgVersion>10.8.2.2</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            org.apache.derby
-        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.export>
+            org.apache.derby.drda;version=${pkgVersion};-split-package:=merge-first,
+            org.apache.derby.impl.drda;version=${pkgVersion};-split-package:=merge-first,
+            org.apache.derby.impl.tools.sysinfo;version=${pkgVersion};-split-package:=merge-first,
+            org.apache.derby.mbeans.drda;version=${pkgVersion};-split-package:=merge-first
+        </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
             javax.crypto*,
             javax.management,
-            javax.naming*,
             javax.net*,
             javax.security.auth,
             javax.servlet*,
             javax.sql,
             javax.transaction.xa,
-            javax.xml*,
-            org.w3c.dom*,
             org.xml.sax,
+            org.apache.derby.catalog,
+            org.apache.derby.iapi.db,
+            org.apache.derby.iapi.error,
+            org.apache.derby.iapi.jdbc,
+            org.apache.derby.iapi.services.i18n,
+            org.apache.derby.iapi.services.info,
+            org.apache.derby.iapi.services.io,
+            org.apache.derby.iapi.services.jmx,
+            org.apache.derby.iapi.services.monitor,
+            org.apache.derby.iapi.services.property,
+            org.apache.derby.iapi.services.stream,
+            org.apache.derby.iapi.store.access.xa,
+            org.apache.derby.iapi.tools.i18n,
+            org.apache.derby.iapi.util,
+            org.apache.derby.impl.jdbc,
+            org.apache.derby.jdbc,
+            org.apache.derby.mbeans,
+            org.apache.derby.security,
             org.osgi.framework,
             com.ibm.jvm;resolution:=optional
         </servicemix.osgi.import.pkg>
@@ -65,6 +83,12 @@
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>${pkgGroupId}</groupId>
+                    <artifactId>derby</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- sources -->
@@ -99,9 +123,10 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                        <include>**/*.policy</include>
+                                    </includes>
                                 </filter>
                             </filters>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1384289&r1=1384288&r2=1384289&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Thu Sep 13 11:53:49 2012
@@ -47,6 +47,8 @@
         <module>automaton-1.11-8</module>
         <module>gentlyweb-utils-1.5</module>
         <module>velocity-1.7</module>
+        <module>derbynet-10.8.1.2</module>
+        <module>derbynet-10.8.2.2</module>
     </modules>
 
 </project>



Mime
View raw message