svn commit: r1798928 - /sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/CommonMergedResourceProviderTest.java

2017-06-16 Thread kwin
Author: kwin Date: Fri Jun 16 13:55:02 2017 New Revision: 1798928 URL: http://svn.apache.org/viewvc?rev=1798928=rev Log: remove redundant test method Modified:

Build failed in Jenkins: sling-contrib-extensions-resourcemerger-1.8 #11

2017-06-16 Thread Apache Jenkins Server
See Changes: [kwin] SLING-6956 do not touch order when no new resources have been defined in an overlying resource -- Started by an SCM change

svn commit: r1798930 - /sling/tags/org.apache.sling.resourcemerger-1.3.4/

2017-06-16 Thread kwin
Author: kwin Date: Fri Jun 16 13:57:15 2017 New Revision: 1798930 URL: http://svn.apache.org/viewvc?rev=1798930=rev Log: [maven-release-plugin] copy for tag org.apache.sling.resourcemerger-1.3.4 Added: sling/tags/org.apache.sling.resourcemerger-1.3.4/ - copied from r1798929,

Nexus: Staging Completed

2017-06-16 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDescription:Apache Sling Resource Merger 1.3.4Deployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.8.0_131; Mac OS X 10.12.5)""userId" = "kwin""ip" = "213.61.79.222"Details:The following artifacts have been

svn commit: r1014131 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/resource-merger.html

2017-06-16 Thread buildbot
Author: buildbot Date: Fri Jun 16 14:54:55 2017 New Revision: 1014131 Log: Staging update by buildbot for sling Modified: websites/staging/sling/trunk/content/ (props changed) websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html Propchange:

svn commit: r1798935 - /sling/site/trunk/content/documentation/bundles/resource-merger.mdtext

2017-06-16 Thread kwin
Author: kwin Date: Fri Jun 16 14:54:27 2017 New Revision: 1798935 URL: http://svn.apache.org/viewvc?rev=1798935=rev Log: SLING-6956 improve documentation on child resource order Modified: sling/site/trunk/content/documentation/bundles/resource-merger.mdtext Modified:

svn commit: r1014132 - /websites/production/sling/content/

2017-06-16 Thread kwin
Author: kwin Date: Fri Jun 16 14:55:39 2017 New Revision: 1014132 Log: Publishing svnmucc operation to sling site by kwin Added: websites/production/sling/content/ - copied from r1014131, websites/staging/sling/trunk/content/

Jenkins build is back to normal : sling-contrib-extensions-resourcemerger-1.8 #12

2017-06-16 Thread Apache Jenkins Server
See

svn commit: r1798927 - in /sling/trunk/contrib/extensions/resourcemerger/src: main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java test/java/org/apache/sling/resourcemerger/impl

2017-06-16 Thread kwin
Author: kwin Date: Fri Jun 16 13:42:53 2017 New Revision: 1798927 URL: http://svn.apache.org/viewvc?rev=1798927=rev Log: SLING-6956 do not touch order when no new resources have been defined in an overlying resource Modified:

svn commit: r1798931 - /sling/trunk/contrib/extensions/resourcemerger/pom.xml

2017-06-16 Thread kwin
Author: kwin Date: Fri Jun 16 13:57:17 2017 New Revision: 1798931 URL: http://svn.apache.org/viewvc?rev=1798931=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/contrib/extensions/resourcemerger/pom.xml Modified:

svn commit: r1798929 - /sling/trunk/contrib/extensions/resourcemerger/pom.xml

2017-06-16 Thread kwin
Author: kwin Date: Fri Jun 16 13:57:02 2017 New Revision: 1798929 URL: http://svn.apache.org/viewvc?rev=1798929=rev Log: [maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.4 Modified: sling/trunk/contrib/extensions/resourcemerger/pom.xml Modified: