You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2015/07/21 14:00:15 UTC
svn commit: r1692092 - in /sling/site/trunk/content: downloads.list news.mdtext obr/sling.xml

Author: radu
Date: Tue Jul 21 12:00:15 2015
New Revision: 1692092

URL: http://svn.apache.org/r1692092
Log:
Added Resource Merger 1.2.10

Modified:
    sling/site/trunk/content/downloads.list
    sling/site/trunk/content/news.mdtext
    sling/site/trunk/content/obr/sling.xml

Modified: sling/site/trunk/content/downloads.list
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1692092&r1=1692091&r2=1692092&view=diff
==============================================================================
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Tue Jul 21 12:00:15 2015
@@ -124,7 +124,7 @@ Provisioning Model|org.apache.sling.prov
 Resource Access Security|org.apache.sling.resourceaccesssecurity|1.0.0
 Resource Collection|org.apache.sling.resourcecollection|1.0.0
 Resource Inventory|org.apache.sling.resource.inventory|1.0.4
-Resource Merger|org.apache.sling.resourcemerger|1.2.8
+Resource Merger|org.apache.sling.resourcemerger|1.2.10
 Resource Resolver|org.apache.sling.resourceresolver|1.2.2
 Rewriter|org.apache.sling.rewriter|1.0.4
 Failing Server-Side Tests|org.apache.sling.testing.samples.failingtests|1.0.6

Modified: sling/site/trunk/content/news.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1692092&r1=1692091&r2=1692092&view=diff
==============================================================================
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Tue Jul 21 12:00:15 2015
@@ -1,7 +1,7 @@
 Title: News
 
 * New Releases: Apache Sling Scripting API 2.1.8, Apache Sling Scripting Core 2.0.30, Apache Sling Scripting JavaScript 2.0.20,
-Apache Sling Scripting Sightly JS Use Provider 1.0.6 (July 21st, 2015)
+Apache Sling Scripting Sightly JS Use Provider 1.0.6, Apache Sling Resource Merger 1.2.10 (July 21st, 2015)
 * New Release: Apache Sling JCR Resource 2.5.4 (July 17th, 2015)
 * New Release: Apache Sling Servlets GET 2.1.12 (July 17th, 2015)
 * New Release: Apache Sling Event 3.7.2 (July 13th, 2015)

Modified: sling/site/trunk/content/obr/sling.xml
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1692092&r1=1692091&r2=1692092&view=diff
==============================================================================
--- sling/site/trunk/content/obr/sling.xml (original)
+++ sling/site/trunk/content/obr/sling.xml Tue Jul 21 12:00:15 2015
@@ -1,4 +1,4 @@
-<repository name='Apache Sling Release Repository' lastmodified='20150721011522.967'>
+<repository name='Apache Sling Release Repository' lastmodified='20150721025545.054'>
   <resource id='org.apache.sling.extensions.classloader-leak-detector/1.0.0' symbolicname='org.apache.sling.extensions.classloader-leak-detector' presentationname='Adobe Sling ClassLoader Leak Detector' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector-1.0.0.jar' version='1.0.0'>
     <description>Provides a web console configuration printer to provide details around classloader leaks</description>
     <size>18203</size>
@@ -5141,6 +5141,38 @@
     <require name='package' filter='(&amp;(package=org.osgi.util.tracker)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))' extend='false' multiple='false' optional='false'>Import package org.osgi.util.tracker;version="[1.3,2)"</require>
     <require name='ee' filter='(|(ee=J2SE-1.5))' extend='false' multiple='false' optional='false'>Execution Environment (|(ee=J2SE-1.5))</require>
   </resource>
+  <resource id='org.apache.sling.resourcemerger/1.2.10' symbolicname='org.apache.sling.resourcemerger' presentationname='Apache Sling Resource Merger' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.resourcemerger-1.2.10.jar' version='1.2.10'>
+    <description>This bundle provides services to merge resources.</description>
+    <size>44863</size>
+    <documentation>http://sling.apache.org</documentation>
+    <license>http://www.apache.org/licenses/LICENSE-2.0.txt</license>
+    <category id='sling'/>
+    <capability name='bundle'>
+      <p n='symbolicname' v='org.apache.sling.resourcemerger'/>
+      <p n='presentationname' v='Apache Sling Resource Merger'/>
+      <p n='version' t='version' v='1.2.10'/>
+      <p n='manifestversion' v='2'/>
+    </capability>
+    <capability name='package'>
+      <p n='package' v='org.apache.sling.resourcemerger.api'/>
+      <p n='version' t='version' v='1.2.0'/>
+      <p n='uses:' v='org.apache.sling.api.resource'/>
+    </capability>
+    <capability name='package'>
+      <p n='package' v='org.apache.sling.resourcemerger.spi'/>
+      <p n='version' t='version' v='1.1.0'/>
+      <p n='uses:' v='org.apache.sling.api.resource'/>
+    </capability>
+    <require name='package' filter='(&amp;(package=javax.servlet.http))' extend='false' multiple='false' optional='false'>Import package javax.servlet.http</require>
+    <require name='package' filter='(&amp;(package=org.apache.sling.api.resource)(version&gt;=2.5.0)(!(version&gt;=3.0.0)))' extend='false' multiple='false' optional='false'>Import package org.apache.sling.api.resource;version="[2.5,3)"</require>
+    <require name='package' filter='(&amp;(package=org.apache.sling.api.wrappers)(version&gt;=2.5.0)(!(version&gt;=3.0.0)))' extend='false' multiple='false' optional='false'>Import package org.apache.sling.api.wrappers;version="[2.5,3)"</require>
+    <require name='package' filter='(&amp;(package=org.apache.sling.commons.osgi)(version&gt;=2.2.0)(!(version&gt;=3.0.0)))' extend='false' multiple='false' optional='false'>Import package org.apache.sling.commons.osgi;version="[2.2,3)"</require>
+    <require name='package' filter='(&amp;(package=org.apache.sling.resourcemerger.api)(version&gt;=1.2.0)(!(version&gt;=1.3.0)))' extend='false' multiple='false' optional='false'>Import package org.apache.sling.resourcemerger.api;version="[1.2,1.3)"</require>
+    <require name='package' filter='(&amp;(package=org.apache.sling.resourcemerger.spi)(version&gt;=1.1.0)(!(version&gt;=2.0.0)))' extend='false' multiple='false' optional='false'>Import package org.apache.sling.resourcemerger.spi;version="[1.1,2)"</require>
+    <require name='package' filter='(&amp;(package=org.osgi.framework)(version&gt;=1.4.0)(!(version&gt;=2.0.0)))' extend='false' multiple='false' optional='false'>Import package org.osgi.framework;version="[1.4,2)"</require>
+    <require name='package' filter='(&amp;(package=org.osgi.util.tracker)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))' extend='false' multiple='false' optional='false'>Import package org.osgi.util.tracker;version="[1.3,2)"</require>
+    <require name='ee' filter='(|(ee=JavaSE-1.6))' extend='false' multiple='false' optional='false'>Execution Environment (|(ee=JavaSE-1.6))</require>
+  </resource>
   <resource id='org.apache.sling.jcr.resource/2.0.4.incubator' symbolicname='org.apache.sling.jcr.resource' presentationname='Apache Sling Resource Resolver' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.jcr.resource/2.0.4-incubator/org.apache.sling.jcr.resource-2.0.4-incubator.jar' version='2.0.4.incubator'>
     <description>This bundle provides the JCR based ResourceResolver.</description>
     <size>109638</size>