brett 2004/07/22 21:52:09
Modified: . project.xml
src/java/org/apache/maven MavenUtils.java
xdocs changes.xml index.xml navigation-pdf.xml
navigation.xml status.xml
xdocs/reference user-guide.xml
xdocs/start download.xml install.xml
Added: xdocs/start release-notes-1.0.xml
Log:
merge up to MAVEN-1_0-BRANCH-merge-4
(wanted to get all the doco from post 1.0 so that doco can be released
from CVS HEAD)
Revision Changes Path
1.336 +1 -0 maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/project.xml,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- project.xml 23 Jul 2004 04:40:03 -0000 1.335
+++ project.xml 23 Jul 2004 04:52:09 -0000 1.336
@@ -817,6 +817,7 @@
<report>maven-javadoc-plugin</report>
<report>maven-jxr-plugin</report>
<report>maven-junit-report-plugin</report>
+ <report>maven-license-plugin</report>
<report>maven-tasklist-plugin</report>
<report>maven-pmd-plugin</report>
<report>maven-simian-plugin</report>
1.113 +1 -2 maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- MavenUtils.java 23 Jul 2004 04:40:04 -0000 1.112
+++ MavenUtils.java 23 Jul 2004 04:52:09 -0000 1.113
@@ -72,7 +72,6 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
- * @version $Id$
*
* @todo Remove all the context creation code and make a ContextBuilder class.
* @todo [RC2] split getProject (project.properties + defaults) != getPluginProject
(plugin.properties only)
@@ -205,7 +204,7 @@
}
catch (Exception e)
{
- throw new MavenException("Error parsing project.xml '" +
projectDescriptor.getAbsolutePath() + "'");
+ throw new MavenException("Error parsing project.xml '" +
projectDescriptor.getAbsolutePath() + "'", e);
}
// 2)
1.26 +3 -0 maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/changes.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- changes.xml 23 Jul 2004 04:40:07 -0000 1.25
+++ changes.xml 23 Jul 2004 04:52:09 -0000 1.26
@@ -49,6 +49,9 @@
</action>
</release>
+ <release version="1.0.1-SNAPSHOT" date="in CVS">
+ <action dev="dion" type="add" issue="MAVEN-1382">Add license report to web
site</action>
+ </release>
<release version="1.0" date="2004-07-13">
<action dev="brett" type="add">Bundle the Jelly XML tag library for build and
for plugin's convenience</action>
<action dev="brett" type="fix" issue="MAVEN-1296" due-to="Eric Lapierre">Fix
property inheritence under some circumstances</action>
1.13 +7 -0 maven/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/index.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- index.xml 23 Mar 2004 02:18:31 -0000 1.12
+++ index.xml 23 Jul 2004 04:52:09 -0000 1.13
@@ -27,6 +27,13 @@
<body>
+ <section name="Maven 1.0 Released - 13 July 2004">
+ <p>Maven 1.0 has been released.<br/> <a href="start/download.html">Download</a>
|
+ <a href="start/install.html">Installation Instructions</a> |
+ <a href="start/release-notes-1.0.html">Release Notes</a>
+ </p>
+ </section>
+
<section name="Maven">
<p>
Maven is a Java project management and project comprehension tool. Maven
1.8 +1 -1 maven/xdocs/navigation-pdf.xml
Index: navigation-pdf.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/navigation-pdf.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation-pdf.xml 23 Jul 2004 04:40:07 -0000 1.7
+++ navigation-pdf.xml 23 Jul 2004 04:52:09 -0000 1.8
@@ -34,7 +34,7 @@
<item name="Install" href="/start/install.html"/>
<item name="Integrate" href="/start/integrate.html"/>
<item name="Use" href="/start/use.html"/>
- <item name="Release Notes" href="/start/release-notes-rc4.html"/>
+ <item name="Release Notes" href="/start/release-notes-1.0.html"/>
<item name="Build" href="/start/bootstrap.html"/>
<item name="Anakia Users" href="/start/anakia.html"/>
</menu>
1.44 +1 -1 maven/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/navigation.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- navigation.xml 23 Jul 2004 04:40:07 -0000 1.43
+++ navigation.xml 23 Jul 2004 04:52:09 -0000 1.44
@@ -44,7 +44,7 @@
<item name="Install" href="/start/install.html"/>
<item name="Integrate" href="/start/integrate.html"/>
<item name="Use" href="/start/use.html"/>
- <item name="Release Notes" href="/start/release-notes-rc4.html"/>
+ <item name="Release Notes" href="/start/release-notes-1.0.html"/>
<item name="Build" href="/start/bootstrap.html"/>
<item name="Anakia Users" href="/start/anakia.html"/>
</item>
1.21 +7 -0 maven/xdocs/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/status.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- status.xml 22 Jul 2004 16:28:27 -0000 1.20
+++ status.xml 23 Jul 2004 04:52:09 -0000 1.21
@@ -41,6 +41,13 @@
</p>
</subsection>
+ <subsection name="13 July 2004 - Maven 1.0 released!">
+ <p>
+ See the <a href="start/release-notes-1.0.html">Release Notes</a> for more
+ information.
+ </p>
+ </subsection>
+
<subsection name="29 June 2004 - Maven 1.0 RC4 released!">
<p>
See the <a href="start/release-notes-rc4.html">Release Notes</a> for more
1.70 +2 -2 maven/xdocs/reference/user-guide.xml
Index: user-guide.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/reference/user-guide.xml,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- user-guide.xml 22 Jul 2004 16:28:26 -0000 1.69
+++ user-guide.xml 23 Jul 2004 04:52:09 -0000 1.70
@@ -202,7 +202,7 @@
<extend>parent-project.xml</extend>
<groupId>super-extendo</groupId>
- <artifactId>super-extendo<artifactId>
+ <artifactId>super-extendo</artifactId>
<name>Super Extendo</name>
<build>
@@ -1066,7 +1066,7 @@
<dependency>
<groupId>commons-jelly</groupId>
- <artifactId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
<version>SNAPSHOT</version>
</dependency>
1.24 +9 -6 maven/xdocs/start/download.xml
Index: download.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/start/download.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- download.xml 28 Jun 2004 15:09:19 -0000 1.23
+++ download.xml 23 Jul 2004 04:52:09 -0000 1.24
@@ -34,17 +34,20 @@
</p>
<p>
- The current release is 1.0-rc4. Below are the links to the latest release
in various formats
+ The current release is 1.0. Below are the links to the latest release in
various formats
</p>
<ul>
- <li><a href="release-notes-rc4.html">Release Notes</a></li>
- <li><a
href="http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-1.0-rc4.exe";>Windows
.exe</a></li>
- <li><a
href="http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-1.0-rc4.tar.bz2";>.tar.bz2
file</a></li>
- <li><a
href="http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-1.0-rc4.tar.gz";>.tar.gz
file</a></li>
- <li><a
href="http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-1.0-rc4.zip";>.zip
file</a></li>
+ <li><a href="release-notes-1.0.html">Release Notes</a></li>
+ <li><a
href="http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-1.0.exe";>Windows
.exe</a></li>
+ <li><a
href="http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-1.0.tar.bz2";>.tar.bz2
file</a></li>
+ <li><a
href="http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-1.0.tar.gz";>.tar.gz
file</a></li>
+ <li><a
href="http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-1.0.zip";>.zip
file</a></li>
</ul>
+ <p>
+ Seed repository: <a
href="http://www.apache.org/dyn/closer.cgi/maven/binaries/seed-repo-maven-1.0.tar.gz";>seed-maven-1.0.tar.gz
file</a>
+ </p>
</section>
</body>
</document>
1.20 +8 -2 maven/xdocs/start/install.xml
Index: install.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/start/install.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- install.xml 22 Jul 2004 16:28:27 -0000 1.19
+++ install.xml 23 Jul 2004 04:52:09 -0000 1.20
@@ -38,7 +38,7 @@
The downloaded install archive contains everything required to run
Maven on your system. The install archive has a single top-level
directory named <code>maven-VERSION</code>, where VERSION is the version
- downloaded (eg. 1.0-rc1). This directory contains all the
+ downloaded (eg. 1.0). This directory contains all the
Maven related files beneath that. You can now unpack the install
archive.
</p>
@@ -81,7 +81,13 @@
</p>
<p>
- Verify that your <code>MAVEN_HOME</code> environment variable points to
+ If you have downloaded the seed repository, you should extract it under the
repository directory
+ created in the step above (eg <code>$HOME/.maven/repository</code>). This
will allow you to run
+ Maven offline and successfully run the jar, site and related goals.
+ </p>
+
+ <p>
+ Next, verify that your <code>MAVEN_HOME</code> environment variable points
to
the correct location. In the top-level directory of
<code>MAVEN_HOME</code>, you should see the following
structure:
1.2 +88 -0 maven/xdocs/start/release-notes-1.0.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
