Return-Path: 
 <scm-return-32794-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 16711 invoked from network); 16 Oct 2008 14:14:51 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 16 Oct 2008 14:14:51 -0000
Received: (qmail 8859 invoked by uid 500); 16 Oct 2008 14:14:53 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 8812 invoked by uid 500); 16 Oct 2008 14:14:52 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 8803 invoked by uid 99); 16 Oct 2008 14:14:52 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2008 07:14:52 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2008 14:13:53 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 83FCF238896B; Thu, 16 Oct 2008 07:14:00 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r705249 - in /geronimo/samples/branches/2.1: pom.xml
 src/site/site.xml
Date: Thu, 16 Oct 2008 14:14:00 -0000
To: scm@geronimo.apache.org
From: jbohn@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081016141400.83FCF238896B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbohn
Date: Thu Oct 16 07:13:59 2008
New Revision: 705249

URL: http://svn.apache.org/viewvc?rev=705249&view=rev
Log:
update to Genesis 1.5-SNAPSHOT and clean up pom/site now that changes have been included in Genesis

Modified:
    geronimo/samples/branches/2.1/pom.xml
    geronimo/samples/branches/2.1/src/site/site.xml

Modified: geronimo/samples/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/pom.xml?rev=705249&r1=705248&r2=705249&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/pom.xml (original)
+++ geronimo/samples/branches/2.1/pom.xml Thu Oct 16 07:13:59 2008
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
-        <version>1.4</version>
+        <version>1.5-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>
@@ -96,40 +96,10 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.genesis.config</groupId>
-                <artifactId>geronimo-skin</artifactId>
-                <version>1.4</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <!--
-                HACK: Force the use of 2.4, since 2.3 causes the release profile to fail for this project.
-                      Upgrading here to avoid needing to wait for another Genesis release.
-                -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.4</version>
-                    <configuration>
-                        <source>1.5</source>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <configuration>
-                        <preparationGoals>clean install</preparationGoals>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -180,29 +150,4 @@
         </plugins>
     </reporting>
     
-    <profiles>
-        <profile>
-            <id>test-distribution</id>
-            <activation>
-                <property>
-                    <name>testDistributionUrl</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <repository>
-                    <id>test-repository</id>
-                    <url>${testDistributionUrl}/releases</url>
-                </repository>
-                <snapshotRepository>
-                    <id>test-snapshot-repository</id>
-                    <url>${testDistributionUrl}/snapshots</url>
-                </snapshotRepository>
-                <site>
-                    <id>test-site</id>
-                    <url>${testDistributionUrl}/site</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
-
 </project>

Modified: geronimo/samples/branches/2.1/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/src/site/site.xml?rev=705249&r1=705248&r2=705249&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/src/site/site.xml (original)
+++ geronimo/samples/branches/2.1/src/site/site.xml Thu Oct 16 07:13:59 2008
@@ -24,6 +24,7 @@
     <skin>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>geronimo-skin</artifactId>
+        <version>1.5-SNAPSHOT</version>
     </skin>
 
     <publishDate format="dd MMM yyyy"/>
@@ -35,11 +36,6 @@
     
     <body>
         
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        
         <menu ref="parent" />
         <menu ref="modules" />
         <menu ref="reports" />