You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2003/11/12 11:28:01 UTC
cvs commit: maven/xdocs/start download.xml integrate.xml
brett 2003/11/12 02:28:01
Modified: src/plugins-build/jar Tag: MAVEN_RC2_UNSTABLE plugin.jelly
project.xml
src/plugins-build/jar/xdocs/current Tag: MAVEN_RC2_UNSTABLE
changes.xml
src/plugins-build/multiproject Tag: MAVEN_RC2_UNSTABLE
plugin.jelly
xdocs/misc Tag: MAVEN_RC2_UNSTABLE powered.xml
xdocs/reference Tag: MAVEN_RC2_UNSTABLE
project-descriptor.xml
xdocs/reference/plugins Tag: MAVEN_RC2_UNSTABLE index.xml
xdocs/start Tag: MAVEN_RC2_UNSTABLE download.xml
integrate.xml
Log:
merge from HEAD, head tagged as MAVEN_RC2_UNSTABLE-merge-1
Revision Changes Path
No revision
No revision
1.22.2.1 +1 -1 maven/src/plugins-build/jar/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jar/plugin.jelly,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -r1.22 -r1.22.2.1
--- plugin.jelly 28 Oct 2003 22:19:58 -0000 1.22
+++ plugin.jelly 12 Nov 2003 10:28:00 -0000 1.22.2.1
@@ -53,7 +53,7 @@
<ant:attribute name="Implementation-Version" value="${pom.currentVersion}"/>
<ant:attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
<ant:attribute name="Implementation-Vendor-Id" value="${pom.organization.identifier}"/>
- <maven:pluginVar var="mainClass" plugin="maven-java-plugin" property="maven.jar.mainclass" />
+ <maven:pluginVar var="mainclass" plugin="maven-java-plugin" property="maven.jar.mainclass" />
<j:if test="${!empty(mainclass)}">
<ant:attribute name="Main-Class" value="${mainclass}"/>
</j:if>
1.14.2.1 +1 -1 maven/src/plugins-build/jar/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jar/project.xml,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- project.xml 29 Sep 2003 05:19:12 -0000 1.14
+++ project.xml 12 Nov 2003 10:28:00 -0000 1.14.2.1
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-jar-plugin</id>
<name>Maven Jar Plug-in</name>
- <currentVersion>1.3</currentVersion>
+ <currentVersion>1.4-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Create jar files</shortDescription>
<url>http://maven.apache.org/reference/plugins/jar/</url>
No revision
No revision
1.3.2.1 +4 -0 maven/src/plugins-build/jar/xdocs/current/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jar/xdocs/current/changes.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- changes.xml 29 Sep 2003 06:18:41 -0000 1.3
+++ changes.xml 12 Nov 2003 10:28:01 -0000 1.3.2.1
@@ -8,6 +8,10 @@
<body>
+ <release version="1.4" date="in CVS">
+ <action dev="dion" type="fix">Fix MAVEN-1009</action>
+ </release>
+
<release version="1.3" date="2003-09-29">
</release>
No revision
No revision
1.33.2.1 +1 -2 maven/src/plugins-build/multiproject/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/plugin.jelly,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -u -r1.33 -r1.33.2.1
--- plugin.jelly 8 Oct 2003 15:34:40 -0000 1.33
+++ plugin.jelly 12 Nov 2003 10:28:01 -0000 1.33.2.1
@@ -149,9 +149,8 @@
<mkdir dir="${file.parent}"/>
- <ant:echo>${file.parent} ${file.parent}</ant:echo>
- <ant:echo>create ${overviewPageCreate}</ant:echo>
<j:if test="${overviewPageCreate=='true'}">
+ <ant:echo>Creating overview page</ant:echo>
<j:set var="encoding" value="${maven.docs.outputencoding}"/>
<velocity:merge
name="${maven.gen.docs}/${overviewPageLink}.xml"
No revision
No revision
1.4.2.1 +11 -2 maven/xdocs/misc/powered.xml
Index: powered.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/misc/powered.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- powered.xml 2 Oct 2003 00:13:30 -0000 1.4
+++ powered.xml 12 Nov 2003 10:28:01 -0000 1.4.2.1
@@ -87,6 +87,13 @@
</td>
</tr>
<tr>
+ <td><a href="http://daoexamples.sourceforge.net/">DAO (Data Access Objects) Examples</a></td>
+ <td>
+ The daoexamples project provides example implementations of
+ the Data Access Object (DAO) design pattern.
+ </td>
+ </tr>
+ <tr>
<td><a href="http://displaytag.sourceforge.net/">DisplayTag</a></td>
<td>
The display tag library is an open source suite of custom tags that provide high level web
@@ -379,9 +386,11 @@
</td>
</tr>
<tr>
- <td><a href="http://jakarta.apache.org/turbine/torque/">Torque</a></td>
+ <td><a href="http://db.apache.org/torque/">Torque</a></td>
<td>
- A object-relational mapping tool that was decoupled from Turbine.
+ An object-relational mapping and model generation tool
+ that was originally developed as part of Turbine (and has
+ long since been decoupled).
</td>
</tr>
<tr>
No revision
No revision
1.28.2.1 +1 -1 maven/xdocs/reference/project-descriptor.xml
Index: project-descriptor.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/reference/project-descriptor.xml,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -r1.28 -r1.28.2.1
--- project-descriptor.xml 19 Sep 2003 13:44:34 -0000 1.28
+++ project-descriptor.xml 12 Nov 2003 10:28:01 -0000 1.28.2.1
@@ -702,7 +702,7 @@
<td>jar</td>
<td>
The name of jar file if it doesn't respect
- <code><artifactId>.<version>.jar pattern.</code></td>
+ <code><artifactId>-<version>.jar pattern.</code></td>
</tr>
<tr>
<td>type</td>
No revision
No revision
1.4.2.1 +8 -0 maven/xdocs/reference/plugins/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/reference/plugins/index.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- index.xml 22 Oct 2003 15:59:17 -0000 1.4
+++ index.xml 12 Nov 2003 10:28:01 -0000 1.4.2.1
@@ -100,6 +100,14 @@
</tr>
</table>
</subsection>
+ <subsection name="Plugins on the Cactus site">
+ <table>
+ <tr>
+ <td><a href="http://jakarta.apache.org/cactus/integration/maven/">Cactus plugin</a></td>
+ <td>Plugin for Cactus</td>
+ </tr>
+ </table>
+ </subsection>
</section>
<section name="IDE Plugin for Maven">
<table>
No revision
No revision
1.18.2.1 +10 -0 maven/xdocs/start/download.xml
Index: download.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/start/download.xml,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- download.xml 7 Oct 2003 06:53:49 -0000 1.18
+++ download.xml 12 Nov 2003 10:28:01 -0000 1.18.2.1
@@ -17,6 +17,16 @@
<a href="http://www.apache.org/dyn/closer.cgi/maven/binaries/">here</a>.
</p>
+ <p>
+ The current release is 1.0-rc1. Below are the links to the latest release in various formats
+ </p>
+
+ <ul>
+ <li><a href="http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-1.0-rc1.exe">Windows .exe</a></li>
+ <li><a href="http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-1.0-rc1.zip">.zip file</a></li>
+ <li><a href="http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-1.0-rc1.tar.gz">.tar.gz file</a></li>
+ </ul>
+
</section>
</body>
</document>
1.23.2.1 +6 -3 maven/xdocs/start/integrate.xml
Index: integrate.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/start/integrate.xml,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- integrate.xml 21 Aug 2003 08:19:06 -0000 1.23
+++ integrate.xml 12 Nov 2003 10:28:01 -0000 1.23.2.1
@@ -169,13 +169,15 @@
<dependencies>
<dependency>
- <id>dom4j</id>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
<version>1.3</version>
<url>http://www.dom4j.org/</url>
</dependency>
<dependency>
- <id>bcel</id>
+ <groupId>bcel</groupId>
+ <artifactId>bcel</artifactId>
<version>5.0</version>
<url>http://jakarta.apache.org/bcel/</url>
</dependency>
@@ -185,7 +187,8 @@
.
<dependency>
- <id>regexp</id>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
<version>1.2</version>
<url>http://jakarta.apache.org/regexp/</url>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org