diff --git a/maven-site/src/site/fml/about.fml b/maven-site/src/site/fml/about.fml index e65a0816dc..1003be60a6 100644 --- a/maven-site/src/site/fml/about.fml +++ b/maven-site/src/site/fml/about.fml @@ -83,15 +83,19 @@ - What does Technology Preview mean? + What does beta release mean?

- While Maven 2.0 is quite useful as is, it does not yet have all of the features of it's predecessor, and has - some limitations that may impede it's use on a day-to-day basis in your projects. + Maven 2.0 is now in beta testing. We believe it is equally functional to Maven 1.0, however there are still + some bugs and usabilities issues including documentation to be resolved.

- This release is being made available so that people who are interested in the future of Maven can take a - sneak peek, while those interested in becoming early adopters can get involved in the development and + While some minor features may be added, the key goal is to retain backwards compatibility so this will be + limited. +

+

+ This release is being made available so that people who are interested in using Maven 2 when it is released + can test and provide feedback, and those interested can get involved in the development and direction of the project.

@@ -106,11 +110,11 @@ How often will Maven 2.0 be released?

- We are working to a 4-5 week release cycle, meaning that there will be at least one release per month. + We are working to a fortnightly release cycle until the final release.

- The first releases such as the technology preview will be designated "alpha" releases, indicating that - they are not yet feature complete and there are outstanding bugs. Following that, "beta" releases will be + The first releases such as the technology preview were designated "alpha" releases, indicating that + they were not yet feature complete and there were outstanding bugs. Following that, "beta" releases are being made available where introduction of new features will be restricted and the focus on improving usability and stability. Finally, one or more release candidates will be distributed for testing that are genuinely believed to be final, with the expectation that a final release would be available shortly afterwards. @@ -209,10 +213,6 @@ Channel box).

-

- Please remember that it is a preview release, so please be patient with features that are not yet implemented, - and be prepared to do some research and to help out yourself wherever possible. -

diff --git a/maven-site/src/site/fml/maven1.fml b/maven-site/src/site/fml/maven1.fml index 4ad384c2af..24bb4df47c 100644 --- a/maven-site/src/site/fml/maven1.fml +++ b/maven-site/src/site/fml/maven1.fml @@ -11,48 +11,66 @@

@@ -65,19 +83,22 @@ The answer depends very much on on your circumstances, and in particular whether you are new to Maven or not.

- The simple answer is that we hope you'll try Maven 2.0, and use it if it works for you. However, it is a preview - release, so you can expect some features to be missing at this point and there may be unexpected bugs. - We'd hate for your first experience with Maven 2.0 to be a bad one - so if you are embarking on a big, complicated + The simple answer is that we hope you'll try Maven 2.0, and use it if it works for you. However, it is a beta + release, so you can expect some unexpected bugs. + We'd hate for your first experience with Maven 2.0 to be a bad one - so if you are embarking on a big, + complicated or mission critical project - we still recommend Maven 1.0.2 as the latest stable release.

- If you are already using Maven 1.0 - feel free to try out Maven 2.0, but it may be better to remain on an existing + If you are already using Maven 1.0 - feel free to try out Maven 2.0, but it may be better to remain on an + existing version that is working for you until you need the new features and it covers all of your needs.

If you do use Maven 1.0, and would like to upgrade in the future, you should carefully consider following some of the - Best Practices listed. These will make + Best Practices + listed. These will make your project a lot easier to migrate in the future.

@@ -85,14 +106,16 @@

@@ -125,29 +148,35 @@ - How do I write custom scripts without a maven.xml file? + How do I write custom scripts without a + maven.xml + file? + -

Taken from this post to the Maven User's List: +

Taken from + + this post to the Maven User's List + :

-Everything in m2 is a plugin so for doing any sort of custom work like -that you will need to make a plugin. This 1) greatly reduces the -complexity within m2 because we only deal with proper plugins. The -maven.xml file in m1 was a psuedo plugin essentially and greatly -complicated the internals and 2) it promotes the sharing of your work -right from the get go. To start with you'll probably write a plugin that -is only applicable to your specific requirements, or your team's work, -but you'll see people asking for some functionality and you'll go "hey, -I have something like that!" and hopefully people who have concrete -solutions will generalize their solutions so they can be shared with -others. That's what we're trying to encourage. + Everything in m2 is a plugin so for doing any sort of custom work like + that you will need to make a plugin. This 1) greatly reduces the + complexity within m2 because we only deal with proper plugins. The + maven.xml file in m1 was a psuedo plugin essentially and greatly + complicated the internals and 2) it promotes the sharing of your work + right from the get go. To start with you'll probably write a plugin that + is only applicable to your specific requirements, or your team's work, + but you'll see people asking for some functionality and you'll go "hey, + I have something like that!" and hopefully people who have concrete + solutions will generalize their solutions so they can be shared with + others. That's what we're trying to encourage.
-We estimate that there's a lot of work bound up in project's maven.xml -that is not being shared and we'd like to try and change that. We plan -to make it dead simple to share plugins and hopefully people can use -other project's plugins as a start for a plugin that they may need -themselves. + We estimate that there's a lot of work bound up in project's maven.xml + that is not being shared and we'd like to try and change that. We plan + to make it dead simple to share plugins and hopefully people can use + other project's plugins as a start for a plugin that they may need + themselves.
diff --git a/maven-site/src/site/xdoc/developers/developing-plugins-with-marmalade.xml b/maven-site/src/site/xdoc/developers/developing-plugins-with-marmalade.xml index d7134d669e..11f553e98c 100644 --- a/maven-site/src/site/xdoc/developers/developing-plugins-with-marmalade.xml +++ b/maven-site/src/site/xdoc/developers/developing-plugins-with-marmalade.xml @@ -27,10 +27,11 @@

- NOTE: Compare this tutorial to + NOTE: Compare this tutorial to Developing - Plugins from the Maven 1.0 website. Marmalade is meant to be quite similar to Jelly in its - syntax, so this process should be very familiar to Maven 1.0 plugin developers. + Plugins + from the Maven 1.0 website. Marmalade is meant to be quite similar to Jelly in its + syntax, so this process should be very familiar to Maven 1.0 plugin developers.