You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/02/13 17:06:28 UTC
svn commit: r1730251 - in /maven/plugins/trunk/maven-site-plugin/src:
it/doxia-formats/pom.xml it/doxia-formats/src/site/site.xml
site/apt/migrate.apt
Author: hboutemy
Date: Sat Feb 13 16:06:28 2016
New Revision: 1730251
URL: http://svn.apache.org/viewvc?rev=1730251&view=rev
Log:
[MSITE-755] document Velocity version update and how to downgrade (tested in doxia-formats IT)
Added:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/site.xml (with props)
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml
maven/plugins/trunk/maven-site-plugin/src/site/apt/migrate.apt
Modified: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml?rev=1730251&r1=1730250&r2=1730251&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml Sat Feb 13 16:06:28 2016
@@ -47,6 +47,13 @@ under the License.
<att1>val1</att1>
</attributes>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.5</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/site.xml?rev=1730251&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/site.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/site.xml Sat Feb 13 16:06:28 2016
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.6.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.4</version>
+ </skin>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/migrate.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/migrate.apt?rev=1730251&r1=1730250&r2=1730251&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/migrate.apt (original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/migrate.apt Sat Feb 13 16:06:28 2016
@@ -33,6 +33,33 @@ Migrate
adjustments to their environment, documents or configuration. Below is a list
of these changes and what you as a user need to be aware of.
+* From 3.4 to 3.5
+
+ * Since {{{http://velocity.apache.org}Velocity}} has been upgraded from version 1.5 to version 1.7,
+ which changes escaping rules, you may need to update escape sequences in your <<<.vm>>> documents and/or skins.
+ If you can't update content and/or skin immediately, you can manually downgrade Velocity version by
+ configuring a dependency to Maven Site Plugin:
+
++-----------------+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.5</version>
+ </dependency>
+ </dependencies>
+ </plugin>
++-----------------+
+
+ * Site Decoration Model has changed type for <<<head>>>/<<<footer>>> from DOM to String:
+ if your <<<site.xml>>> (or one parent) contains XML content, you'll need to escape it, usually by
+ adding <<<\<![CDATA[>>> and <<<]]\>>>>.
+
+ []
+
* From 2.x to 3.x
* Version 3 of the plugin requires at least <<Maven 2.2.0>> to run.
@@ -67,13 +94,13 @@ Migrate
major changes itself. If you experience unexpected behavior, please read these
resources:
- * {{{http://maven.apache.org/doxia/whatsnew-1.1.html}Doxia: what's new in 1.1?}}
+ * {{{/doxia/whatsnew-1.1.html}Doxia: what's new in 1.1?}}
- * {{{http://maven.apache.org/doxia/references/doxia-apt.html}Doxia: Enhancements to the APT format}}
+ * {{{/doxia/references/doxia-apt.html}Doxia: Enhancements to the APT format}}
- * {{{http://maven.apache.org/doxia/issues/index.html}Doxia: Issues & Gotchas}}
+ * {{{/doxia/issues/index.html}Doxia: Issues & Gotchas}}
- * {{{http://maven.apache.org/doxia/faq.html}Doxia: Frequently Asked Questions}}
+ * {{{/doxia/faq.html}Doxia: Frequently Asked Questions}}
[]