You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2016/03/25 08:43:19 UTC

servicemix-bundles git commit: SM-2925 - Fix POI bundles export/import packages

Repository: servicemix-bundles
Updated Branches:
  refs/heads/master dbae24bf5 -> e74a9bf25


SM-2925 - Fix POI bundles export/import packages


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/e74a9bf2
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/e74a9bf2
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/e74a9bf2

Branch: refs/heads/master
Commit: e74a9bf25cc790de8d74aceb39de60cc1f251c23
Parents: dbae24b
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Mar 25 08:42:52 2016 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Mar 25 08:42:52 2016 +0100

----------------------------------------------------------------------
 poi-3.13/pom.xml | 5 ++++-
 poi-3.14/pom.xml | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/e74a9bf2/poi-3.13/pom.xml
----------------------------------------------------------------------
diff --git a/poi-3.13/pom.xml b/poi-3.13/pom.xml
index 97b54fb..7dfd3ec 100644
--- a/poi-3.13/pom.xml
+++ b/poi-3.13/pom.xml
@@ -49,7 +49,10 @@
         <pkgArtifactId>poi</pkgArtifactId>
         <pkgVersion>3.13</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.etsi.uri.x01903*;version=${pkgVersion};-split-package:=merge-first,
+            org.etsi.uri.x01903.v13;version=${pkgVersion};-split-package:=merge-first,
+            org.etsi.uri.x01903.v13.impl;version=${pkgVersion};-split-package:=merge-first,
+            org.etsi.uri.x01903.v14;version=${pkgVersion};-split-package:=merge-first,
+            org.etsi.uri.x01903.v14.impl;version=${pkgVersion};-split-package:=merge-first,
             org.w3.x2000.x09.xmldsig*;version=${pkgVersion};-split-package:=merge-first,
             org.openxmlformats.schemas*;version=${pkgVersion};-split-package:=merge-first,
             com.microsoft.schemas.office.x2006*;version=${pkgVersion};-split-package:=merge-first,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/e74a9bf2/poi-3.14/pom.xml
----------------------------------------------------------------------
diff --git a/poi-3.14/pom.xml b/poi-3.14/pom.xml
index 4cd4650..7719339 100644
--- a/poi-3.14/pom.xml
+++ b/poi-3.14/pom.xml
@@ -53,6 +53,10 @@
             org.w3.x2000.x09.xmldsig*;version=${pkgVersion};-split-package:=merge-first,
             org.openxmlformats.schemas*;version=${pkgVersion};-split-package:=merge-first,
             com.microsoft.schemas.office.x2006*;version=${pkgVersion};-split-package:=merge-first,
+            com.microsoft.schemas.office.excel;version=${pkgVersion};-split-package:=merge-first,
+            com.microsoft.schemas.office.office;version=${pkgVersion};-split-package:=merge-first,
+            com.microsoft.schemas.office.visio.x2012.main;version=${pkgVersion};-split-package:=merge-first,
+            com.microsoft.schemas.office.visio.x2012.main.impl;version=${pkgVersion};-split-package:=merge-first,
             org.purl.dc.elements.x11,
             org.apache.poi*
         </servicemix.osgi.export.pkg>
@@ -66,13 +70,15 @@
             org.junit.*;resolution:=optional,
             org.openxmlformats*;resolution:=optional,
             repackage;resolution:=optional,
-            schemasMicrosoftCom*;resolution:=optional,
             org.apache.jcp.xml.dsig.internal.dom;resolution:=optional,
             org.apache.xml.resolver;resolution:=optional,
             org.apache.xml.resolver.tools;resolution:=optional,
             org.apache.xml.security;resolution:=optional,
             org.apache.xml.security.c14n;resolution:=optional,
             org.apache.xml.security.utils;resolution:=optional,
+            com.graphbuilder.curve;resolution:=optional,
+            com.graphbuilder.geom;resolution:=optional,
+            com.microsoft.schemas.vml;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>