You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2017/02/08 14:52:38 UTC
svn commit: r18233 - /release/sling/
Author: kwin
Date: Wed Feb 8 14:52:37 2017
New Revision: 18233
Log:
Push Resource Merger 1.3.2 to dist
Added:
release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar (with props)
release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar.asc
release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar.md5
release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar.sha1
release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip (with props)
release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip.asc
release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip.md5
release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip.sha1
release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar (with props)
release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar.asc
release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar.md5
release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar.sha1
release/sling/org.apache.sling.resourcemerger-1.3.2.jar (with props)
release/sling/org.apache.sling.resourcemerger-1.3.2.jar.asc
release/sling/org.apache.sling.resourcemerger-1.3.2.jar.md5
release/sling/org.apache.sling.resourcemerger-1.3.2.jar.sha1
release/sling/org.apache.sling.resourcemerger-1.3.2.pom
release/sling/org.apache.sling.resourcemerger-1.3.2.pom.asc
release/sling/org.apache.sling.resourcemerger-1.3.2.pom.md5
release/sling/org.apache.sling.resourcemerger-1.3.2.pom.sha1
Added: release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar.asc Wed Feb 8 14:52:37 2017
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJYlwfOAAoJENd0LVhFXsx8EzMH/1zY/2IzBIdX0zKKnZbYxPL9
+ky7X9iYtBzeYneq+dNYnWHxIgMUO+v2jsyIIfZvnlKOL/qTAO5T92NmjZu0o2u95
+l8z1xEyFlE6eO8TuCqLABDjDGdQBWUDuhv6wT2vzQrsaZ+gvLLQJGtsE6RfdyUEY
+1PrNzmCfmIlUnc1Yff/qxYFwxB1eD4BR3JC1htAdKatjsoXp17czhDocg3FHB33D
+D0sl5i/ikW4nbDSZdo83yXvoSfzsnuurckukvRYyMxZcgLeRpw45cyp/fwsD7hpu
+6JwTHj3VF2eL3BTOM4X38ESdSb2k10M+JE3UrhnidxP/iFMse72/kxoyzm/VoNs=
+=KK0G
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar.md5 Wed Feb 8 14:52:37 2017
@@ -0,0 +1 @@
+3011b4b997817f811c263d4d3f923cd6
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2-javadoc.jar.sha1 Wed Feb 8 14:52:37 2017
@@ -0,0 +1 @@
+427e1612410845403d85697b775bac14f6adf061
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip.asc Wed Feb 8 14:52:37 2017
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJYlwfNAAoJENd0LVhFXsx8umoIAM1W2kbplJC3JxPpoPOCEzAT
+8Lewc/UgCzYU7C+tWSJSDr5xvf0fIgJKAIXmOb/Ql3IgLkNBQ6kYi4RdGTFbQF7D
+3wiC311RzKEN0q2unFoPlVZExh0o4sQHpKNBdSTAuWqxO1qA3giyF/uFxk5TcWpN
+VXXZ9sZ6b97d8vQwmhamNgqHonEhTI5Od7mLRU2ecfSI04Wz+QzLmO3cM3VMx1Ki
+A3Yyrcn/z9VO7+t7CSOFXkTncAQE7uYbC6HHX8WtB5uyWH9f6rjI2Y8rNF3BBukT
+UcdfycFwX1+FlUHRh+6fzGv5iKgDe0p6gJU+TTLn8A3sjd/kj5n36XbGbGrbTi0=
+=afSq
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip.md5 Wed Feb 8 14:52:37 2017
@@ -0,0 +1 @@
+efc7f359a877cf8ba3a446d3dbfcef71
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2-source-release.zip.sha1 Wed Feb 8 14:52:37 2017
@@ -0,0 +1 @@
+046651d534133c2b7fa5c7c76fb374a09121d11c
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar.asc Wed Feb 8 14:52:37 2017
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJYlwfOAAoJENd0LVhFXsx8CzUH/iKinIbaWYP00kw+Lo6T+iRy
+m5OLgbNX641u6sYdxP1EkSdWcVWkL+bgyq2mB6bqgx6R4UvIL/d71cKvArFJUqt/
+JsalSqcf+viyxrfFbBv0FVuN9mHoEAdkqd+qNkcoUsAPHzLszZOG82EM7W+xc9NP
+cfBKHhe6I+pZxSdBlcnDBbi2NMaycw79fmPsdtl8EjOCWtE4uGmTxAnZdK4v+h/J
+YldqYAmMICJg7ukzcxnVBG8k/OFexMO2JxhcS/2c/C5Q3O1pRUlK5ID5+HRtoqsI
+t8MBtrt8H6HZrr22WkujWz20R6TbqLz+eVyNeCKvhK0sOtpGHEyMHp8vHgpcUxs=
+=tKqE
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar.md5 Wed Feb 8 14:52:37 2017
@@ -0,0 +1 @@
+8c17b735f035a908ee083c5811cabed2
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2-sources.jar.sha1 Wed Feb 8 14:52:37 2017
@@ -0,0 +1 @@
+fbefb1b78451d044bf70d97477812bb3c223262c
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.3.2.jar
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.resourcemerger-1.3.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: release/sling/org.apache.sling.resourcemerger-1.3.2.jar.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2.jar.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2.jar.asc Wed Feb 8 14:52:37 2017
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJYlwfNAAoJENd0LVhFXsx8OvgH/2FbUp2L0Qnf34+2dUyndEA2
+TwYJqR8EmMwq9uMHJwNU66MGf5ubke0syKvER2QK7wYnCFt5xSHnQwHFeMulClKf
+Rmh5vBCzFQqB+sX48L+bBpWdQ8z58EtRo0pz7moai48CkFIEYmQWsvTRb0ZqSlhg
+hm4Ym6Sguseqxg+fBtn322LZY3Pu6SaoyKr5AZiJz/W8AJYZNKCObv8jvI0ev/EY
+rleGo/liSIvTw+ewe2W20G2ZodoCKlCOVQYArqtB9yG5pexGCynBUaU2DzwLq6dv
+YE3qe2xvvk/GD6oMzYNhisnzFs/qWSP3Wx81jR8hNuMKE29HxNsn4B+6wx3gHBc=
+=ClZx
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.3.2.jar.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2.jar.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2.jar.md5 Wed Feb 8 14:52:37 2017
@@ -0,0 +1 @@
+89e8d6b048664e062f794487d8e66523
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.3.2.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2.jar.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2.jar.sha1 Wed Feb 8 14:52:37 2017
@@ -0,0 +1 @@
+c9d59e686fdd159b5da32a5a0ea2fb4ed0fbd48e
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.3.2.pom
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2.pom (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2.pom Wed Feb 8 14:52:37 2017
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>26</version>
+ <relativePath />
+ </parent>
+
+ <artifactId>org.apache.sling.resourcemerger</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.3.2</version>
+
+ <name>Apache Sling Resource Merger</name>
+ <description>
+ This bundle provides services to merge resources.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourcemerger-1.3.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourcemerger-1.3.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.resourcemerger-1.3.2</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-sling-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.11.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.hamcrest</artifactId>
+ <version>1.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.sling-mock</artifactId>
+ <version>1.8.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.resourceresolver</artifactId>
+ <version>1.4.0</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- only for IteratorIterable used in Tests -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: release/sling/org.apache.sling.resourcemerger-1.3.2.pom.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2.pom.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2.pom.asc Wed Feb 8 14:52:37 2017
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJYlwfNAAoJENd0LVhFXsx8wzoIAJ5KQ1NqiQ6HFKoPmImvwNM9
+6nCohKAMlCigaVIuJaEyRP/tbPhagsX47dRsx+wczXR1J0GJniyEH8TMx/KSv/Nl
+xDf5A9J0mAb7+QckpeuIGY2yt6mSzG4bPQ5c/mJn+chufBtP1HXvm4B648MIol0y
+BMu36uvQeAmviaQm/J7N5B7/7CLgvcg0boa/Pl77HZSeUMolPvmY7F+MiWQoz8UJ
+CmQWQYw6iAN4XprSHCesoKkVT3kFIiGs1G5TSKig3oXS8Buwtt9JRLejvRPzoO4w
+V1WZlMB6IuOnsnQc/H3Snp2skWUBt9I09exp1Bgs3+aL6fnsvbpWX/xfgf3OQ40=
+=YZcl
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.3.2.pom.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2.pom.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2.pom.md5 Wed Feb 8 14:52:37 2017
@@ -0,0 +1 @@
+9338abac02b9f8caf6cd3659dde63f10
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.3.2.pom.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.3.2.pom.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.3.2.pom.sha1 Wed Feb 8 14:52:37 2017
@@ -0,0 +1 @@
+d6d70d5a9315da368350ba5c45384c059cfb7b60
\ No newline at end of file