geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r559713 - in /geronimo/components/txmanager/trunk: geronimo-connector/pom.xml geronimo-transaction/pom.xml pom.xml
Date Thu, 26 Jul 2007 06:35:01 GMT
Author: djencks
Date: Wed Jul 25 23:35:00 2007
New Revision: 559713

URL: http://svn.apache.org/viewvc?view=rev&rev=559713
Log:
GERONIMO-3344 tie new subprojects together with a parent pom

Added:
    geronimo/components/txmanager/trunk/pom.xml
      - copied, changed from r559328, geronimo/components/txmanager/trunk/geronimo-connector/pom.xml
Modified:
    geronimo/components/txmanager/trunk/geronimo-connector/pom.xml
    geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml

Modified: geronimo/components/txmanager/trunk/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-connector/pom.xml?view=diff&rev=559713&r1=559712&r2=559713
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-connector/pom.xml (original)
+++ geronimo/components/txmanager/trunk/geronimo-connector/pom.xml Wed Jul 25 23:35:00 2007
@@ -23,12 +23,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-txmanager-parent</artifactId>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.geronimo.components</groupId>
     <artifactId>geronimo-connector</artifactId>
     <version>2.0-SNAPSHOT</version>
     <name>Geronimo :: Connector</name>
@@ -44,46 +43,11 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-            <version>1.1.1</version>
         </dependency>
 
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0-alpha-2</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0-alpha-4</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <configuration>
-                        <archive>
-                            <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-                    </configuration>
-                    <executions>
-                      <execution>
-                        <goals>
-                          <goal>test-jar</goal>
-                        </goals>
-                      </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+    <build><!--
 
         <plugins>
             <plugin>
@@ -97,12 +61,12 @@
                         </goals>
                         <configuration>
                             <rules>
-                                <!-- Allow any Java >= 1.5, but not 1.6 or above -->
+                                --><!-- Allow any Java >= 1.5, but not 1.6 or above
--><!--
                                 <requireJavaVersion>
                                     <version>[1.5,1.6)</version>
                                 </requireJavaVersion>
                                 
-                                <!-- Allow any Maven >= 2.0.5 -->
+                                --><!-- Allow any Maven >= 2.0.5 --><!--
                                 <requireMavenVersion>
                                     <version>[2.0.5,)</version>
                                 </requireMavenVersion>
@@ -116,7 +80,7 @@
                 <groupId>org.apache.geronimo.genesis.plugins</groupId>
                 <artifactId>tools-maven-plugin</artifactId>
 
-                <!-- Tools includes custom packagings, install as extension to pick them
up -->
+                --><!-- Tools includes custom packagings, install as extension to pick
them up --><!--
                 <extensions>true</extensions>
 
                 <executions>
@@ -127,7 +91,7 @@
                             <goal>copy-legal-files</goal>
                         </goals>
                         <configuration>
-                            <!-- Fail the build if no legal files were copied -->
+                            --><!-- Fail the build if no legal files were copied --><!--
                             <strict>true</strict>
                         </configuration>
                     </execution>
@@ -139,8 +103,8 @@
                             <goal>verify-legal-files</goal>
                         </goals>
                         <configuration>
-                            <!-- Fail the build if no legal files were found -->
-                            <!--<strict>true</strict>-->
+                            --><!-- Fail the build if no legal files were found --><!--
+                            --><!--<strict>true</strict>--><!--
                             <strict>false</strict>
                         </configuration>
                     </execution>
@@ -174,7 +138,7 @@
                 </configuration>
             </plugin>
         </plugins>
-    </build>
+    --></build>
 
 </project>
 

Modified: geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml?view=diff&rev=559713&r1=559712&r2=559713
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml (original)
+++ geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml Wed Jul 25 23:35:00 2007
@@ -24,12 +24,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-txmanager-parent</artifactId>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.geronimo.components</groupId>
     <artifactId>geronimo-transaction</artifactId>
     <version>2.0-SNAPSHOT</version>
     <name>Geronimo :: Transaction</name>
@@ -39,25 +38,21 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <version>1.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-            <version>1.1.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.objectweb.howl</groupId>
             <artifactId>howl</artifactId>
-            <version>1.0.1-1</version>
         </dependency>
 
     </dependencies>

Copied: geronimo/components/txmanager/trunk/pom.xml (from r559328, geronimo/components/txmanager/trunk/geronimo-connector/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/pom.xml?view=diff&rev=559713&p1=geronimo/components/txmanager/trunk/geronimo-connector/pom.xml&r1=559328&p2=geronimo/components/txmanager/trunk/pom.xml&r2=559713
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-connector/pom.xml (original)
+++ geronimo/components/txmanager/trunk/pom.xml Wed Jul 25 23:35:00 2007
@@ -29,16 +29,29 @@
     </parent>
 
     <groupId>org.apache.geronimo.components</groupId>
-    <artifactId>geronimo-connector</artifactId>
+    <artifactId>geronimo-txmanager-parent</artifactId>
     <version>2.0-SNAPSHOT</version>
-    <name>Geronimo :: Connector</name>
+    <packaging>pom</packaging>
+    <name>Geronimo :: TxManager :: Parent</name>
 
+    <modules>
+        <module>geronimo-transaction</module>
+        <module>geronimo-connector</module>
+    </modules>
+
+    <dependencyManagement>
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.geronimo.components</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${version}</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>1.1</version>
         </dependency>
 
         <dependency>
@@ -47,7 +60,14 @@
             <version>1.1.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.objectweb.howl</groupId>
+            <artifactId>howl</artifactId>
+            <version>1.0.1-1</version>
+        </dependency>
+
     </dependencies>
+    </dependencyManagement>
 
     <build>
         <pluginManagement>



Mime
View raw message