Author: kwin
Date: Mon Mar 15 09:52:59 2021
New Revision: 46623
Log:
Release org.apache.sling.resourcemerger 1.4.0
Added:
release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar (with
props)
release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar.asc
release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar.md5
release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar.sha1
release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip
(with props)
release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip.asc
release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip.md5
release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip.sha1
release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar (with
props)
release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar.asc
release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar.md5
release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar.sha1
release/sling/org.apache.sling.resourcemerger-1.4.0.jar (with props)
release/sling/org.apache.sling.resourcemerger-1.4.0.jar.asc
release/sling/org.apache.sling.resourcemerger-1.4.0.jar.md5
release/sling/org.apache.sling.resourcemerger-1.4.0.jar.sha1
release/sling/org.apache.sling.resourcemerger-1.4.0.pom
release/sling/org.apache.sling.resourcemerger-1.4.0.pom.asc
release/sling/org.apache.sling.resourcemerger-1.4.0.pom.md5
release/sling/org.apache.sling.resourcemerger-1.4.0.pom.sha1
Added: release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar.asc Mon Mar
15 09:52:59 2021
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJgSIxgAAoJENd0LVhFXsx8k/UIAJ90DKjkpbbERCMvvJ9npZ1T
+C9YM2ZX3igvq5CD8mRF4j7Imuxdl11kRvImQkzibRA0uUblEGAiZIxbrV7uqm1zb
+VQ3O3vpOl31qqFJn/LCu11m6gm6LeEOq+nqjM+dyDU4fk4bAdan3NAklFJJkWV6s
+AAM8Hgd5SHHpzAXYomP6yNpOEi0qk9VJFqjBLLvo5n/krFl5oOJcvnN/WO27tGoD
+2bdKZP4gTN08a4Rrw2TSkjGYXZOhs97jYdHSi6YwIClMRPkEGEwp8M1xtN4vmt2V
+yMBnhq8Rt1IoZnHRNUgV+BVHWCxh78MC2IXy2PkZ/Wa4FvgwUHbhbScLzvS01+M=
+=lI9M
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar.md5 Mon Mar
15 09:52:59 2021
@@ -0,0 +1 @@
+17904f0c8a17d1a642562ec39a0116a6
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0-javadoc.jar.sha1 Mon
Mar 15 09:52:59 2021
@@ -0,0 +1 @@
+9d55447eecec48f3bee2757177450c29e363a70c
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip
==============================================================================
Binary file - no diff available.
Propchange:
release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip.asc
(added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip.asc
Mon Mar 15 09:52:59 2021
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJgSIxgAAoJENd0LVhFXsx80xEIAO1r4vRo34CunDmRJeoKkpNa
+0TvkB4EsIgxn4omFJLRZcToSdGXFuC2kJkR5uqfH0TS0zjGs2oNrFiIjNDGGLMZN
+teognegqOt7/8MoZcQbDvfNN/LlZ9LUX09V1hLS3h557iF2uW58pmTv/jJc2VLEV
+TmtEpdyxX3RfWMYBFqinVuumWu85k8aBlxOEmKVJ9TqbKpHiDqwYBM45GySK8zBU
+DnctLwDEoYOQwA2Dw0mHKcNKToiJE43d+B8Rh78B7py7IvD+btpxrnSAJPymZvAf
+MSCfhC3B5oMC4zxuF76DzZ79Bc6ddO5dK6ftWz+0XLIptgBolS4qSrj5anW51kE=
+=1ht0
+-----END PGP SIGNATURE-----
Added:
release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip.md5
(added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip.md5
Mon Mar 15 09:52:59 2021
@@ -0,0 +1 @@
+3980503813a0c97df823da9113849ea0
\ No newline at end of file
Added:
release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip.sha1
(added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0-source-release.zip.sha1
Mon Mar 15 09:52:59 2021
@@ -0,0 +1 @@
+6339d0a4ae9fed66a71dfe29a01e060daa9e1141
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar.asc Mon Mar
15 09:52:59 2021
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJgSIxgAAoJENd0LVhFXsx8jfcIAJTJDcaSv8VZyDFQKcnuFDaT
+2ID3jImaeD6bhLByKuXEWTkbj1fsTOh6DlHkU3QVx1n7GE0rNVnNkeSa1IJNAZQX
+bm6GnXUZ1Si/XBYUaLouLC0saGkKAj3tKgIP+mDABX0mAAz5sMZdmPrwW4sc7cPn
+SZICsiD5xOgvTxj62SZSJIDAE61bYBO9VplDVmdVJiqywSCVTROJAjxxS6pzgn3D
+9O+iuPN86jTK01nNWfuFDmcPlD0A+R5Kz5Y9FOxs/H9YcVzmKhO4dTvTtr17MnSu
+ThGw9AZR5u4P1VH3iiuys2PL4gsGRVqXlb/asHRWm40VwRq5Ux82FE95MMJdux0=
+=qlIf
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar.md5 Mon Mar
15 09:52:59 2021
@@ -0,0 +1 @@
+00dab00ff017e31ba942ee378d8597bb
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0-sources.jar.sha1 Mon
Mar 15 09:52:59 2021
@@ -0,0 +1 @@
+420cbe9cf1fdca3647896bb3410396924ce5e119
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.4.0.jar
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.resourcemerger-1.4.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: release/sling/org.apache.sling.resourcemerger-1.4.0.jar.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0.jar.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0.jar.asc Mon Mar 15
09:52:59 2021
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJgSIxfAAoJENd0LVhFXsx8OTUH/14J1SHbCOhArMF62dJrf7A6
+PUfH0n76y6Q1z28OZt8uAAF0WLVFDczZwS3i3ewuSnvJR7v0D4ViJV4tXOV+WLGx
+MkJXfEES7O0l6FnIdLFSBkaPEhnD9PT8+HIzrCjLnJ2l5PVq9G3lhKx0Zb7mlQI3
+GP8ISN16ua6lcjfA0vKQsqLhKBUBVqtvop+JPvcWcWqWyJtsEmqzWFJelm7ApnJp
+6u40YHdT2rts3dpVqBe9oDb2vvkKolz/SrhyUN0O/+dC5cY904GzXo9rFIXRdWzd
+iG9G4A9Lwetqv0JMod4865wrofJX9xoXLMihg0oSP8cm4YbBQjaiDoykCxUNNz8=
+=1jbb
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.4.0.jar.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0.jar.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0.jar.md5 Mon Mar 15
09:52:59 2021
@@ -0,0 +1 @@
+eb96dc53d094869d05d57223f2738492
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.4.0.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0.jar.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0.jar.sha1 Mon Mar 15
09:52:59 2021
@@ -0,0 +1 @@
+e7ec6d55627c9b2ca3b9a4eea8a3549cdb11e2db
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.4.0.pom
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0.pom (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0.pom Mon Mar 15 09:52:59
2021
@@ -0,0 +1,130 @@
+<?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-bundle-parent</artifactId>
+ <version>41</version>
+ <relativePath />
+ </parent>
+
+ <artifactId>org.apache.sling.resourcemerger</artifactId>
+ <version>1.4.0</version>
+
+ <name>Apache Sling Resource Merger</name>
+ <description>
+ This bundle provides services to merge resources.
+ </description>
+
+ <properties>
+ <sling.java.version>8</sling.java.version>
+
<project.build.outputTimestamp>2021-03-10T09:06:58Z</project.build.outputTimestamp>
+ </properties>
+
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-resourcemerger.git</url>
+ <tag>org.apache.sling.resourcemerger-1.4.0</tag>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</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>
+ <dependency>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <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>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: release/sling/org.apache.sling.resourcemerger-1.4.0.pom.asc
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0.pom.asc (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0.pom.asc Mon Mar 15
09:52:59 2021
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJgSIxgAAoJENd0LVhFXsx895sH/0flCtjwUa/AyQAc7rVOX1UT
+I+uAzUigKxwRE2556Dotlgx3qLSAYvEnJqBcyCaVEQptaUSUnk2KpSkllg0n8UbF
+m6gfBC6oiS67vq6IBM5KQc5IO3jWo4ig8efCt0uWgkFKS4sgp31yl3+ZSvJ4pxtM
+KwQPlIn+oof6qFpL5hH9/CaUg2WJNZe15NaUflmK4JUwx9MrdPcAyC2GeImzzUDW
+UM9xv4zssoEDdS+Zgeg1WPQRPLMZrK9oEmoEgFZ950Ys8RwUBLhTlGwKiK4Rw00Q
+rOHMzwvKCMxerHUi7OmzUZ7feqzgh0AL8/qzqR0lOSvYPnsJ7WL5m4nSBQwvHQ8=
+=7Brh
+-----END PGP SIGNATURE-----
Added: release/sling/org.apache.sling.resourcemerger-1.4.0.pom.md5
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0.pom.md5 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0.pom.md5 Mon Mar 15
09:52:59 2021
@@ -0,0 +1 @@
+0918f992c3abf65c35afb6c21defeb77
\ No newline at end of file
Added: release/sling/org.apache.sling.resourcemerger-1.4.0.pom.sha1
==============================================================================
--- release/sling/org.apache.sling.resourcemerger-1.4.0.pom.sha1 (added)
+++ release/sling/org.apache.sling.resourcemerger-1.4.0.pom.sha1 Mon Mar 15
09:52:59 2021
@@ -0,0 +1 @@
+457fd77a43700d189fae614aaf53c9a731bbd7e7
\ No newline at end of file
