Author: buildbot
Date: Sun Feb 14 10:58:31 2016
New Revision: 980384
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/downloads.html
websites/staging/sling/trunk/content/news.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Feb 14 10:58:31 2016
@@ -1 +1 @@
-1730070
+1730311
Modified: websites/staging/sling/trunk/content/downloads.html
==============================================================================
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Sun Feb 14 10:58:31 2016
@@ -963,9 +963,9 @@ h2:hover > .headerlink, h3:hover > .head
</tr>
<tr>
<td>Resource Merger</td>
-<td>1.2.10</td>
-<td><a
href="[preferred]/sling/org.apache.sling.resourcemerger-1.2.10.jar">Bundle</a>
(<a
href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.2.10.jar.asc";>asc</a>,
<a
href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.2.10.jar.md5";>md5</a>)</td>
-<td><a
href="[preferred]/sling/org.apache.sling.resourcemerger-1.2.10-source-release.zip">Source
ZIP</a> (<a
href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.2.10-source-release.zip.asc";>asc</a>,
<a
href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.2.10-source-release.zip.md5";>md5</a>)</td>
+<td>1.3.0</td>
+<td><a
href="[preferred]/sling/org.apache.sling.resourcemerger-1.3.0.jar">Bundle</a>
(<a
href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.3.0.jar.asc";>asc</a>,
<a
href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.3.0.jar.md5";>md5</a>)</td>
+<td><a
href="[preferred]/sling/org.apache.sling.resourcemerger-1.3.0-source-release.zip">Source
ZIP</a> (<a
href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.3.0-source-release.zip.asc";>asc</a>,
<a
href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.3.0-source-release.zip.md5";>md5</a>)</td>
</tr>
<tr>
<td>Resource Resolver</td>
@@ -1309,7 +1309,7 @@ h2:hover > .headerlink, h3:hover > .head
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1730022 by radu on Fri, 12 Feb 2016 13:25:59 +0000
+ Rev. 1730311 by cziegeler on Sun, 14 Feb 2016 10:58:07 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified: websites/staging/sling/trunk/content/news.html
==============================================================================
--- websites/staging/sling/trunk/content/news.html (original)
+++ websites/staging/sling/trunk/content/news.html Sun Feb 14 10:58:31 2016
@@ -115,6 +115,7 @@ h2:hover > .headerlink, h3:hover > .head
}
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink,
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink,
dt:hover > .elementid-permalink { visibility: visible }</style>
<ul>
+<li>New Release: Apache Sling Resource Merger 1.3.0 (February 14th, 2016)</li>
<li>New Release: Apache Sling Scripting Core 2.0.36 (February 12th, 2016)</li>
<li>New Release: Apache Sling Slingstart Maven Plugin 1.4.2 (February 11th,
2016)</li>
<li>New Releases: Apache Sling API 2.11.0, Apache Sling Resource Resolver
1.4.0, Apache Sling JCR Resource 2.7.0, Apache Sling Servlets Resolver 2.4.0,
Apache Sling Testing OSGi Mock 1.7.2, OSGi Mock 2.0.2, JCR Mock 1.1.12, Sling
Mock 1.6.2, ResourceResolver Mock 1.1.12, Servlet Helpers 1.0.0 (February 8th,
2016)</li>
@@ -435,7 +436,7 @@ Apache Sling Scripting Sightly JS Use Pr
<li>Apache Sling has graduated into a top level project! (June 17, 2009)</li>
</ul>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1730022 by radu on Fri, 12 Feb 2016 13:25:59 +0000
+ Rev. 1730311 by cziegeler on Sun, 14 Feb 2016 10:58:07 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
