maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r1005776 - in /maven/site/trunk: ./ pom.xml src/site/apt/docs/3.0/ src/site/apt/docs/3.0/release-notes.apt.vm src/site/apt/docs/3.0/release-notes.txt src/site/apt/download.apt.vm src/site/site.xml src/site/xdoc/index.xml.vm
Date Fri, 08 Oct 2010 11:17:33 GMT
Author: bentmann
Date: Fri Oct  8 11:17:32 2010
New Revision: 1005776

URL: http://svn.apache.org/viewvc?rev=1005776&view=rev
Log:
o Updated site to account for release of Maven 3.0

Added:
    maven/site/trunk/src/site/apt/docs/3.0/
      - copied from r1005773, maven/site/branches/m3/src/site/apt/docs/3.0/
    maven/site/trunk/src/site/apt/docs/3.0/release-notes.apt.vm
      - copied unchanged from r1005773, maven/site/branches/m3/src/site/apt/docs/3.0/release-notes.apt.vm
    maven/site/trunk/src/site/apt/docs/3.0/release-notes.txt
      - copied unchanged from r1005773, maven/site/branches/m3/src/site/apt/docs/3.0/release-notes.txt
Modified:
    maven/site/trunk/   (props changed)
    maven/site/trunk/pom.xml
    maven/site/trunk/src/site/apt/download.apt.vm
    maven/site/trunk/src/site/site.xml
    maven/site/trunk/src/site/xdoc/index.xml.vm

Propchange: maven/site/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  8 11:17:32 2010
@@ -1 +1,2 @@
+/maven/site/branches/m3:1005486-1005773
 /maven/site/branches/release-presentation:835679-881149

Modified: maven/site/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1005776&r1=1005775&r2=1005776&view=diff
==============================================================================
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Fri Oct  8 11:17:32 2010
@@ -269,11 +269,13 @@
   <properties>
     <current20xVersion>2.0.11</current20xVersion>
     <current20xReleaseDate>25 Feb 2010</current20xReleaseDate>
-    <currentStableVersion>2.2.1</currentStableVersion>
-    <currentStableReleaseDate>11 August 2009</currentStableReleaseDate>
+    <current22xVersion>2.2.1</current22xVersion>
+    <current22xReleaseDate>11 August 2009</current22xReleaseDate>
+    <currentStableVersion>3.0</currentStableVersion>
+    <currentStableReleaseDate>8 October 2010</currentStableReleaseDate>
     <currentDevelopmentVersion>3.0-beta-3</currentDevelopmentVersion>
     <currentDevelopmentReleaseDate>2 September 2010</currentDevelopmentReleaseDate>
-    <releasedVersions>2.2.1,2.2.0,2.1.0,2.0.11,2.0.10,2.0.9,2.0.8,2.0.7,2.0.6,2.0.5,2.0.4,2.0.3,2.0.2,2.0.1,2.0</releasedVersions>
+    <releasedVersions>3.0,2.2.1,2.2.0,2.1.0,2.0.11,2.0.10,2.0.9,2.0.8,2.0.7,2.0.6,2.0.5,2.0.4,2.0.3,2.0.2,2.0.1,2.0</releasedVersions>
     <developmentVersions>3.0-beta-3,3.0-beta-2,3.0-beta-1,3.0-alpha-7,3.0-alpha-6,3.0-alpha-5,3.0-alpha-4,3.0-alpha-3</developmentVersions>
     <site.deploy.url>scp://people.apache.org/www/maven.apache.org/</site.deploy.url>
   </properties>

Modified: maven/site/trunk/src/site/apt/download.apt.vm
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/download.apt.vm?rev=1005776&r1=1005775&r2=1005776&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/download.apt.vm (original)
+++ maven/site/trunk/src/site/apt/download.apt.vm Fri Oct  8 11:17:32 2010
@@ -30,7 +30,9 @@ John Casey
 
 Download Maven ${currentStableVersion}
 
-   Maven is distributed in several formats for your convenience.
+   Maven is distributed in several formats for your convenience. Use a source archive if
you intend to build Maven
+   yourself. Otherwise, simply pick a ready-made binary distribution and follow the installation
instructions given
+   at the end of this document.
 
    You will be prompted for a mirror - if the file is not found on yours, please be patient,
as it may take 24
    hours to reach all mirrors.
@@ -44,14 +46,17 @@ Download Maven ${currentStableVersion}
 
    We <<strongly>> encourage our users to configure a Maven repository mirror
closer to their location, please read {{{./guides/mini/guide-mirror-settings.html} How to
Use Mirrors for Repositories}}.
 
+   Be sure to check the
+   {{{http://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html} compatibility notes}}
+   before using this version to avoid surprises. While Maven 3 aims to be backward-compatible
with Maven 2.x to the
+   extent possible, there are still a few significant changes.
+
 *-------------------------+---------+----------+-----------+
 |                         | Mirrors | Checksum | Signature |
 *-------------------------+---------+----------+-----------+
-| Maven ${currentStableVersion} (tar.bz2)     | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-${currentStableVersion}-bin.tar.bz2}
apache-maven-${currentStableVersion}-bin.tar.bz2}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentStableVersion}-bin.tar.bz2.md5}
apache-maven-${currentStableVersion}-bin.tar.bz2.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentStableVersion}-bin.tar.bz2.asc}
apache-maven-${currentStableVersion}-bin.tar.bz2.asc}} |
-*-------------------------+---------+----------+-----------+
-| Maven ${currentStableVersion} (tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-${currentStableVersion}-bin.tar.gz}
apache-maven-${currentStableVersion}-bin.tar.gz}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentStableVersion}-bin.tar.gz.md5}
apache-maven-${currentStableVersion}-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentStableVersion}-bin.tar.gz.asc}
apache-maven-${currentStableVersion}-bin.tar.gz.asc}} |
+| Maven ${currentStableVersion} (Binary tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-${currentStableVersion}-bin.tar.gz}
apache-maven-${currentStableVersion}-bin.tar.gz}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentStableVersion}-bin.tar.gz.md5}
apache-maven-${currentStableVersion}-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentStableVersion}-bin.tar.gz.asc}
apache-maven-${currentStableVersion}-bin.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| Maven ${currentStableVersion} (zip)         | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-${currentStableVersion}-bin.zip}
apache-maven-${currentStableVersion}-bin.zip}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentStableVersion}-bin.zip.md5}
apache-maven-${currentStableVersion}-bin.zip.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentStableVersion}-bin.zip.asc}
apache-maven-${currentStableVersion}-bin.zip.asc}} |
+| Maven ${currentStableVersion} (Binary zip)         | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-${currentStableVersion}-bin.zip}
apache-maven-${currentStableVersion}-bin.zip}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentStableVersion}-bin.zip.md5}
apache-maven-${currentStableVersion}-bin.zip.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentStableVersion}-bin.zip.asc}
apache-maven-${currentStableVersion}-bin.zip.asc}} |
 *-------------------------+---------+----------+-----------+
 | Maven ${currentStableVersion} (Source tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi/maven/source/apache-maven-${currentStableVersion}-src.tar.gz}
apache-maven-${currentStableVersion}-src.tar.gz}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${currentStableVersion}-src.tar.gz.md5}
apache-maven-${currentStableVersion}-src.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${currentStableVersion}-src.tar.gz.asc}
apache-maven-${currentStableVersion}-src.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
@@ -64,44 +69,44 @@ Download Maven ${currentStableVersion}
 
   You can also download the current documentation, i.e. this website, as a {{{Maven_Documentation}JAR
or PDF}}.
 
-* {Maven ${current20xVersion}}
+* {Maven ${current22xVersion}}
 
-  This is an older, but stable version of Maven for projects that require Maven to run on
JDK 1.4.
+  This is an older, but stable version of Maven for projects that can't upgrade to Maven
3.x yet.
 
 *-------------------------+---------+----------+-----------+
 |                         | Mirrors | Checksum | Signature |
 *-------------------------+---------+----------+-----------+
-| Maven ${current20xVersion} (tar.bz2)     | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-${current20xVersion}-bin.tar.bz2}
apache-maven-${current20xVersion}-bin.tar.bz2}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current20xVersion}-bin.tar.bz2.md5}
apache-maven-${current20xVersion}-bin.tar.bz2.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current20xVersion}-bin.tar.bz2.asc}
apache-maven-${current20xVersion}-bin.tar.bz2.asc}} |
+| Maven ${current22xVersion} (Binary tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-${current22xVersion}-bin.tar.gz}
apache-maven-${current22xVersion}-bin.tar.gz}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current22xVersion}-bin.tar.gz.md5}
apache-maven-${current22xVersion}-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current22xVersion}-bin.tar.gz.asc}
apache-maven-${current22xVersion}-bin.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| Maven ${current20xVersion} (tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi?path=/maven/binaries/apache-maven-${current20xVersion}-bin.tar.gz}
apache-maven-${current20xVersion}-bin.tar.gz}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current20xVersion}-bin.tar.gz.md5}
apache-maven-${current20xVersion}-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current20xVersion}-bin.tar.gz.asc}
apache-maven-${current20xVersion}-bin.tar.gz.asc}} |
+| Maven ${current22xVersion} (Binary zip)         | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-${current22xVersion}-bin.zip}
apache-maven-${current22xVersion}-bin.zip}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current22xVersion}-bin.zip.md5}
apache-maven-${current22xVersion}-bin.zip.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current22xVersion}-bin.zip.asc}
apache-maven-${current22xVersion}-bin.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| Maven ${current20xVersion} (zip)         | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-${current20xVersion}-bin.zip}
apache-maven-${current20xVersion}-bin.zip}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current20xVersion}-bin.zip.md5}
apache-maven-${current20xVersion}-bin.zip.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current20xVersion}-bin.zip.asc}
apache-maven-${current20xVersion}-bin.zip.asc}} |
+| Maven ${current22xVersion} (Source tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi/maven/source/apache-maven-${current22xVersion}-src.tar.gz}
apache-maven-${current22xVersion}-src.tar.gz}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${current22xVersion}-src.tar.gz.md5}
apache-maven-${current22xVersion}-src.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${current22xVersion}-src.tar.gz.asc}
apache-maven-${current22xVersion}-src.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| Release Notes           | {{{./docs/${current20xVersion}/release-notes.html} ${current20xVersion}}}
| | |
+| Maven ${current22xVersion} (Source zip)         | {{{http://www.apache.org/dyn/closer.cgi/maven/source/apache-maven-${current22xVersion}-src.zip}
apache-maven-${current22xVersion}-src.zip}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${current22xVersion}-src.zip.md5}
apache-maven-${current22xVersion}-src.zip.md5}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${current22xVersion}-src.zip.asc}
apache-maven-${current22xVersion}-src.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| Release Reference Documentation | {{{./ref/${current20xVersion}/} ${current20xVersion}}}
| | |
+| Release Notes           | {{{./docs/${current22xVersion}/release-notes.html} ${current22xVersion}}}
| | |
+*-------------------------+---------+----------+-----------+
+| Release Reference Documentation | {{{./ref/${current22xVersion}/} ${current22xVersion}}}
| | |
 *-------------------------+---------+----------+-----------+
 
-* {Maven ${currentDevelopmentVersion}}
+* {Maven ${current20xVersion}}
 
-  Unstable preview releases of Maven 3 are also available. You should check the
-  {{{http://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html} compatibility notes}}
-  before using this version.
+  This is an older, but stable version of Maven for projects that require Maven to run on
JDK 1.4.
 
 *-------------------------+---------+----------+-----------+
 |                         | Mirrors | Checksum | Signature |
 *-------------------------+---------+----------+-----------+
-| Maven ${currentDevelopmentVersion} (tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi?path=/maven/binaries/apache-maven-${currentDevelopmentVersion}-bin.tar.gz}
apache-maven-${currentDevelopmentVersion}-bin.tar.gz}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentDevelopmentVersion}-bin.tar.gz.md5}
apache-maven-${currentDevelopmentVersion}-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentDevelopmentVersion}-bin.tar.gz.asc}
apache-maven-${currentDevelopmentVersion}-bin.tar.gz.asc}} |
+| Maven ${current20xVersion} (Binary tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-${current20xVersion}-bin.tar.gz}
apache-maven-${current20xVersion}-bin.tar.gz}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current20xVersion}-bin.tar.gz.md5}
apache-maven-${current20xVersion}-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current20xVersion}-bin.tar.gz.asc}
apache-maven-${current20xVersion}-bin.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| Maven ${currentDevelopmentVersion} (zip)         | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-${currentDevelopmentVersion}-bin.zip}
apache-maven-${currentDevelopmentVersion}-bin.zip}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentDevelopmentVersion}-bin.zip.md5}
apache-maven-${currentDevelopmentVersion}-bin.zip.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${currentDevelopmentVersion}-bin.zip.asc}
apache-maven-${currentDevelopmentVersion}-bin.zip.asc}} |
+| Maven ${current20xVersion} (Binary zip)         | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-${current20xVersion}-bin.zip}
apache-maven-${current20xVersion}-bin.zip}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current20xVersion}-bin.zip.md5}
apache-maven-${current20xVersion}-bin.zip.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-maven-${current20xVersion}-bin.zip.asc}
apache-maven-${current20xVersion}-bin.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| Maven ${currentDevelopmentVersion} (Source tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi?path=/maven/source/apache-maven-${currentDevelopmentVersion}-src.tar.gz}
apache-maven-${currentDevelopmentVersion}-src.tar.gz}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${currentDevelopmentVersion}-src.tar.gz.md5}
apache-maven-${currentDevelopmentVersion}-src.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${currentDevelopmentVersion}-src.tar.gz.asc}
apache-maven-${currentDevelopmentVersion}-src.tar.gz.asc}} |
+| Maven ${current20xVersion} (Source tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi/maven/source/apache-maven-${current20xVersion}-src.tar.gz}
apache-maven-${current20xVersion}-src.tar.gz}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${current20xVersion}-src.tar.gz.md5}
apache-maven-${current20xVersion}-src.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${current20xVersion}-src.tar.gz.asc}
apache-maven-${current20xVersion}-src.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| Maven ${currentDevelopmentVersion} (Source zip)         | {{{http://www.apache.org/dyn/closer.cgi/maven/source/apache-maven-${currentDevelopmentVersion}-src.zip}
apache-maven-${currentDevelopmentVersion}-src.zip}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${currentDevelopmentVersion}-src.zip.md5}
apache-maven-${currentDevelopmentVersion}-src.zip.md5}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${currentDevelopmentVersion}-src.zip.asc}
apache-maven-${currentDevelopmentVersion}-src.zip.asc}} |
+| Maven ${current20xVersion} (Source zip)         | {{{http://www.apache.org/dyn/closer.cgi/maven/source/apache-maven-${current20xVersion}-src.zip}
apache-maven-${current20xVersion}-src.zip}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${current20xVersion}-src.zip.md5}
apache-maven-${current20xVersion}-src.zip.md5}} | {{{http://www.apache.org/dist/maven/source/apache-maven-${current20xVersion}-src.zip.asc}
apache-maven-${current20xVersion}-src.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| Release Notes           | {{{./docs/${currentDevelopmentVersion}/release-notes.html} ${currentDevelopmentVersion}}}
| | |
+| Release Notes           | {{{./docs/${current20xVersion}/release-notes.html} ${current20xVersion}}}
| | |
 *-------------------------+---------+----------+-----------+
-| Release Reference Documentation | {{{./ref/${currentDevelopmentVersion}/} ${currentDevelopmentVersion}}}
| | |
+| Release Reference Documentation | {{{./ref/${current20xVersion}/} ${current20xVersion}}}
| | |
 *-------------------------+---------+----------+-----------+
 
 * {Maven Documentation}

Modified: maven/site/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/site.xml?rev=1005776&r1=1005775&r2=1005776&view=diff
==============================================================================
--- maven/site/trunk/src/site/site.xml (original)
+++ maven/site/trunk/src/site/site.xml Fri Oct  8 11:17:32 2010
@@ -38,6 +38,7 @@ under the License.
     <menu name="Get Maven">
       <item name="Download" href="/download.html"/>
       <item name="Release Notes (${currentStableVersion})" href="/docs/${currentStableVersion}/release-notes.html"/>
+      <item name="Release Notes (${current22xVersion})" href="/docs/${current22xVersion}/release-notes.html"/>
       <item name="Release Notes (${current20xVersion})" href="/docs/${current20xVersion}/release-notes.html"/>
       <item name="License" href="/license.html"/>
     </menu>

Modified: maven/site/trunk/src/site/xdoc/index.xml.vm
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/xdoc/index.xml.vm?rev=1005776&r1=1005775&r2=1005776&view=diff
==============================================================================
--- maven/site/trunk/src/site/xdoc/index.xml.vm (original)
+++ maven/site/trunk/src/site/xdoc/index.xml.vm Fri Oct  8 11:17:32 2010
@@ -37,21 +37,6 @@ under the License.
 </form>
 <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_006660305041243700248%3Ahyqtfwsewpm"></script>
 <!-- Google CSE Search Box Ends -->
-      <h5>Try Maven 3.x </h5>
-      <span style="display: block; text-align: right; font-size: smaller">Released:
${currentDevelopmentReleaseDate}</span>
-      <p>Maven 3.0 is coming soon, so try out the latest release and be sure to provide
feedback.</p>
-	  <p>
-        <a href="download.html">
-          <img src="images/folder-open.gif" border="0" alt="" title="Download Maven ${currentDevelopmentVersion}"/>
-          Maven ${currentDevelopmentVersion}
-        </a>
-        <span style="font-size: smaller">
-          <br/>
-          <a href="docs/${currentDevelopmentVersion}/release-notes.html">Release Notes</a>,
-          <a href="download.html#Requirements">System Requirements</a>,
-          <a href="download.html#Installation">Installation Instructions</a>
-        </span>
-      </p>	  
       <h5>Get Maven ${currentStableVersion}</h5>
       <span style="display: block; text-align: right; font-size: smaller">Released:
${currentStableReleaseDate}</span>
       <p>



Mime
View raw message