Author: kwin Date: Tue Jun 20 11:21:23 2017 New Revision: 20097 Log: Sling Resource Merger 1.3.4
Added: release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar (with props) release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar.asc release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar.md5 release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar.sha1 release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip (with props) release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip.asc release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip.md5 release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip.sha1 release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar (with props) release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar.asc release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar.md5 release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar.sha1 release/sling/org.apache.sling.resourcemerger-1.3.4.jar (with props) release/sling/org.apache.sling.resourcemerger-1.3.4.jar.asc release/sling/org.apache.sling.resourcemerger-1.3.4.jar.md5 release/sling/org.apache.sling.resourcemerger-1.3.4.jar.sha1 release/sling/org.apache.sling.resourcemerger-1.3.4.pom release/sling/org.apache.sling.resourcemerger-1.3.4.pom.asc release/sling/org.apache.sling.resourcemerger-1.3.4.pom.md5 release/sling/org.apache.sling.resourcemerger-1.3.4.pom.sha1 Added: release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar ============================================================================== Binary file - no diff available. Propchange: release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar.asc ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar.asc (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar.asc Tue Jun 20 11:21:23 2017 @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJZQ+PaAAoJENd0LVhFXsx8o00IANk+6IZYXwXIvyQI8ZwYkcKR +FCaeX5i6tOrAIjvPDOINspI1Is+CpX6BUPwg72POtlwQdHkH3w5jJEFhRYRBAOnE +DzjZ/rSb2i40VrrDto1B9InaSm7bbqc0GlcFhti9b46LHKlWIlWEoiaXZga05UMZ +O3qfpoDgI9EDtByhW18++2//p+HeCxQ/eWE9n0AdqXt5Zlcf7wqaVtJlKn/R0h1D +tuaWUWZtIDJY0haebPPuvoDH+j/UyQJIXDeYtu7vq89swEMdVy8BfnbyscSjjhVg +id3JVSxCkzJ/2B55MGlbkW7Ma8eEeARPCtAG3oH7JI79Rpdwcc6SZvcXFF49kew= +=SDdr +-----END PGP SIGNATURE----- Added: release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar.md5 ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar.md5 Tue Jun 20 11:21:23 2017 @@ -0,0 +1 @@ +416ed337c1d16b28a56a62214ee7a1bf \ No newline at end of file Added: release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar.sha1 ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4-javadoc.jar.sha1 Tue Jun 20 11:21:23 2017 @@ -0,0 +1 @@ +0b18bd966a9f232a85ae43a1fd3793a96b2ac793 \ No newline at end of file Added: release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip ============================================================================== Binary file - no diff available. Propchange: release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip.asc ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip.asc (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip.asc Tue Jun 20 11:21:23 2017 @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJZQ+PaAAoJENd0LVhFXsx8+mEH/iRcm/9mfZhS4qSssdwuS0Ai +RsUNMcLUfCHghFAsL9LPSkSnBvhx9xA1EIFYeun5fx6McZ7k/VoNRRW0AuuZJoR5 +fxzLc3+l5xDBDcgUiagGqIyFV+CytJl5emhv/OEYyeLjmfrLcYg1mKYqC15/7/jC +Gk7anJ4H3oAVsFXHTTcDZthpV4GtH0nvRsT/Fg6jnDnNUE59H3DkixwuJhfjIPu1 +28yO/KjUwrshrwlhIrm5SIc1Zj+rR90VwX3Y8qY3KlE4y3Wl1Pwy4HZaLx03Lg6E +lP1Da+61ukZSSZXzhTtPhgTLBN9wj0Geo5cj28oxU6DyrHou5hvVRbQxFNiCheQ= +=PmTq +-----END PGP SIGNATURE----- Added: release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip.md5 ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip.md5 (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip.md5 Tue Jun 20 11:21:23 2017 @@ -0,0 +1 @@ +68ea0b14e54bb824bd45a3fc049fe503 \ No newline at end of file Added: release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip.sha1 ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip.sha1 (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4-source-release.zip.sha1 Tue Jun 20 11:21:23 2017 @@ -0,0 +1 @@ +7066bf45eb5cbdad7bc78d06c60b21c950497a80 \ No newline at end of file Added: release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar ============================================================================== Binary file - no diff available. Propchange: release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar.asc ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar.asc (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar.asc Tue Jun 20 11:21:23 2017 @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJZQ+PaAAoJENd0LVhFXsx8uaMIAO/wxv1BFQqQzH3SnsHDxlKr +OEM+QKHWKkFm3nyvJlI7S9Qe2NmhwgJh+6fIR5pyUhMt00787WT3CGjXc+nWKmEb +XeYKyTfa1OMe0I6euqwOIOmjXVBUZxX0z09E+rkIWWB5mbchYUiNASgVpzTa/B+0 +bW9JiJuMw4UhIUPn9nmXOUE797s7Fsv7bpJWzHLePorni3VVczBblPkUdIGccARI +9ayViuwFJVy5+yQxu8oYk0DSsfL2z6o0lfZ4xIlak7HYyAhqH2e+Q73gH/f4+7iC +5NUexWV8qk/i706yZKUSHjYb44eeouZyntm2bDYjWdXLtkRJlAiEpPD+LpZZTAs= +=r5q8 +-----END PGP SIGNATURE----- Added: release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar.md5 ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar.md5 (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar.md5 Tue Jun 20 11:21:23 2017 @@ -0,0 +1 @@ +7e3376a6243c990013b109535ad9a83f \ No newline at end of file Added: release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar.sha1 ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar.sha1 (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4-sources.jar.sha1 Tue Jun 20 11:21:23 2017 @@ -0,0 +1 @@ +5ee3b670d7b27f6fdedb00a590574d6bfca2a8e6 \ No newline at end of file Added: release/sling/org.apache.sling.resourcemerger-1.3.4.jar ============================================================================== Binary file - no diff available. Propchange: release/sling/org.apache.sling.resourcemerger-1.3.4.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.resourcemerger-1.3.4.jar.asc ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4.jar.asc (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4.jar.asc Tue Jun 20 11:21:23 2017 @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJZQ+PZAAoJENd0LVhFXsx8gDQIAKNeYw757y0/Rlkv4vUJXJrF ++WmEREwcy6XqL8abllZhlIQ8IiIHkgPwnzmiWDKCnJXHY/jupaxwEF9ZqT5L+bZx +6zN/972xgLchozrpnT0L/LPCYdcTBU6rFxzJ99C/UvP9q4zNi4lSAvPumeyxv80Y +rcs2ZAeYn2zairIeHkH4AUDTyuuiNXo4VCNdmZe7Aa77jjaC3HJcF3wkVT2izGgV +hDNpO5xJtyV9vI/WJ6o/997aoolGx/IVmip8RTP9ivWhwqDrXEIp9Kv0vFVSt394 +wvRCulfoNdfqAOIk8VhXcA6YEQKbtELHLOh/fff1lqI1gh4fvlDMY/XIiEBiYwo= +=FT7L +-----END PGP SIGNATURE----- Added: release/sling/org.apache.sling.resourcemerger-1.3.4.jar.md5 ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4.jar.md5 (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4.jar.md5 Tue Jun 20 11:21:23 2017 @@ -0,0 +1 @@ +f6860b5546baa13eb1b874e02566df6d \ No newline at end of file Added: release/sling/org.apache.sling.resourcemerger-1.3.4.jar.sha1 ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4.jar.sha1 (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4.jar.sha1 Tue Jun 20 11:21:23 2017 @@ -0,0 +1 @@ +900877f03608af2a39c355de38a59536a4801f77 \ No newline at end of file Added: release/sling/org.apache.sling.resourcemerger-1.3.4.pom ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4.pom (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4.pom Tue Jun 20 11:21:23 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.4</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.4</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourcemerger-1.3.4</developerConnection> + <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.resourcemerger-1.3.4</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.4.pom.asc ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4.pom.asc (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4.pom.asc Tue Jun 20 11:21:23 2017 @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJZQ+PaAAoJENd0LVhFXsx8aoQIAI6tFavCdU2B9IvCKfdzCqRM +l61s1TcwK4tUJTDW5TvF3xlwT/ce7YHa12E2z3ME2ClPAIGqKf8mO1eyFTWhsAUo +9adjpRWCBRRR6kgERGGA3mJEnlzu2paWlyXzkkYLjTv8iQTn8ikubeJdlE7aQ3vy +Ko1HBrtf5f0hDEB71iTzNrXUrGxJS7JY6DbLQo7OjvVqC++3zaBL4JANDf6ZuTVF +yL8xsoTcEuWtt0F5b1ieo6s1T/teUrdfO7YgnGmkYy6n53PlaADg9yDiOL1raYvu +ihm3O3QR1dqKE0eS28/3HBi7tCqptxF4YmsF/4YdtFRqyBXm39sC/7FKnw7YqZk= +=8p7b +-----END PGP SIGNATURE----- Added: release/sling/org.apache.sling.resourcemerger-1.3.4.pom.md5 ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4.pom.md5 (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4.pom.md5 Tue Jun 20 11:21:23 2017 @@ -0,0 +1 @@ +c883d5d055ef9c6bee6e1b7c04cc3472 \ No newline at end of file Added: release/sling/org.apache.sling.resourcemerger-1.3.4.pom.sha1 ============================================================================== --- release/sling/org.apache.sling.resourcemerger-1.3.4.pom.sha1 (added) +++ release/sling/org.apache.sling.resourcemerger-1.3.4.pom.sha1 Tue Jun 20 11:21:23 2017 @@ -0,0 +1 @@ +c2935e0075ea8b846448a4a88c33e77facfffc16 \ No newline at end of file