Author: ltheussl
Date: Sat May 28 17:04:33 2011
New Revision: 1128707
URL: http://svn.apache.org/viewvc?rev=1128707&view=rev
Log:
site updates
Added:
maven/doxia/site/src/site/apt/upgrading.apt.vm
Modified:
maven/doxia/site/pom.xml
maven/doxia/site/src/site/apt/index.apt.vm
maven/doxia/site/src/site/apt/whatsnew-1.1.apt
maven/doxia/site/src/site/site.xml
Modified: maven/doxia/site/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=1128707&r1=1128706&r2=1128707&view=diff
==============================================================================
--- maven/doxia/site/pom.xml (original)
+++ maven/doxia/site/pom.xml Sat May 28 17:04:33 2011
@@ -123,8 +123,8 @@ under the License.
</issueManagement>
<ciManagement>
- <system>Hudson</system>
- <url>https://hudson.apache.org/hudson/</url>
+ <system>Jenkins</system>
+ <url>https://builds.apache.org/job/maven-doxia-trunks/</url>
</ciManagement>
<distributionManagement>
@@ -157,7 +157,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -172,7 +172,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-maven-plugin</artifactId>
- <version>${doxiaVersion}</version>
+ <version>1.1.4</version>
<executions>
<execution>
<phase>pre-site</phase>
@@ -258,7 +258,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<reportSets>
<reportSet>
<reports>
@@ -282,7 +282,7 @@ under the License.
<resolutionIds>Closed</resolutionIds>
<sortColumnNames>Fix Version DESC</sortColumnNames>
<maxEntries>1000</maxEntries>
- <fixVersionIds>13617,15073,15517,15924,16702</fixVersionIds> <!--
1.1.x -->
+ <fixVersionIds>14082</fixVersionIds> <!-- 1.2.x -->
</configuration>
<reportSets>
<reportSet>
Modified: maven/doxia/site/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/doxia/site/src/site/apt/index.apt.vm?rev=1128707&r1=1128706&r2=1128707&view=diff
==============================================================================
--- maven/doxia/site/src/site/apt/index.apt.vm (original)
+++ maven/doxia/site/src/site/apt/index.apt.vm Sat May 28 17:04:33 2011
@@ -48,7 +48,7 @@ Maven Doxia
* {{{./jira-report.html}Release Notes for ${doxiaVersion}}}
- * {{{./whatsnew-1.1.html}What's new in 1.1}}
+ * {{{./upgrading.html}Upgrading from earlier versions}}
[]
Added: maven/doxia/site/src/site/apt/upgrading.apt.vm
URL:
http://svn.apache.org/viewvc/maven/doxia/site/src/site/apt/upgrading.apt.vm?rev=1128707&view=auto
==============================================================================
--- maven/doxia/site/src/site/apt/upgrading.apt.vm (added)
+++ maven/doxia/site/src/site/apt/upgrading.apt.vm Sat May 28 17:04:33 2011
@@ -0,0 +1,45 @@
+ -----
+ Upgrading from old versions
+ -----
+ Lukas Theussl
+ ------
+ 2011-05-28
+ ------
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+
+Latest release
+
+ The current version of Doxia is ${doxiaVersion}. Read the latest
{{{./jira-report.html}Release Notes}}.
+
+
+Upgrading from v. 1.0.x to 1.1.x
+
+ See {{{./whatsnew-1.1.html}What's new in 1.1}}.
+
+Upgrading from v. 1.1.x to 1.2.x
+
+ The only major change in version 1.2 is the upgrade to java 5.
+ Functionally v. 1.2 is equivalent and fully compatible with v. 1.1.
+
+ The full list of changes is available in the release notes:
+
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=14082&styleName=Text&projectId=10780}1.2}}
Modified: maven/doxia/site/src/site/apt/whatsnew-1.1.apt
URL:
http://svn.apache.org/viewvc/maven/doxia/site/src/site/apt/whatsnew-1.1.apt?rev=1128707&r1=1128706&r2=1128707&view=diff
==============================================================================
--- maven/doxia/site/src/site/apt/whatsnew-1.1.apt (original)
+++ maven/doxia/site/src/site/apt/whatsnew-1.1.apt Sat May 28 17:04:33 2011
@@ -52,10 +52,12 @@ What's new in 1.1?
[]
- The full list of changes for 1.1 can be found in our
-
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=13617&styleName=Text&projectId=10780}issue
management system}}.
-
- You could also read the latest {{{./jira-report.html}release notes}}.
+ The full list of changes for 1.1 can be found in our issue management system:
+
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=13617&styleName=Text&projectId=10780}1.1}}
::
+
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=15073&styleName=Text&projectId=10780}1.1.1}}
::
+
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=15517&styleName=Text&projectId=10780}1.1.2}}
::
+
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=15924&styleName=Text&projectId=10780}1.1.3}}
::
+
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=16702&styleName=Text&projectId=10780}1.1.4}}
* Binary Incompatibility
Modified: maven/doxia/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/site/src/site/site.xml?rev=1128707&r1=1128706&r2=1128707&view=diff
==============================================================================
--- maven/doxia/site/src/site/site.xml (original)
+++ maven/doxia/site/src/site/site.xml Sat May 28 17:04:33 2011
@@ -44,7 +44,8 @@ under the License.
<menu name="About Doxia">
<item name="What is Doxia?" href="index.html"/>
<item name="Overview" href="overview.html"/>
- <item name="What's new in 1.1?" href="whatsnew-1.1.html" collapse="true">
+ <item name="Upgrading" href="upgrading.html" collapse="true">
+ <item name="What's new in 1.1?" href="whatsnew-1.1.html"/>
<item name="Maven Integration"
href="developers/maven-integration.html"/>
</item>
<item name="Downloads" href="downloads.html"/>
