You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/05/19 18:56:06 UTC

svn commit: r657860 - in /geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources: pom.xml sample-ear/pom.xml sample-ejb/pom.xml sample-jetty/pom.xml sample-tomcat/pom.xml sample-war/pom.xml

Author: jbohn
Date: Mon May 19 09:56:05 2008
New Revision: 657860

URL: http://svn.apache.org/viewvc?rev=657860&view=rev
Log:
merge r657858 from branches/2.1 - remove hardcoded versions from archetype and remove reference snapshot repo

Modified:
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml?rev=657860&r1=657859&r2=657860&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml Mon May 19 09:56:05 2008
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>${version}</version>
     </parent>
     
     <artifactId>${artifactId}</artifactId>
@@ -57,22 +57,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories> 
-
 </project>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml?rev=657860&r1=657859&r2=657860&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml Mon May 19 09:56:05 2008
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>${artifactId}</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>${version}</version>
     </parent>
 
     <artifactId>${artifactId}-ear</artifactId>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml?rev=657860&r1=657859&r2=657860&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml Mon May 19 09:56:05 2008
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>${artifactId}</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>${version}</version>
     </parent>
 
     <artifactId>${artifactId}-ejb</artifactId>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml?rev=657860&r1=657859&r2=657860&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml Mon May 19 09:56:05 2008
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>${artifactId}</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>${version}</version>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml?rev=657860&r1=657859&r2=657860&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml Mon May 19 09:56:05 2008
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>${artifactId}</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>${version}</version>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml?rev=657860&r1=657859&r2=657860&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml Mon May 19 09:56:05 2008
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>${artifactId}</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>${version}</version>
     </parent>
 
     <artifactId>${artifactId}-war</artifactId>