Re: site changes (was: svn commit: r524511)

Mon, 02 Apr 2007 06:05:24 -0700 


On 1 Apr 07, at 7:35 PM 1 Apr 07, Brett Porter wrote:
I couldn't build a correct site out of the box with these changes, due to:
- using the site plugin latest release (which is the default), I get ${currentVersion} and other stuff showing up as text - I tried to build the site plugin snapshot, but it doesn't compile due to out of date doxia snapshots
I'm now adding the site plugin snapshot to the site pom and deploying doxia snapshots.
I needed to deploy them, though CI should be taking care of this, and another great reason to have the snapshot repositories in by default. I should not, nor should anyone else, have to worry about this. Now when they are released we would have to remove those repositories to be accurate. This is a perfect example of why providing more defaults and fewer types of repositories is good. This just shouldn't happen with CI running and snapshot infrastructure. It's part of daily development using and not using snapshots. 

Jason.


- Brett

On 01/04/2007, at 12:20 PM, [EMAIL PROTECTED] wrote:


Author: jvanzyl
Date: Sat Mar 31 19:20:35 2007
New Revision: 524511

URL: http://svn.apache.org/viewvc?view=rev&rev=524511
Log:
o udating the down and release notes pages for the release

Added:
    maven/site/trunk/src/site/apt/download.apt
- copied, changed from r517783, maven/site/trunk/src/site/ apt/download.apt.template 
Removed:
    maven/site/trunk/src/site/apt/download.apt.template
Modified:
    maven/site/trunk/pom.xml
    maven/site/trunk/src/site/apt/pom.apt
    maven/site/trunk/src/site/apt/what-is-maven.apt

Modified: maven/site/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml? view=diff&rev=524511&r1=524510&r2=524511 ===================================================================== ========= 
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Sat Mar 31 19:20:35 2007
@@ -1,16 +1,24 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http:// maven.apache.org/maven-v4_0_0.xsd"> 
+  <!--
   <parent>
     <artifactId>maven-parent</artifactId>
     <groupId>org.apache.maven</groupId>
     <version>5</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
+  -->
+  <groupId>org.apache.maven</groupId>
+  <version>1.0</version>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-site</artifactId>
   <packaging>pom</packaging>
   <name>Maven Site</name>

+  <properties>
+    <currentVersion>2.0.6</currentVersion>
+  </properties>
+
   <reporting>
     <excludeDefaults>true</excludeDefaults>
     <plugins>
@@ -96,30 +104,4 @@
<archive>http://mail-archives.apache.org/mod_mbox/maven- notifications/</archive> 
     </mailingList>
   </mailingLists>
-
- <!-- TODO: temporary, remove once site plugin can filter during transformation --> 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <configuration>
-          <tasks>
- <copy tofile="src/site/apt/download.apt" file="src/ site/apt/download.apt.template" overwrite="true"> 
-              <filterset>
-                <filter token="project.version" value="2.0.5" />
-              </filterset>
-            </copy>
-          </tasks>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <phase>pre-site</phase>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 </project>
Copied: maven/site/trunk/src/site/apt/download.apt (from r517783, maven/site/trunk/src/site/apt/download.apt.template) URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/ download.apt?view=diff&rev=524511&p1=maven/site/trunk/src/site/apt/ download.apt.template&r1=517783&p2=maven/site/trunk/src/site/apt/ download.apt&r2=524511 ===================================================================== ========= 
--- maven/site/trunk/src/site/apt/download.apt.template (original)
+++ maven/site/trunk/src/site/apt/download.apt Sat Mar 31 19:20:35 2007 
@@ -1,5 +1,5 @@
  ------
-Download Maven @project.version@
+Download Maven $project.version
  ------
 Brett Porter
 Jason van Zyl
@@ -7,25 +7,25 @@
 4 October 2005
  ------

-Download Maven @project.version@
+Download Maven ${currentVersion}

   Maven is distributed in several formats for your convenience.
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.
- Maven @project.version@ is distributed under the {{{http:// maven.apache.org/license.html} Apache License, version 2.0}}. + Maven ${currentVersion} is distributed under the {{{http:// maven.apache.org/license.html} Apache License, version 2.0}}.
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}}. 

 *-------------------------+---------+----------+-----------+
 |                         | Mirrors | Checksum | Signature |
 *-------------------------+---------+----------+-----------+
-| Maven @project.version@ (tar.bz2) | {{{http:// www.apache.org/dyn/closer.cgi/maven/binaries/maven- @[EMAIL PROTECTED] [EMAIL PROTECTED]@- bin.tar.bz2}} | {{{http://www.apache.org/dist/maven/binaries/maven- @[EMAIL PROTECTED] [EMAIL PROTECTED]@- bin.tar.bz2.md5}} | {{{http://www.apache.org/dist/maven/binaries/ [EMAIL PROTECTED]@-bin.tar.bz2.asc} [EMAIL PROTECTED]@- bin.tar.bz2.asc}} | +| Maven ${currentVersion} (tar.bz2) | {{{http:// www.apache.org/dyn/closer.cgi/maven/binaries/maven-$ {currentVersion}-bin.tar.bz2} maven-${currentVersion}- bin.tar.bz2}} | {{{http://www.apache.org/dist/maven/binaries/maven- ${currentVersion}-bin.tar.bz2.md5} maven-${currentVersion}- bin.tar.bz2.md5}} | {{{http://www.apache.org/dist/maven/binaries/ maven-${currentVersion}-bin.tar.bz2.asc} maven-${currentVersion}- bin.tar.bz2.asc}} | 
 *-------------------------+---------+----------+-----------+
-| Maven @project.version@ (tar.gz) | {{{http:// www.apache.org/dyn/closer.cgi/maven/binaries/maven- @[EMAIL PROTECTED] [EMAIL PROTECTED]@-bin.tar.gz}} | {{{http://www.apache.org/dist/maven/binaries/maven- @[EMAIL PROTECTED] [EMAIL PROTECTED]@- bin.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/binaries/ [EMAIL PROTECTED]@-bin.tar.gz.asc} [EMAIL PROTECTED]@- bin.tar.gz.asc}} | +| Maven ${currentVersion} (tar.gz) | {{{http:// www.apache.org/dyn/closer.cgi/maven/binaries/maven-$ {currentVersion}-bin.tar.gz} maven-${currentVersion}-bin.tar.gz}} | {{{http://www.apache.org/dist/maven/binaries/maven-$ {currentVersion}-bin.tar.gz.md5} maven-${currentVersion}- bin.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/binaries/ maven-${currentVersion}-bin.tar.gz.asc} maven-${currentVersion}- bin.tar.gz.asc}} | 
 *-------------------------+---------+----------+-----------+
-| Maven @project.version@ (zip) | {{{http:// www.apache.org/dyn/closer.cgi/maven/binaries/maven- @[EMAIL PROTECTED] [EMAIL PROTECTED]@-bin.zip}} | {{{http://www.apache.org/dist/maven/binaries/maven- @[EMAIL PROTECTED] [EMAIL PROTECTED]@- bin.zip.md5}} | {{{http://www.apache.org/dist/maven/binaries/maven- @[EMAIL PROTECTED] [EMAIL PROTECTED]@- bin.zip.asc}} | +| Maven ${currentVersion} (zip) | {{{http:// www.apache.org/dyn/closer.cgi/maven/binaries/maven-$ {currentVersion}-bin.zip} maven-${currentVersion}-bin.zip}} | {{{http://www.apache.org/dist/maven/binaries/maven-$ {currentVersion}-bin.zip.md5} maven-${currentVersion}- bin.zip.md5}} | {{{http://www.apache.org/dist/maven/binaries/maven- ${currentVersion}-bin.zip.asc} maven-${currentVersion}- bin.zip.asc}} | 
 *-------------------------+---------+----------+-----------+
| Maven 2.0.4 Tasks for Ant | {{{http:// www.apache.org/dyn/closer.cgi/maven/binaries/maven-artifact- ant-2.0.4-dep.jar} maven-artifact-ant-2.0.4-dep.jar}} | {{{http:// www.apache.org/dist/maven/binaries/maven-artifact-ant-2.0.4- dep.jar.md5} maven-artifact-ant-2.0.4-dep.jar.md5}} | {{{http:// www.apache.org/dist/maven/binaries/maven-artifact-ant-2.0.4- dep.jar.asc} maven-artifact-ant-2.0.4-dep.jar.asc}} | 
 *-------------------------+---------+----------+-----------+
@@ -50,13 +50,13 @@

 ** Windows 2000/XP
- [[1]] Unzip <<<[EMAIL PROTECTED]@-bin.zip>>> to the directory you wish to install Maven @[EMAIL PROTECTED] These instructions - assume you chose <<<C:\Program Files\Apache Software [EMAIL PROTECTED]@>>> + [[1]] Unzip <<<maven-${currentVersion}-bin.zip>>> to the directory you wish to install Maven ${currentVersion}. These instructions + assume you chose <<<C:\Program Files\Apache Software Foundation\maven-${currentVersion}>>>
[[2]] Add the <<<bin>>> directory to your path, by opening up the system properties (WinKey + Pause), selecting the "Advanced" tab, and the "Environment Variables" button, then editing the <<<PATH>>> 
         variable in the user variables. eg.
- <<<"C:\Program Files\Apache Software Foundation\maven- @[EMAIL PROTECTED]";%PATH%>>> + <<<"C:\Program Files\Apache Software Foundation\maven-$ {currentVersion}\bin";%PATH%>>>
[[3]] In the same dialog, make sure that <<<JAVA_HOME>>> is set to the location of your JDK, 
         eg. <<<C:\Program Files\Java\jdk1.5.0_02>>>
@@ -65,12 +65,12 @@

 ** Unix-based Operating Systems (Linux, Solaris and Mac OS X)
- [[1]] Extract the distribution archive to the directory you wish to install Maven @[EMAIL PROTECTED] These instructions - assume you chose <<</usr/local/maven- @project.version@>>>. The directory <<<[EMAIL PROTECTED]@>>> will be created from + [[1]] Extract the distribution archive to the directory you wish to install Maven ${currentVersion}. These instructions + assume you chose <<</usr/local/maven-${currentVersion} >>>. The directory <<<maven-${currentVersion}>>> will be created from 
         the archive.

   [[2]] Add the <<<bin>>> directory to your path, eg. <<<export
-PATH=/usr/local/[EMAIL PROTECTED]@/bin:$PATH>>>
+PATH=/usr/local/maven-${currentVersion}/bin:$PATH>>>
[[3]] Make sure that <<<JAVA_HOME>>> is set to the location of your JDK, eg. 
         <<<export JAVA_HOME=/usr/java/jdk1.5.0_02>>>

Modified: maven/site/trunk/src/site/apt/pom.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/ pom.apt?view=diff&rev=524511&r1=524510&r2=524511 ===================================================================== ========= 
--- maven/site/trunk/src/site/apt/pom.apt (original)
+++ maven/site/trunk/src/site/apt/pom.apt Sat Mar 31 19:20:35 2007
@@ -565,16 +565,18 @@
 *** {Dependency Management}
Besides inheriting certain top-level elements, parents have elements to configure values for - child POMs that do not affect the parent’s own build lifecycle. One of those elements is 
+  child POMs and transitive dependencies. One of those elements is
   <<<dependencyManagement>>>.

   * <<dependencyManagement>>:
- is used only by parent POMs to help manage dependency information across all of its children. + is used by POMs to help manage dependency information across all of its children. If the <<<my-parent>>> project uses <<<dependencyManagement>>> to define a dependency on <<<junit:junit:4.0>>>, then POMs inheriting from this one can set their dependency giving the <<<groupId>>>=<<<junit>>> and <<<artifactId>>>=<<<junit>>> only, then Maven will fill in the <<<version>>> set by the parent. The benefits of this method are obvious. Dependency - details can be set in one central location, which will propagate to all inheriting POMs. + details can be set in one central location, which will propagate to all inheriting POMs. In + addition, the version and scope of artifacts which are incorporated from transitive dependencies + may also be controlled by specifying them in a dependency management section. 

 ** {Aggregation} (or Multi-Module)


Modified: maven/site/trunk/src/site/apt/what-is-maven.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/ what-is-maven.apt?view=diff&rev=524511&r1=524510&r2=524511 ===================================================================== ========= 
--- maven/site/trunk/src/site/apt/what-is-maven.apt (original)
+++ maven/site/trunk/src/site/apt/what-is-maven.apt Sat Mar 31 19:20:35 2007 
@@ -6,6 +6,8 @@
  12 October 2005
  ------

+XXXXX ${currentFileName}
+
 Introduction

  Maven was originally started as an attempt to simplify the build



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]





---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to