openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r915455 - in /openjpa/branches/1.3.x: openjpa-all/pom.xml openjpa-project/assembly.xml openjpa/pom.xml
Date Tue, 23 Feb 2010 17:49:39 GMT
Author: dwoods
Date: Tue Feb 23 17:49:39 2010
New Revision: 915455

URL: http://svn.apache.org/viewvc?rev=915455&view=rev
Log:
merge in some packaging changes from trunk

Modified:
    openjpa/branches/1.3.x/openjpa-all/pom.xml
    openjpa/branches/1.3.x/openjpa-project/assembly.xml
    openjpa/branches/1.3.x/openjpa/pom.xml

Modified: openjpa/branches/1.3.x/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-all/pom.xml?rev=915455&r1=915454&r2=915455&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-all/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-all/pom.xml Tue Feb 23 17:49:39 2010
@@ -106,39 +106,5 @@
             <artifactId>openjpa</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        <!-- 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>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jsr173_api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.activation</groupId>
-                    <artifactId>activation</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <scope>compile</scope>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jsr173_api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.activation</groupId>
-                    <artifactId>activation</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- end optional openjpa-jdbc depends -->
     </dependencies>
 </project>

Modified: openjpa/branches/1.3.x/openjpa-project/assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-project/assembly.xml?rev=915455&r1=915454&r2=915455&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-project/assembly.xml (original)
+++ openjpa/branches/1.3.x/openjpa-project/assembly.xml Tue Feb 23 17:49:39 2010
@@ -97,6 +97,7 @@
 
                 <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-jpa_1.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
             </includes>
         </dependencySet>
     </dependencySets>

Modified: openjpa/branches/1.3.x/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa/pom.xml?rev=915455&r1=915454&r2=915455&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa/pom.xml Tue Feb 23 17:49:39 2010
@@ -174,6 +174,7 @@
                      javax.xml.bind:jsr173_api:jar:1.0
                      javax.activation:activation:jar:1.1
                      com.sun.xml.bind:jaxb-impl:jar:2.0.5
+            -->
             <exclusions>
                 <exclusion>
                     <groupId>javax.xml.bind</groupId>
@@ -184,7 +185,6 @@
                     <artifactId>jaxb-impl</artifactId>
                 </exclusion>
             </exclusions>
-            -->
         </dependency>
         <!-- Need to manually add back optional openjpa-jdbc depends -->
         <dependency>



Mime
View raw message