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 2015/12/18 07:50:01 UTC
[1/2] servicemix-bundles git commit: osgi export org.apache.poi*,
include ooxml-security which provides org.etsi.uri.x01903.v14 and
export org.purl.dc.elements.x11
Repository: servicemix-bundles
Updated Branches:
refs/heads/master 5f3de1dee -> ec6b5ece1
osgi export org.apache.poi*, include ooxml-security which provides org.etsi.uri.x01903.v14 and export org.purl.dc.elements.x11
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/2c55fefd
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/2c55fefd
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/2c55fefd
Branch: refs/heads/master
Commit: 2c55fefdcc9cf36def255d1057e1f5509125345b
Parents: 8b910ba
Author: Marco Westermann <mw...@intersales.de>
Authored: Mon Nov 23 10:03:28 2015 +0100
Committer: Marco Westermann <mw...@intersales.de>
Committed: Mon Nov 23 10:03:28 2015 +0100
----------------------------------------------------------------------
poi-3.13/pom.xml | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/2c55fefd/poi-3.13/pom.xml
----------------------------------------------------------------------
diff --git a/poi-3.13/pom.xml b/poi-3.13/pom.xml
index 208ab37..b03aaa4 100644
--- a/poi-3.13/pom.xml
+++ b/poi-3.13/pom.xml
@@ -18,16 +18,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
<version>12</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
-
+
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.poi</artifactId>
<version>3.13_2-SNAPSHOT</version>
@@ -43,7 +43,7 @@
<url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
<tag>HEAD</tag>
</scm>
-
+
<properties>
<pkgGroupId>org.apache.poi</pkgGroupId>
<pkgArtifactId>poi</pkgArtifactId>
@@ -53,7 +53,8 @@
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,
- org.apache.poi
+ org.purl.dc.elements.x11,
+ org.apache.poi*
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
com.sun.javadoc;resolution:=optional,
@@ -72,7 +73,7 @@
org.apache.xmlbeans.*;-split-package:=merge-first
</servicemix.osgi.private.pkg>
</properties>
-
+
<dependencies>
<dependency>
<groupId>${pkgGroupId}</groupId>
@@ -105,6 +106,12 @@
<optional>false</optional>
</dependency>
<dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>ooxml-security</artifactId>
+ <version>1.0</version>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>2.6.0</version>
@@ -139,6 +146,13 @@
<classifier>sources</classifier>
<optional>false</optional>
</dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>ooxml-security</artifactId>
+ <version>1.0</version>
+ <classifier>sources</classifier>
+ <optional>false</optional>
+ </dependency>
<!-- Sources not available -->
<!--<dependency>-->
@@ -156,7 +170,7 @@
<!--</dependency>-->
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -176,6 +190,7 @@
<include>${pkgGroupId}:poi-scratchpad</include>
<include>${pkgGroupId}:poi-ooxml</include>
<include>${pkgGroupId}:poi-ooxml-schemas</include>
+ <include>${pkgGroupId}:ooxml-security</include>
<include>dom4j:dom4j</include>
<include>org.apache.xmlbeans:xmlbeans</include>
</includes>
[2/2] servicemix-bundles git commit: Merge branch 'master' of
https://github.com/MarWestermann/servicemix-bundles
Posted by jb...@apache.org.
Merge branch 'master' of https://github.com/MarWestermann/servicemix-bundles
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/ec6b5ece
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/ec6b5ece
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/ec6b5ece
Branch: refs/heads/master
Commit: ec6b5ece19402e1c0c9fc573bc45507e6b5f7f7e
Parents: 5f3de1d 2c55fef
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Dec 18 07:48:58 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Dec 18 07:48:58 2015 +0100
----------------------------------------------------------------------
poi-3.13/pom.xml | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------