geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r782761 - in /geronimo/genesis/trunk: apache-source-release-assembly-descriptor/ apache-source-release-assembly-descriptor/pom.xml pom.xml
Date Mon, 08 Jun 2009 20:14:05 GMT
Author: djencks
Date: Mon Jun  8 20:14:04 2009
New Revision: 782761

URL: http://svn.apache.org/viewvc?rev=782761&view=rev
Log:
GERONIMO-4654 Add our own source-release descriptor since the apache one won't be released
in time

Added:
    geronimo/genesis/trunk/apache-source-release-assembly-descriptor/
      - copied from r782743, maven/resources/trunk/apache-source-release-assembly-descriptor/
Modified:
    geronimo/genesis/trunk/apache-source-release-assembly-descriptor/pom.xml
    geronimo/genesis/trunk/pom.xml

Modified: geronimo/genesis/trunk/apache-source-release-assembly-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/apache-source-release-assembly-descriptor/pom.xml?rev=782761&r1=782743&r2=782761&view=diff
==============================================================================
--- geronimo/genesis/trunk/apache-source-release-assembly-descriptor/pom.xml (original)
+++ geronimo/genesis/trunk/apache-source-release-assembly-descriptor/pom.xml Mon Jun  8 20:14:04
2009
@@ -22,15 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache-resource-bundles</artifactId>
-    <version>3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
+    <parent>
+        <groupId>org.apache.geronimo.genesis</groupId>
+        <artifactId>genesis</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
 
   <artifactId>apache-source-release-assembly-descriptor</artifactId>
-  <version>1.0-SNAPSHOT</version>
 
   <name>Apache Source Release Assembly Descriptor</name>
   <description>

Modified: geronimo/genesis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=782761&r1=782760&r2=782761&view=diff
==============================================================================
--- geronimo/genesis/trunk/pom.xml (original)
+++ geronimo/genesis/trunk/pom.xml Mon Jun  8 20:14:04 2009
@@ -42,6 +42,9 @@
         Genesis provides build support for Apache Geronimo's Maven projects.
     </description>
 
+    <!-- NOTE: until the  source-release assembly descriptor is released you need to build
"clean install" before
+    using the -Papache-release profile -->
+
     <url>http://geronimo.apache.org</url>
 
     <organization>
@@ -121,7 +124,7 @@
             <url>${site.deploy.url}/maven/${siteId}/${version}</url>
         </site>
     </distributionManagement>
-    
+
     <repositories>
         <repository>
             <id>codehaus.snapshots</id>
@@ -173,6 +176,7 @@
     </pluginRepositories>
 
     <modules>
+        <module>apache-source-release-assembly-descriptor</module>
         <module>genesis-maven-plugin</module>
         <module>genesis-packaging</module>
         <module>genesis-default-flava</module>
@@ -184,7 +188,7 @@
 
         <pluginManagement>
             <plugins>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-archetype-plugin</artifactId>
@@ -301,7 +305,7 @@
                     <version>2.1-alpha-2</version>
                 </plugin>
 
-               <plugin>
+                <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
                     <version>2.0.0</version>
@@ -423,9 +427,12 @@
                         </executions>
                         <dependencies>
                             <dependency>
-                                <groupId>org.apache</groupId>
+                                <!-- apache version not yet released -->
+                                <!--<groupId>org.apache</groupId>-->
+                                <groupId>org.apache.geronimo.genesis</groupId>
                                 <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                                <version>1.0-SNAPSHOT</version>
+                                <!-- apache version not yet known -->
+                                <version>${version}</version>
                             </dependency>
                         </dependencies>
                     </plugin>



Mime
View raw message