geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r919396 - /geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml
Date Fri, 05 Mar 2010 12:49:02 GMT
Author: rickmcguire
Date: Fri Mar  5 12:49:02 2010
New Revision: 919396

URL: http://svn.apache.org/viewvc?rev=919396&view=rev
Log:
GERONIMO-5133 Geroinimo versions of the specs should pick up the additions made to the service
mix versions of the bundles. 

Correct the JPA build for the reorganized osgi-support artifacts. 


Modified:
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml?rev=919396&r1=919395&r2=919396&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml Fri Mar  5 12:49:02 2010
@@ -102,7 +102,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-osgi-support</artifactId>
+            <artifactId>geronimo-osgi-locator</artifactId>
             <version>1.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
@@ -133,9 +133,9 @@
                         <Specification-Title>JSR-317 Java Persistence API 2.0</Specification-Title>
                         <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
                         <Specification-Version>2.0</Specification-Version>
-                        <Private-Package>org.apache.geronimo.specs.jpa.*;org.apache.geronimo.osgi.locator;-split-package:=merge-first</Private-Package>
+                        <Private-Package>org.apache.geronimo.specs.jpa.*;org.apache.geronimo.osgi.locator</Private-Package>
                         <Export-Package>javax.persistence.*;version=2.0</Export-Package>
-                        <Import-Package>javax.persistence.*;version=2.0,javax.sql;resolution:=optional,org.osgi.framework;resolution:=optional,org.osgi.util.tracker;resolution:=optional,org.apache.geronimo.osgi.registry.api</Import-Package>
+                        <Import-Package>javax.persistence.*;version=2.0,javax.sql;resolution:=optional,org.osgi.framework;resolution:=optional,org.osgi.util.tracker;resolution:=optional,org.apache.geronimo.osgi.registry.api;resolution:=optional</Import-Package>
                         <!-- Eclipse metadata
                         <Eclipse-Autostart>false</Eclipse-Autostart>
                         <Bundle-ClassPath>.</Bundle-ClassPath>



Mime
View raw message