Author: dwoods
Date: Mon Nov 30 22:33:25 2009
New Revision: 885599

URL: http://svn.apache.org/viewvc?rev=885599&view=rev
Log:
revert osgi changes that were included in r885573, so they can be committed against a JIRA for tracking

Modified:
    openjpa/trunk/openjpa-all/pom.xml
    openjpa/trunk/openjpa-osgi/pom.xml
    openjpa/trunk/openjpa/pom.xml

Modified: openjpa/trunk/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/pom.xml?rev=885599&r1=885598&r2=885599&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Mon Nov 30 22:33:25 2009
@@ -106,11 +106,11 @@
             <artifactId>openjpa</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
-        <!-- Optional openjpa-jdbc depends you may need...
+        <!-- Need to manually add back optional openjpa-jdbc depends -->
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
+            <scope>compile</scope>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -126,6 +126,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
+            <scope>compile</scope>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -138,14 +139,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        end optional openjpa-jdbc depends -->
-
-        <!-- Optional Bean Validation depends
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-validation_1.0_spec</artifactId>
-            <optional>true</optional>
-        </dependency>
-        end optional validation depends -->
+        <!-- end optional openjpa-jdbc depends -->
     </dependencies>
 </project>

Modified: openjpa/trunk/openjpa-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-osgi/pom.xml?rev=885599&r1=885598&r2=885599&view=diff
==============================================================================
--- openjpa/trunk/openjpa-osgi/pom.xml (original)
+++ openjpa/trunk/openjpa-osgi/pom.xml Mon Nov 30 22:33:25 2009
@@ -246,7 +246,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-validation_1.0_spec</artifactId>
-            <optional>true</optional>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

Modified: openjpa/trunk/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa/pom.xml?rev=885599&r1=885598&r2=885599&view=diff
==============================================================================
--- openjpa/trunk/openjpa/pom.xml (original)
+++ openjpa/trunk/openjpa/pom.xml Mon Nov 30 22:33:25 2009
@@ -197,12 +197,5 @@
             <artifactId>openjpa-slice</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        <!-- Need to manually add back optional validation depends -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-validation_1.0_spec</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <!-- end optional validation depends -->
     </dependencies>
 </project>