geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r394383 - in /geronimo/gbuild/trunk: gbuild-agent-application/pom.xml gbuild-agent-web/pom.xml gbuild-agent/pom.xml gbuild-report/pom.xml pom.xml
Date Sat, 15 Apr 2006 22:11:45 GMT
Author: jdillon
Date: Sat Apr 15 15:11:43 2006
New Revision: 394383

URL: http://svn.apache.org/viewcvs?rev=394383&view=rev
Log:
 Removed versions from child poms, picked up from parent
 Minor reorder to group relevant sections
 Use versisons from top-level pom where possible
 Force the right version of the surefire plugin
 Use the org.apache.geronimo.specs
 Use ${pom.*} where possible


Modified:
    geronimo/gbuild/trunk/gbuild-agent-application/pom.xml
    geronimo/gbuild/trunk/gbuild-agent-web/pom.xml
    geronimo/gbuild/trunk/gbuild-agent/pom.xml
    geronimo/gbuild/trunk/gbuild-report/pom.xml
    geronimo/gbuild/trunk/pom.xml

Modified: geronimo/gbuild/trunk/gbuild-agent-application/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent-application/pom.xml?rev=394383&r1=394382&r2=394383&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-application/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-agent-application/pom.xml Sat Apr 15 15:11:43 2006
@@ -1,14 +1,17 @@
 <project>
+  <modelVersion>4.0.0</modelVersion>
+  
   <parent>
     <artifactId>gbuild-parent</artifactId>
     <groupId>org.apache.geronimo.gbuild</groupId>
     <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+  
   <artifactId>gbuild-agent-application</artifactId>
-  <packaging>plexus-application</packaging>
   <name>GBuild Agent Application</name>
-  <version>1.0-SNAPSHOT</version>
+  <packaging>plexus-application</packaging>
+  
   <build>
     <plugins>
       <plugin>
@@ -22,7 +25,7 @@
         </executions>
         <configuration>
           <descriptor>src/assembly/bin.xml</descriptor>
-          <finalName>gbuild-agent-1.0-SNAPSHOT</finalName>
+          <finalName>gbuild-agent-${pom.version}</finalName>
         </configuration>
       </plugin>
       <plugin>
@@ -49,10 +52,12 @@
       </plugin>
     </plugins>
   </build>
+  
   <profiles>
     <profile>
       <id>env-test</id>
       <activation>
+        <activeByDefault>true</activeByDefault>
         <property>
           <name>env</name>
           <value>test</value>
@@ -75,39 +80,37 @@
       </properties>
     </profile>
   </profiles>
-  <repositories>
-    <repository>
-      <id>apache.snapshots</id>
-      <url>http://cvs.apache.org/repository</url>
-      <layout>legacy</layout>
-    </repository>
-  </repositories>
+  
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo.gbuild</groupId>
+      <groupId>${pom.groupId}</groupId>
       <artifactId>gbuild-agent</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
+    
     <dependency>
-      <groupId>org.apache.geronimo.gbuild</groupId>
+      <groupId>${pom.groupId}</groupId>
       <artifactId>gbuild-agent-web</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
+    
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.8</version>
     </dependency>
+    
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-log4j-logging</artifactId>
       <version>1.1-alpha-1</version>
     </dependency>
+    
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-appserver</artifactId>
       <version>1.0-alpha-5</version>
     </dependency>
+    
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-container-artifact</artifactId>
@@ -119,6 +122,7 @@
         </exclusion>
       </exclusions>
     </dependency>
+    
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>

Modified: geronimo/gbuild/trunk/gbuild-agent-web/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent-web/pom.xml?rev=394383&r1=394382&r2=394383&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-web/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-agent-web/pom.xml Sat Apr 15 15:11:43 2006
@@ -1,21 +1,25 @@
 <project>
+  <modelVersion>4.0.0</modelVersion>
+  
   <parent>
-    <artifactId>gbuild-parent</artifactId>
     <groupId>org.apache.geronimo.gbuild</groupId>
+    <artifactId>gbuild-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+  
   <artifactId>gbuild-agent-web</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
   <name>GBuild Agent Webapp</name>
-  <url>http://maven.apache.org</url>
+  <packaging>jar</packaging>
+  <url>http://geronimo.apache.org</url>
+  
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo.gbuild</groupId>
+      <groupId>${pom.groupId}</groupId>
       <artifactId>gbuild-agent</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
+    
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-service-jetty</artifactId>
@@ -28,46 +32,40 @@
         </exclusion>
       </exclusions>
     </dependency>
+    
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-api</artifactId>
-      <version>1.1-SNAPSHOT</version>
     </dependency>
+    
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-core</artifactId>
-      <version>1.1-SNAPSHOT</version>
     </dependency>
+    
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-model</artifactId>
-      <version>1.1-SNAPSHOT</version>
     </dependency>
+    
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-command-line</artifactId>
-      <version>1.0-alpha-2</version>
     </dependency>
-
+    
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-jms</artifactId>
-      <version>1.1-rc4</version>
-      <scope>provided</scope>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
     </dependency>
-
+    
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-servlet</artifactId>
-      <version>2.4-rc4</version>
-      <scope>provided</scope>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
     </dependency>
-
+    
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
     </dependency>
   </dependencies>
 </project>

Modified: geronimo/gbuild/trunk/gbuild-agent/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent/pom.xml?rev=394383&r1=394382&r2=394383&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-agent/pom.xml Sat Apr 15 15:11:43 2006
@@ -1,25 +1,20 @@
 <project>
+  <modelVersion>4.0.0</modelVersion>
+  
   <parent>
     <artifactId>gbuild-parent</artifactId>
     <groupId>org.apache.geronimo.gbuild</groupId>
     <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+  
+  
   <artifactId>gbuild-agent</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
   <name>GBuild Agent</name>
+  <packaging>jar</packaging>
   <url>http://geronimo.apache.org</url>
+  
   <dependencies>
-
-    <!-- need this till my activemq-core-3.2.pom patch is applied -->
-    <!-- http://jira.codehaus.org/browse/MEV-193 -->
-    <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-      <version>1.3.4</version>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-api</artifactId>
@@ -35,28 +30,25 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-command-line</artifactId>
-      <version>1.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-cvs</artifactId>
     </dependency>
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-jms</artifactId>
-      <version>1.1-rc4</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
     </dependency>
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-j2ee-management</artifactId>
-      <version>1.0-rc4</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
     </dependency>
+    
+    <!-- ActiveMQ deps -->
     <dependency>
       <groupId>incubator-activemq</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
-
-    <!-- ActiveMQ deps -->
     <dependency>
       <groupId>backport-util-concurrent</groupId>
       <artifactId>backport-util-concurrent</artifactId>
@@ -72,13 +64,9 @@
       <artifactId>derby</artifactId>
       <version>10.1.1.0</version>
     </dependency>
-
-
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
     </dependency>
   </dependencies>
 </project>

Modified: geronimo/gbuild/trunk/gbuild-report/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-report/pom.xml?rev=394383&r1=394382&r2=394383&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-report/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-report/pom.xml Sat Apr 15 15:11:43 2006
@@ -1,15 +1,18 @@
 <project>
+  <modelVersion>4.0.0</modelVersion>
+  
   <parent>
     <artifactId>gbuild-parent</artifactId>
     <groupId>org.apache.geronimo.gbuild</groupId>
     <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+  
   <artifactId>gbuild-report</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
   <name>GBuild Report</name>
-  <url>http://maven.apache.org</url>
+  <packaging>jar</packaging>
+  <url>http://geronimo.apache.org</url>
+  
   <build>
     <plugins>
       <plugin>
@@ -34,17 +37,12 @@
       </plugin>
     </plugins>
   </build>
+  
   <dependencies>
     <dependency>
       <groupId>velocity</groupId>
       <artifactId>velocity</artifactId>
       <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

Modified: geronimo/gbuild/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/pom.xml?rev=394383&r1=394382&r2=394383&view=diff
==============================================================================
--- geronimo/gbuild/trunk/pom.xml (original)
+++ geronimo/gbuild/trunk/pom.xml Sat Apr 15 15:11:43 2006
@@ -6,10 +6,12 @@
   <packaging>pom</packaging>
   <name>GBuild Parent Project</name>
   <version>1.0-SNAPSHOT</version>
+  
   <issueManagement>
     <system>jira</system>
     <url>http://issues.apache.org/jira/browse/GERONIMO</url>
   </issueManagement>
+  
   <ciManagement>
     <system>continuum</system>
     <url>http://ci.gbuild.org/continuum</url>
@@ -21,7 +23,9 @@
       </notifier>
     </notifiers>
   </ciManagement>
+  
   <inceptionYear>2005</inceptionYear>
+  
   <mailingLists>
     <mailingList>
       <name>GBuild Dev List</name>
@@ -43,6 +47,7 @@
       <archive>mail-archives.apache.org/mod_mbox/www-announce/</archive>
     </mailingList>
   </mailingLists>
+  
   <licenses>
     <license>
       <name>The Apache Software License, Version 2.0</name>
@@ -50,6 +55,7 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+  
   <developers>
     <developer>
       <id>dblevins</id>
@@ -74,6 +80,7 @@
       <timezone>-8</timezone>
     </developer>
   </developers>
+  
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/gbuild/trunk/</connection>
     <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/gbuild/trunk/</developerConnection>
@@ -83,7 +90,10 @@
     <name>Apache</name>
     <url>http://www.apache.org/</url>
   </organization>
+  
   <build>
+    <defaultGoal>install</defaultGoal>
+    
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -105,6 +115,7 @@
         </executions>
       </plugin>
     </plugins>
+    
     <pluginManagement>
       <plugins>
         <plugin>
@@ -113,15 +124,21 @@
           <version>1.1.1</version>
           <extensions>true</extensions>
         </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.1.3</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
+  
   <modules>
     <module>gbuild-agent</module>
     <module>gbuild-agent-web</module>
     <module>gbuild-report</module>
     <module>gbuild-agent-application</module>
   </modules>
+  
   <repositories>
     <repository>
       <id>apache</id>
@@ -154,9 +171,14 @@
       <url>http://snapshots.maven.codehaus.org/maven2</url>
     </pluginRepository>
   </pluginRepositories>
+  
   <dependencyManagement>
     <dependencies>
-
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.8</version>
+      </dependency>
       <dependency>
         <groupId>concurrent</groupId>
         <artifactId>concurrent</artifactId>
@@ -171,6 +193,16 @@
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-core</artifactId>
         <version>1.0.2</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.resource</groupId>
+            <artifactId>connector</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
@@ -193,6 +225,21 @@
         <version>4.0-M4</version>
       </dependency>
       <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_2.4_spec</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
@@ -200,4 +247,12 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+  
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>



Mime
View raw message