You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/10/13 21:10:42 UTC
svn commit: r1183031 - in /geronimo/bundles/trunk: bval-jsr303/pom.xml
woodstox-core-asl/pom.xml
Author: djencks
Date: Thu Oct 13 19:10:41 2011
New Revision: 1183031
URL: http://svn.apache.org/viewvc?rev=1183031&view=rev
Log:
GERONIMO-6192 specify some import package versions in our repackagings of bval and woodstox. Include stax2-api in woodstox so we don't need to repackage it too
Modified:
geronimo/bundles/trunk/bval-jsr303/pom.xml
geronimo/bundles/trunk/woodstox-core-asl/pom.xml
Modified: geronimo/bundles/trunk/bval-jsr303/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/bval-jsr303/pom.xml?rev=1183031&r1=1183030&r2=1183031&view=diff
==============================================================================
--- geronimo/bundles/trunk/bval-jsr303/pom.xml (original)
+++ geronimo/bundles/trunk/bval-jsr303/pom.xml Thu Oct 13 19:10:41 2011
@@ -65,6 +65,11 @@
<artifactId>geronimo-validation_1.0_spec</artifactId>
<version>1.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
@@ -80,7 +85,9 @@
<Embed-Dependency>*;scope=provided;inline=true</Embed-Dependency>
<Private-Package />
<Export-Package>org.apache.bval.*</Export-Package>
- <Import-Package>javax.persistence.*;resolution:=optional,org.apache.bval.xml.*;resolution:=optional,*</Import-Package>
+ <Import-Package>
+ javax.persistence.*;resolution:=optional,
+ org.apache.bval.xml.*;resolution:=optional,*</Import-Package>
<!-- geronimo spec osgi services support -->
<SPI-Provider>true</SPI-Provider>
<Include-Resource>
Modified: geronimo/bundles/trunk/woodstox-core-asl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/woodstox-core-asl/pom.xml?rev=1183031&r1=1183030&r2=1183031&view=diff
==============================================================================
--- geronimo/bundles/trunk/woodstox-core-asl/pom.xml (original)
+++ geronimo/bundles/trunk/woodstox-core-asl/pom.xml Thu Oct 13 19:10:41 2011
@@ -52,7 +52,8 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
- <optional>true</optional>
+ <!--<optional>true</optional>-->
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.xml.stream</groupId>
@@ -69,13 +70,15 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.2_spec</artifactId>
<version>1.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>3.1.1</version>
- <optional>true</optional>
+ <!--<optional>true</optional>-->
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -91,7 +94,8 @@
com.ctc.wstx.msv;version=${pkgVersion},
com.ctc.wstx.osgi;version=${pkgVersion},
com.ctc.wstx.sax;version=${pkgVersion},
- com.ctc.wstx.stax;version=${pkgVersion}
+ com.ctc.wstx.stax;version=${pkgVersion},
+ org.codehaus.stax2*;version=3.1.1
</Export-Package>
<Import-Package>
com.sun.msv*;resolution:=optional,