From commits-return-5591-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Mon Nov 30 22:33:50 2009
Return-Path: <commits-return-5591-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org>
Delivered-To: apmail-openjpa-commits-archive@www.apache.org
Received: (qmail 45105 invoked from network); 30 Nov 2009 22:33:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 30 Nov 2009 22:33:50 -0000
Received: (qmail 15595 invoked by uid 500); 30 Nov 2009 22:33:50 -0000
Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org
Received: (qmail 15557 invoked by uid 500); 30 Nov 2009 22:33:50 -0000
Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@openjpa.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@openjpa.apache.org>
List-Post: <mailto:commits@openjpa.apache.org>
List-Id: <commits.openjpa.apache.org>
Reply-To: dev@openjpa.apache.org
Delivered-To: mailing list commits@openjpa.apache.org
Received: (qmail 15548 invoked by uid 99); 30 Nov 2009 22:33:50 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Nov 2009 22:33:50 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 30 Nov 2009 22:33:47 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 64F7A23889EC; Mon, 30 Nov 2009 22:33:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r885599 - in /openjpa/trunk: openjpa-all/pom.xml
 openjpa-osgi/pom.xml openjpa/pom.xml
Date: Mon, 30 Nov 2009 22:33:26 -0000
To: commits@openjpa.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091130223326.64F7A23889EC@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>