You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/10/07 18:28:06 UTC
svn commit: r1005514 - in /maven/site/branches/m3: ./ 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
Author: bentmann
Date: Thu Oct 7 16:28:05 2010
New Revision: 1005514
URL: http://svn.apache.org/viewvc?rev=1005514&view=rev
Log:
o Parked updated site for 3.0 release
Added:
maven/site/branches/m3/ (props changed)
- copied from r1005485, maven/site/trunk/
maven/site/branches/m3/src/site/apt/docs/3.0/
- copied from r1005485, maven/site/trunk/src/site/apt/docs/3.0-beta-3/
Modified:
maven/site/branches/m3/pom.xml
maven/site/branches/m3/src/site/apt/docs/3.0/release-notes.apt.vm
maven/site/branches/m3/src/site/apt/docs/3.0/release-notes.txt
maven/site/branches/m3/src/site/apt/download.apt.vm
maven/site/branches/m3/src/site/site.xml
maven/site/branches/m3/src/site/xdoc/index.xml.vm
Propchange: maven/site/branches/m3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 7 16:28:05 2010
@@ -0,0 +1,10 @@
+.wtpmodules
+target
+*~
+*.log
+.classpath
+.project
+*.ipr
+*.iws
+*.iml
+.settings
Propchange: maven/site/branches/m3/
------------------------------------------------------------------------------
svn:mergeinfo = /maven/site/branches/release-presentation:835679-881149
Modified: maven/site/branches/m3/pom.xml
URL: http://svn.apache.org/viewvc/maven/site/branches/m3/pom.xml?rev=1005514&r1=1005485&r2=1005514&view=diff
==============================================================================
--- maven/site/branches/m3/pom.xml (original)
+++ maven/site/branches/m3/pom.xml Thu Oct 7 16:28:05 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>7 September 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/branches/m3/src/site/apt/docs/3.0/release-notes.apt.vm
URL: http://svn.apache.org/viewvc/maven/site/branches/m3/src/site/apt/docs/3.0/release-notes.apt.vm?rev=1005514&r1=1005485&r2=1005514&view=diff
==============================================================================
--- maven/site/branches/m3/src/site/apt/docs/3.0/release-notes.apt.vm (original)
+++ maven/site/branches/m3/src/site/apt/docs/3.0/release-notes.apt.vm Thu Oct 7 16:28:05 2010
@@ -1,5 +1,5 @@
------
-Release Notes - Maven 3.0-beta-3
+Release Notes - Maven 3.0
------
Brett Porter
------
@@ -26,11 +26,11 @@ Brett Porter
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Maven 3.0-beta-3
+Maven 3.0
- The Apache Maven team would like to announce the release of Maven 3.0-beta-3.
+ The Apache Maven team would like to announce the release of Maven 3.0.
- Maven 3.0-beta-3 is {{{../../download.html} available for download}} from the 'preview' section.
+ Maven 3.0 is {{{../../download.html} available for download}}.
Maven is a software project management and comprehension tool. Based on the concept of a project object model
(POM), Maven can manage a project's build, reporting and documentation from a central place.
Modified: maven/site/branches/m3/src/site/apt/docs/3.0/release-notes.txt
URL: http://svn.apache.org/viewvc/maven/site/branches/m3/src/site/apt/docs/3.0/release-notes.txt?rev=1005514&r1=1005485&r2=1005514&view=diff
==============================================================================
--- maven/site/branches/m3/src/site/apt/docs/3.0/release-notes.txt (original)
+++ maven/site/branches/m3/src/site/apt/docs/3.0/release-notes.txt Thu Oct 7 16:28:05 2010
@@ -1,4 +1,4 @@
-* Maven 3.0-beta-3 Release Notes
+* Maven 3.0 Release Notes
Maven 3 aims to ensure backward compatibility to the extent possible, improve usability, increase performance,
allow safe embedding, and pave the way to implement many highly demanded features.
@@ -7,60 +7,86 @@
{{{https://cwiki.apache.org/confluence/display/MAVEN/Parallel+builds+in+Maven+3} Guide on Parallel Builds}}
to learn about potential ramifications.
- The full list of changes can be found in our {{{http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10500&version=16681}issue management system}}, and is reproduced below.
+ The full list of changes can be found in our {{{http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10500&version=13142}issue management system}}, and is reproduced below.
** Known Incompatibilities with Maven 2
Please refer to the following {{{http://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html} compatibility notes}}
before reporting any issues regarding changed build behavior in Maven 3.
- Before reporting any new bugs, please also double-check for any duplicates with
- {{{http://jira.codehaus.org/secure/IssueNavigator!executeAdvanced.jspa?jqlQuery=project+%3D+MNG+AND+affectedVersion+%3D+%223.0-beta-3%22&runQuery=true&clear=true}already known bugs in Maven 3.0-beta-3}}.
-
-** Release Notes - Maven - Version 3.0-beta-3 (since 3.0-beta-2 only)
+** Release Notes - Maven - Version 3.0 (since 3.0-beta-3 only)
** Bug
- * [MNG-2686] - POM dependency scope auto-downgrades from provided to test
+ * [MNG-4592] - Snapshot artifacts that could not be downloaded due to communication problems are "blacklisted" for a day by default.
+
+ * [MNG-4751] - Snapshot version not resolved for version range
+
+ * [MNG-4785] - NPE in dependency resolution code for TC plugin
+
+ * [MNG-4786] - [regression] Ant-based mojo using maven-script-ant:2.1.0+ cause NPE
- * [MNG-4690] - Transitive dependency lost when included another dependency
+ * [MNG-4788] - [regression] Appassembler Maven Plugin doesn't work like as it should
- * [MNG-4745] - [regression] Maven does not check for plugin updates, even if forced via -U
+ * [MNG-4789] - [regression] Difference in compile scope dependency resolution
- * [MNG-4755] - Version ranges cannot be resolved against mirror if a local artifact is present
+ * [MNG-4791] - [regression] POM artifacts passed into MavenProjectBuilder.buildFromRepository() are no longer resolved
- * [MNG-4761] - Plugin-level dependency scope causes some plugin classpaths to be incorrect
+ * [MNG-4793] - Unable to obtain archiver for extension 'zip'
- * [MNG-4765] - Failing to determine java version for profile....
+ * [MNG-4794] - 'org.apache.maven.plugins:maven-install-plugin:2.3.1'. A required class is missing: org.codehaus.plexus.digest.Digester
- * [MNG-4767] - Regression in parsing command-line arguments including variables
+ * [MNG-4795] - [regression] Dependencies in forked reactor projects are not resolved when aggregator bound to lifecycle forks
- * [MNG-4768] - Depending on declaration order, nearest matching version does not win when version range is involved in conflict
+ * [MNG-4800] - Conflict resolution does not pick sub tree of nearest dependency if farther conflicting dependency has wider scope
- * [MNG-4769] - Regression: <enabled> flag for central cannot be overriden
+ * [MNG-4810] - Maven cannot build if loaded in a classloader that is not backed by a real JAR file / classpath
- * [MNG-4771] - [regression] Plugin prefix resolution ignores enabled flags on repository
+ * [MNG-4811] - Custom Maven Plugin regression in Maven 3.x, custom ComponentConfigurator causes infinite loop
- * [MNG-4772] - [regression] Plugin version resolution ignores enabled flags on repository
+ * [MNG-4814] - Eary dependency resolution attempts for reactor projects prevent their later resolution from the reactor
- * [MNG-4773] - Stack trace printed from MavenProject.getParent
+ * [MNG-4818] - NPE in legacy.DefaultWagonManager.getArtifact
- * [MNG-4775] - Outdated NOTICE.txt
+ * [MNG-4829] - [regression] Checksum failures aren't logged
- * [MNG-4776] - NPE during build from parent but not from child
+ * [MNG-4832] - Maven 3 Regression: Missing constructor of org.codehaus.plexus.component.configurator.converters.special.ClassRealmConverter
- * [MNG-4779] - NullPointerException thrown during dependency resolution when dependency with range occurs more than once in the dirty tree
+ * [MNG-4834] - [regression] MavenProject.getParent() ignores configured repositories
- * [MNG-4781] - Can't deploy to Nexus staging repository
+ * [MNG-4836] - Incorrect recursive expression cycle errors (update plexus-interpolation)
+
+ * [MNG-4837] - Interpolation error due to cyclic expression for one of the POM coordinates gets needlessly repeated
+
+ * [MNG-4842] - [regression] Repositories discovered in dependency POMs override repositories configured for original resolution request of POM
+
+ * [MNG-4845] - [regression] MavenProject.getDependencyArtifact() returns artifacts without version for dependency with version range
** Improvement
- * [MNG-4749] - Move from Plexus to Guice as IoC container
+ * [MNG-4452] - Metadata for snapshots should include classifier
+
+ * [MNG-4787] - Allow class realm manager delegates to alter public part of Maven core realm
- * [MNG-4782] - Automatically dump stack trace in case of internal Maven error
+ * [MNG-4815] - (3.0-RC1) Maven Java API does not give nice error messages when improperly configured
+
+ * [MNG-4824] - multiple failures need additional whitespace
+
+ * [MNG-4825] - Relative path errors could be more explicit
** New Feature
- * [MNG-4756] - Aether integration
+ * [MNG-4484] - Create a Maven API for component configuration
+
+** Task
+
+ * [MNG-4805] - Update default plugin versions used for built-in lifecycle mappings
+
+ * [MNG-4807] - Extend core artifact filter to exclude relocated Guice-based Plexus shim
+
+
+** Wish
+
+ * [MNG-4796] - add a warning when profiles.xml is used (Maven 2) or detected (Maven 3)
Modified: maven/site/branches/m3/src/site/apt/download.apt.vm
URL: http://svn.apache.org/viewvc/maven/site/branches/m3/src/site/apt/download.apt.vm?rev=1005514&r1=1005485&r2=1005514&view=diff
==============================================================================
--- maven/site/branches/m3/src/site/apt/download.apt.vm (original)
+++ maven/site/branches/m3/src/site/apt/download.apt.vm Thu Oct 7 16:28:05 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/branches/m3/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/site/branches/m3/src/site/site.xml?rev=1005514&r1=1005485&r2=1005514&view=diff
==============================================================================
--- maven/site/branches/m3/src/site/site.xml (original)
+++ maven/site/branches/m3/src/site/site.xml Thu Oct 7 16:28:05 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/branches/m3/src/site/xdoc/index.xml.vm
URL: http://svn.apache.org/viewvc/maven/site/branches/m3/src/site/xdoc/index.xml.vm?rev=1005514&r1=1005485&r2=1005514&view=diff
==============================================================================
--- maven/site/branches/m3/src/site/xdoc/index.xml.vm (original)
+++ maven/site/branches/m3/src/site/xdoc/index.xml.vm Thu Oct 7 16:28:05 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>