geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1081044 - in /geronimo/sandbox/djencks/txmanager: org.apache.geronimo.jaxb-support/ org.apache.geronimo.jaxb-support/pom.xml org.apache.geronimo.transaction.kar/pom.xml org.apache.geronimo.transaction/pom.xml pom.xml
Date Sun, 13 Mar 2011 07:06:27 GMT
Author: djencks
Date: Sun Mar 13 07:06:27 2011
New Revision: 1081044

URL: http://svn.apache.org/viewvc?rev=1081044&view=rev
Log:
use newer possibly not committed features-maven-plugin features

Added:
    geronimo/sandbox/djencks/txmanager/org.apache.geronimo.jaxb-support/
      - copied from r1074356, geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/
    geronimo/sandbox/djencks/txmanager/org.apache.geronimo.jaxb-support/pom.xml
      - copied, changed from r1076886, geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml
Modified:
    geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml
    geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml
    geronimo/sandbox/djencks/txmanager/pom.xml

Copied: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.jaxb-support/pom.xml (from
r1076886, geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/org.apache.geronimo.jaxb-support/pom.xml?p2=geronimo/sandbox/djencks/txmanager/org.apache.geronimo.jaxb-support/pom.xml&p1=geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml&r1=1076886&r2=1081044&rev=1081044&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/org.apache.geronimo.jaxb-support/pom.xml Sun Mar 13
07:06:27 2011
@@ -25,13 +25,9 @@
         <version>3.99.99-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.geronimo.features</groupId>
-    <artifactId>org.apache.geronimo.transaction</artifactId>
+    <artifactId>org.apache.geronimo.jaxb-support</artifactId>
     <packaging>feature</packaging>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.components</groupId>
-            <artifactId>geronimo-connector</artifactId>
-        </dependency>
 
         <!-- we also need to install scr to get this stuff to work. Should be a separate
feature -->
 
@@ -63,7 +59,32 @@
                  </exclusion>
             </exclusions>
         </dependency>
-        
+
+        <dependency>
+             <groupId>org.apache.geronimo.bundles</groupId>
+             <artifactId>jaxb-impl</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.apache.geronimo.bundles</groupId>
+             <artifactId>woodstox</artifactId>
+         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+        </dependency>
+         <dependency>
+             <groupId>org.apache.geronimo.specs</groupId>
+             <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.apache.geronimo.specs</groupId>
+             <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-osgi-registry</artifactId>
+        </dependency>
+
         
     </dependencies>
     <build>
@@ -71,6 +92,9 @@
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>features-maven-plugin</artifactId>
+                <configuration>
+                    <startLevel>15</startLevel>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml?rev=1081044&r1=1081043&r2=1081044&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml Sun Mar
13 07:06:27 2011
@@ -29,6 +29,12 @@
     <packaging>kar</packaging>
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.features</groupId>
+            <artifactId>org.apache.geronimo.jaxb-support</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-connector</artifactId>
         </dependency>
@@ -37,33 +43,6 @@
             <artifactId>geronimo-connector-builder-1_6</artifactId>
         </dependency>
 
-        <!-- jaxb goo -->
-        <!-- these are dependencies of connector-builder, why aren't they pulled in? -->
-        <dependency>
-             <groupId>org.apache.geronimo.bundles</groupId>
-             <artifactId>jaxb-impl</artifactId>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.geronimo.bundles</groupId>
-             <artifactId>woodstox</artifactId>
-         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-        </dependency>
-         <dependency>
-             <groupId>org.apache.geronimo.specs</groupId>
-             <artifactId>geronimo-jaxb_2.2_spec</artifactId>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.geronimo.specs</groupId>
-             <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-osgi-registry</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-finder</artifactId>
@@ -122,6 +101,13 @@
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>features-maven-plugin</artifactId>
+                <configuration>
+                    <aggregateFeatures>true</aggregateFeatures>
+                    <startLevel>60</startLevel>
+                    <checkDependencyChange>true</checkDependencyChange>
+                    <overwriteChangedDependencies>true</overwriteChangedDependencies>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
+                </configuration>
                 <!--<configuration>-->
                     <!--<resolver>OBR</resolver>-->
                 <!--</configuration>-->

Modified: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml?rev=1081044&r1=1081043&r2=1081044&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml Sun Mar 13
07:06:27 2011
@@ -71,6 +71,9 @@
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>features-maven-plugin</artifactId>
+                <configuration>
+                    <startLevel>60</startLevel>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/sandbox/djencks/txmanager/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/pom.xml?rev=1081044&r1=1081043&r2=1081044&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/pom.xml Sun Mar 13 07:06:27 2011
@@ -71,6 +71,26 @@
                 <artifactId>geronimo-mock-ra</artifactId>
                 <version>3.99.99-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.features</groupId>
+                <artifactId>org.apache.geronimo.jaxb-support</artifactId>
+                <version>3.99.99-SNAPSHOT</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.features</groupId>
+                <artifactId>org.apache.geronimo.transaction</artifactId>
+                <version>3.99.99-SNAPSHOT</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.features</groupId>
+                <artifactId>org.apache.geronimo.transaction.kar</artifactId>
+                <version>3.99.99-SNAPSHOT</version>
+                <type>kar</type>
+            </dependency>
 
             <!-- external -->
             <dependency>
@@ -249,13 +269,18 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxb_2.2_spec</artifactId>
-                <version>1.1-SNAPSHOT</version>
+                <version>1.0.2-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-stax-api_1.2_spec</artifactId>
                 <version>1.1-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-osgi-registry</artifactId>
+                <version>1.1-SNAPSHOT</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -305,6 +330,7 @@
         <module>geronimo-connector</module>
         <module>geronimo-tranql-wrapper</module>
         <module>geronimo-connector-builder-1_6</module>
+        <module>org.apache.geronimo.jaxb-support</module>
         <module>org.apache.geronimo.transaction</module>
         <module>org.apache.geronimo.transaction.kar</module>
         <module>connector-itests</module>



Mime
View raw message