openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r832878 - in /openjpa/trunk: openjpa-all/pom.xml openjpa-jdbc/pom.xml openjpa-persistence-jdbc/pom.xml openjpa/pom.xml
Date Wed, 04 Nov 2009 21:35:08 GMT
Author: dwoods
Date: Wed Nov  4 21:35:07 2009
New Revision: 832878

URL: http://svn.apache.org/viewvc?rev=832878&view=rev
Log:
OPENJPA-839 fix pom data so unprovided depends will be pulled automatically by maven and mark
JAXB depends as optional

Modified:
    openjpa/trunk/openjpa-all/pom.xml
    openjpa/trunk/openjpa-jdbc/pom.xml
    openjpa/trunk/openjpa-persistence-jdbc/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=832878&r1=832877&r2=832878&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Wed Nov  4 21:35:07 2009
@@ -62,6 +62,7 @@
                             <createDependencyReducedPom>true</createDependencyReducedPom>
                             <createSourcesJar>true</createSourcesJar>
                             <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <!-- 
                                  Have to do this again here, as these settings
                                  from shaded openjpa.jar get lost in the shading
@@ -97,56 +98,47 @@
 
     <dependencies>
         <!--
-            Only include openjpa.jar and its required dependencies here, which
-            will be used by maven-shade-plugin to determine the inclusions.
+            Only include openjpa.jar here, as the maven-shade-plugin will
+            determine the transitive dependencies to include from it.
         -->
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
-        <!-- Non-OpenJPA JARs to pull in -->
-        <dependency>
-            <groupId>net.sourceforge.serp</groupId>
-            <artifactId>serp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.0_spec</artifactId>
-        </dependency>
-
-        <!-- optional runtime dependencies -->
+        <!-- Need to manually add back optional openjpa-jdbc depends -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <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>
-
-        <!-- excluded optional runtime dependencies
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-validation_1.0_spec</artifactId>
-        </dependency>
-        -->
+        <!-- end optional openjpa-jdbc depends -->
     </dependencies>
 </project>

Modified: openjpa/trunk/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/pom.xml?rev=832878&r1=832877&r2=832878&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-jdbc/pom.xml Wed Nov  4 21:35:07 2009
@@ -42,10 +42,14 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
+            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
+            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>hsqldb</groupId>

Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=832878&r1=832877&r2=832878&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Wed Nov  4 21:35:07 2009
@@ -778,6 +778,17 @@
             <artifactId>jakarta-regexp</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Required for org.apache.openjpa.persistence.xmlmapping tests -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

Modified: openjpa/trunk/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa/pom.xml?rev=832878&r1=832877&r2=832878&view=diff
==============================================================================
--- openjpa/trunk/openjpa/pom.xml (original)
+++ openjpa/trunk/openjpa/pom.xml Wed Nov  4 21:35:07 2009
@@ -62,6 +62,23 @@
                             <createDependencyReducedPom>true</createDependencyReducedPom>
                             <createSourcesJar>true</createSourcesJar>
                             <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <!--
+                                 Specify a subset of depends to include,
+                                 which must match the <dependencies> section.
+                            -->
+                            <artifactSet>
+                                <includes>
+                                    <include>org.apache.openjpa:openjpa-lib</include>
+                                    <include>org.apache.openjpa:openjpa-kernel</include>
+                                    <include>org.apache.openjpa:openjpa-jdbc</include>
+                                    <include>org.apache.openjpa:openjpa-persistence</include>
+                                    <include>org.apache.openjpa:openjpa-persistence-jdbc</include>
+                                    <include>org.apache.openjpa:openjpa-xmlstore</include>
+                                    <include>org.apache.openjpa:openjpa-slice</include>
+                                </includes>
+                            </artifactSet>
+                            <!-- OpenJPA unique META-INF setup -->
                             <transformers>
                                 <!-- Need to concatinate the services resources:
                                  org.apache.openjpa.lib.conf.ProductDerivation
@@ -108,13 +125,12 @@
             <artifactId>openjpa-jdbc</artifactId>
             <version>${pom.version}</version>
             <!-- 
-                 Need to exclude jaxb depends, so the following will not
-                 get included in the aggregate JAR by the shade plugin:
+                 Need to exclude jaxb, so the following will not get included
+                 as compile depends in the aggregate JAR by the shade plugin:
                      javax.xml.bind:jaxb-api:jar:2.0
                      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>
@@ -125,7 +141,42 @@
                     <artifactId>jaxb-impl</artifactId>
                 </exclusion>
             </exclusions>
+            -->
+        </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 -->
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence</artifactId>
@@ -146,52 +197,5 @@
             <artifactId>openjpa-slice</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
-        <!-- JARs NOT included in aggregate JAR via maven-shade-plugin -->
-        <dependency>
-            <groupId>net.sourceforge.serp</groupId>
-            <artifactId>serp</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-validation_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>



Mime
View raw message