From scm-return-47457-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org  Thu Oct 13 19:11:06 2011
Return-Path: <scm-return-47457-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CD04792BF
	for <apmail-geronimo-scm-archive@www.apache.org>; Thu, 13 Oct 2011 19:11:06 +0000 (UTC)
Received: (qmail 45774 invoked by uid 500); 13 Oct 2011 19:11:06 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 45709 invoked by uid 500); 13 Oct 2011 19:11:06 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 45700 invoked by uid 99); 13 Oct 2011 19:11:06 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2011 19:11:06 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2011 19:11:03 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 8446E2388A67;
	Thu, 13 Oct 2011 19:10:42 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1183031 - in /geronimo/bundles/trunk: bval-jsr303/pom.xml
 woodstox-core-asl/pom.xml
Date: Thu, 13 Oct 2011 19:10:42 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111013191042.8446E2388A67@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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,