Author: michaelo
Date: Sun Dec 22 16:54:40 2013
New Revision: 1553003
URL: http://svn.apache.org/r1553003
Log:
Merged revision(s) 1549695-1553002 from
maven/skins/branches/maven-fluido-skin-1.3.x:
- Add myself to contributors
- Update site.xml of ITs, they had invalid links in the breadcrumb
Modified:
maven/skins/trunk/maven-fluido-skin/ (props changed)
maven/skins/trunk/maven-fluido-skin/pom.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_default/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_topbar/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-23/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-25/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/sidebar/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/topbar-inverse/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml
Propchange: maven/skins/trunk/maven-fluido-skin/
------------------------------------------------------------------------------
Merged /maven/skins/branches/maven-fluido-skin-1.3.x:r1549695-1553002
Modified: maven/skins/trunk/maven-fluido-skin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/pom.xml?rev=1553003&r1=1553002&r2=1553003&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/pom.xml Sun Dec 22 16:54:40 2013
@@ -82,12 +82,16 @@
<contributor>
<name>Eric Barboni</name>
</contributor>
+ <contributor>
+ <name>Michael Osipov</name>
+ <email>michaelo AT apache DOT org</email>
+ </contributor>
</contributors>
<properties>
<bootstrap.version>3.0.2</bootstrap.version>
<jquery.version>1.10.2</jquery.version>
-
<maven.site.path>skins-archives/${project.artifactId}-LATEST</maven.site.path>
+
<maven.site.path>skins-archives/maven-fluido-skin-LATEST</maven.site.path>
</properties>
<build>
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/src/site/site.xml?rev=1553003&r1=1553002&r2=1553003&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/src/site/site.xml
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/src/site/site.xml
Sun Dec 22 16:54:40 2013
@@ -36,10 +36,6 @@
</custom>
<body>
- <breadcrumbs>
- <item name="skins" href="/skins/"/>
- <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
- </breadcrumbs>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-22/src/site/site.xml?rev=1553003&r1=1553002&r2=1553003&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22/src/site/site.xml
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22/src/site/site.xml
Sun Dec 22 16:54:40 2013
@@ -47,10 +47,6 @@
<version position="right" />
<body>
- <breadcrumbs>
- <item name="skins" href="/skins/"/>
- <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
- </breadcrumbs>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_default/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_default/src/site/site.xml?rev=1553003&r1=1553002&r2=1553003&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_default/src/site/site.xml
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_default/src/site/site.xml
Sun Dec 22 16:54:40 2013
@@ -45,10 +45,6 @@
<version position="right" />
<body>
- <breadcrumbs>
- <item name="skins" href="/skins/"/>
- <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
- </breadcrumbs>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_topbar/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_topbar/src/site/site.xml?rev=1553003&r1=1553002&r2=1553003&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_topbar/src/site/site.xml
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_topbar/src/site/site.xml
Sun Dec 22 16:54:40 2013
@@ -49,10 +49,6 @@
<version position="right" />
<body>
- <breadcrumbs>
- <item name="skins" href="/skins/"/>
- <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
- </breadcrumbs>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-23/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-23/src/site/site.xml?rev=1553003&r1=1553002&r2=1553003&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/it/mskins-23/src/site/site.xml
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/it/mskins-23/src/site/site.xml
Sun Dec 22 16:54:40 2013
@@ -43,10 +43,6 @@
<version position="right" />
<body>
- <breadcrumbs>
- <item name="skins" href="/skins/"/>
- <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
- </breadcrumbs>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/src/site/site.xml?rev=1553003&r1=1553002&r2=1553003&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/src/site/site.xml
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/src/site/site.xml
Sun Dec 22 16:54:40 2013
@@ -47,10 +47,6 @@
<version position="right" />
<body>
- <breadcrumbs>
- <item name="skins" href="/skins/"/>
- <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
- </breadcrumbs>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/src/site/site.xml?rev=1553003&r1=1553002&r2=1553003&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/src/site/site.xml
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/src/site/site.xml
Sun Dec 22 16:54:40 2013
@@ -49,10 +49,6 @@
<version position="right" />
<body>
- <breadcrumbs>
- <item name="skins" href="/skins/"/>
- <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
- </breadcrumbs>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-25/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-25/src/site/site.xml?rev=1553003&r1=1553002&r2=1553003&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/it/mskins-25/src/site/site.xml
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/it/mskins-25/src/site/site.xml
Sun Dec 22 16:54:40 2013
@@ -46,10 +46,6 @@
<version position="right" />
<body>
- <breadcrumbs>
- <item name="skins" href="/skins/"/>
- <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
- </breadcrumbs>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/sidebar/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/sidebar/src/site/site.xml?rev=1553003&r1=1553002&r2=1553003&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/sidebar/src/site/site.xml
(original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/sidebar/src/site/site.xml
Sun Dec 22 16:54:40 2013
@@ -44,10 +44,6 @@
<version position="right" />
<body>
- <breadcrumbs>
- <item name="skins" href="/skins/"/>
- <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
- </breadcrumbs>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/topbar-inverse/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/topbar-inverse/src/site/site.xml?rev=1553003&r1=1553002&r2=1553003&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/it/topbar-inverse/src/site/site.xml
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/it/topbar-inverse/src/site/site.xml
Sun Dec 22 16:54:40 2013
@@ -57,11 +57,6 @@
<item name="Just Test" href="http://nowhere.com/"/>
</links>
- <breadcrumbs>
- <item name="skins" href="/skins/"/>
- <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
- </breadcrumbs>
-
<menu name="Overview">
<item name="Introduction" href="index.html">
<item name="Bar" href="bar.html"/>
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml?rev=1553003&r1=1553002&r2=1553003&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml
(original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml
Sun Dec 22 16:54:40 2013
@@ -57,11 +57,6 @@
<item name="Just Test" href="http://nowhere.com/"/>
</links>
- <breadcrumbs>
- <item name="skins" href="/skins/"/>
- <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
- </breadcrumbs>
-
<menu name="Overview">
<item name="Introduction" href="index.html">
<item name="Bar" href="bar.html"/>