You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2021/06/07 13:33:41 UTC

svn commit: r48178 - /release/sling/

Author: stefanegli
Date: Mon Jun  7 13:33:41 2021
New Revision: 48178

Log:
Release Apache Sling Discovery Oak 1.2.34

Added:
    release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar   (with props)
    release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar.asc
    release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar.md5
    release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar.sha1
    release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip   (with props)
    release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip.asc
    release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip.md5
    release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip.sha1
    release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar   (with props)
    release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar.asc
    release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar.md5
    release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar.sha1
    release/sling/org.apache.sling.discovery.oak-1.2.34.jar   (with props)
    release/sling/org.apache.sling.discovery.oak-1.2.34.jar.asc
    release/sling/org.apache.sling.discovery.oak-1.2.34.jar.md5
    release/sling/org.apache.sling.discovery.oak-1.2.34.jar.sha1
    release/sling/org.apache.sling.discovery.oak-1.2.34.pom   (with props)
    release/sling/org.apache.sling.discovery.oak-1.2.34.pom.asc
    release/sling/org.apache.sling.discovery.oak-1.2.34.pom.md5
    release/sling/org.apache.sling.discovery.oak-1.2.34.pom.sha1

Added: release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar
==============================================================================
Binary file - no diff available.

Propchange: release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar.asc
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar.asc (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar.asc Mon Jun  7 13:33:41 2021
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQIcBAABCgAGBQJguPQlAAoJEFDQukICp5Zt2goP/0UwLH6MKAL99OJG91zjqbVW
+LjXVtNsO+4aQXmBA2LCK6F9kaSgRfZIcRr1woofjwxIWEzBLpDmebrwRjsoydRR1
+hvP80ZT0FoUZp1Eyy6Z61uxfIpTTn/SyjKEhxByqBM1NKf7Z483NgLXNUnJawYuH
+jy9lI2KVmbU3b7wxZosL6jcPfZZsLnjOf8dwcDMPo7K6p054U3ZFbxpVd9HJGcsg
+vjkYZ/XuLjQKvnTpqEczxiDxGGSVWDJGFawJbSXiBd9e7EHAaNbPx5ZnSXkS/i/t
+OUfS8zvMBAB/5Yok3xUoeXOVcMZ9VdRkPp9+q0zJlIvJCOK/9My/BwxwQ4A6lxCG
+ojw97GEbWGIza8kNd2hSJdFL3u+wHAfxPyaQ37dwAP2UsZVp40cWO/8qlTKArU0n
+WxF4jMh3Jb8MkOS/NKQv+uNOOH4FJ/Yye9tXjCUDkJF7jjGILknQgrosq31vuxtM
+SRKMAogssOLW613CMKhqGlKmQrgRw7FEuMsE+3u4FfmS9HrHD4BFeIV5Z9dQRdGF
+01AGdrC8cflV8OlU0AXsA+jBAWsulRKubVoJE5evpBe7D4bgjmWCaYPOzAjRjBwC
+uu4ZsgxD1SZ7fpnNmeQmgYr9S9j04lpti8xnnO9Ep88ZqAciY37y7CY6aL6Knyik
+v0P9BzkSb60/hD9qY4xE
+=FeeS
+-----END PGP SIGNATURE-----

Added: release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar.md5
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar.md5 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar.md5 Mon Jun  7 13:33:41 2021
@@ -0,0 +1 @@
+05551d28ec68b74e460f39abb669739e
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar.sha1 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34-javadoc.jar.sha1 Mon Jun  7 13:33:41 2021
@@ -0,0 +1 @@
+362096f256784538a186e809a94a4605e80055af
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip
==============================================================================
Binary file - no diff available.

Propchange: release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip.asc
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip.asc (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip.asc Mon Jun  7 13:33:41 2021
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQIcBAABCgAGBQJguPQkAAoJEFDQukICp5ZtxsAP/0vnlU5SMEKTnCGid8F+9dr6
+BNlpByGUrk2YeihQwcY90ssOGkhk24cBx7OoXrC0us+9mx8jJCpNF5i29FEB1Glz
+5bkwnmgGvFYFNkkEEHC8AkokMc46Tg7r7xdpO9ebguTpwwg3bYq6SI3dJgCBVueW
+nNbtodFmyxgLDBn0kNhoAjXehDol+KPhVAyCUoxYsiuKJRbE1K2VlMd9mlZ3hQjh
+DUtE362FZdBkxpptUllAZBkBk8sKBAzp9XJquhpRo1oK14NBDjAQEMtvHRt2Ko4T
+WReF6nhj8z6UlL9JqEIdVo0J45YkYPZ4tWh2GaiAqq5+prYPJ0Udk3UjpPC+w6Dp
+5uY/IE2TY6tDvwit1hlYEy/dwKD46awHQsrsguzapt6neCUsMiUsyrghSrWsiLt/
+rT2ukYUSgL/78TFG0xqjFFXPhPBCvK9ZjIW9vFoqk72MmBr+IivNlT3qJBr4MlRx
+idi4ByVirS+NAIZmLpuR6HsYWamLXZhJW0Cq6kQ+VEL7PEk4/kSZZdOuJIXkSWLr
+8edDhSH8MkfKm5ro4FpfurI514i86u7RATgLuczkeQGArn0BUA3h2hLniGA1VbEl
+HdCk6eEg7oef3uguhEiIkfU22zkX0yOoPJDBdxcu6vLcu1mZRsQzfYLMCEXH08TQ
+pglBD9iNr3/wEs9Qt/by
+=zPoT
+-----END PGP SIGNATURE-----

Added: release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip.md5
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip.md5 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip.md5 Mon Jun  7 13:33:41 2021
@@ -0,0 +1 @@
+100b98cf1a25c3c6b27bef7689bcff2b
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip.sha1
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip.sha1 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34-source-release.zip.sha1 Mon Jun  7 13:33:41 2021
@@ -0,0 +1 @@
+f73caaa4e0c13f99ca14a2c464b2fa4b7c12e19b
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar
==============================================================================
Binary file - no diff available.

Propchange: release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar.asc
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar.asc (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar.asc Mon Jun  7 13:33:41 2021
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQIcBAABCgAGBQJguPQlAAoJEFDQukICp5ZtZIYQALlJmB+DF8kXq9Ws00SEzV5o
+H1xV0XuRdSN2ZYgKwK4BikpXL1TdbmXF8szk+nKrbhOzQhOPqSuxjnGx96uY4VOQ
+5ufgXvp62Im3VwuCQBm3kHE02D+7Usj7Pn2RW+GZRqCVxJtRcdisWwIMfO00byzs
+BaDPHWRNnqgLchIS5j8Gckh87VXnfNpG7mfaK+0T2GPPwT2n55mTVMvAs91DMsjt
+w3Rrm6vzqDwEf3nASaqOj4/FHur3BZkdxmHYGn/bVsciSN/8j42s6jdi+G3bHCF8
+uUiBtK94JgB2VvOGq4vft54vk9ZUuRqtaGqn9/zYggaWVk+yxoCdJPhVyzd5Gm4P
+9l+G35W1Z6GIozcZOg1FAgaYCdQ40G9thyBq8ox7YTYrAkSdoxony4vLsduKKop7
+8psRchN0uOZwnN7pt+yo0moLZm8G+fAVcj5QrApXnvN59qU63neNePTQHI2IzBiB
+/0bq3pleECU2z7HxRBqiOQzWbgJxyzIYSz5BaAJ5iNL360Nus8prVmTWOItUHJld
+B2HCasgshkXWWfJn5fYkYBTrqGK3IIuW5IDNFVZqOIFXUaQv0AThLDqCEp4b/qVC
+mNOV3Txoeh6mtkk743VPczR10f8mLbh1JIuq42x5Kk/xieNNYYX4Z8Ay3QBmjMES
+Ve4NRBMtc+vUxhwcs00f
+=0VaV
+-----END PGP SIGNATURE-----

Added: release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar.md5
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar.md5 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar.md5 Mon Jun  7 13:33:41 2021
@@ -0,0 +1 @@
+e65eab000cd42e45cff2d182bb3175a4
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar.sha1 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34-sources.jar.sha1 Mon Jun  7 13:33:41 2021
@@ -0,0 +1 @@
+75a3f1b4521dd31c76fbdb783c1a72b0424a9a70
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.oak-1.2.34.jar
==============================================================================
Binary file - no diff available.

Propchange: release/sling/org.apache.sling.discovery.oak-1.2.34.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: release/sling/org.apache.sling.discovery.oak-1.2.34.jar.asc
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34.jar.asc (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34.jar.asc Mon Jun  7 13:33:41 2021
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQIcBAABCgAGBQJguPQkAAoJEFDQukICp5ZtH7MP/Rn0ZeeJCINB1x2EPBnwy07J
+5FSRyh6ggHji5ecbe8Chfa5TdS/9IXOK6VxzJgrU/ePdgOuokNqybiJh05/Ce0Ko
+S9Z2mIT0xXYT4T/8/gcU6NYCjt3PWZqbog1n/yzzJK9BBlG6rC2wrxXOkmD94HPY
+ucJuAsUEGPzY1jmJQ+QCd3HMrNkaVFeLGer2TAhAQgcwMVe3cTz7DW10SlFGJFVQ
+anCHivNi5YlA6nUOObZBNkdqiavK76ZCfhKaMZGJxWvDuiCsw7/e09Zx6tK5uGZO
+DA3VS6D7lwUHMKCfV3dsoRsa7yUpJDKBwg45YEbzpEeT0eSgfM5qn4TlUTQCmh9N
+mhgmdOUtLlLDKw6lrr5bkKSBfyMhumFU8Ru+mrkb+ShUbW004gzm7XHnSFhaghwH
+UZFq5bcL0DF5sFLVD+sIxWTWXIEbO6OfoBbdToK0Fbghg7V0nAITldS8+PgsDhuh
+t5CebR0TkZnLqHxBrQcJmXw5UaZHNRQqlikYZDtEGjsJmXi80UXHSOOz/9C8iQJ8
+XEyndS8Z1t5XtVhd9cBKbedWqab4uKL79kMS188+YIj2GeqDSGqE7v60C3Eng+ak
+afZ7q2aw29nylTy4mqiFMVxL78xid7XWvJcr50MUChMJO3kZYMUA4rRDmJTlIEbZ
+3HBEtQZmlgn4cHgn1g1X
+=kiek
+-----END PGP SIGNATURE-----

Added: release/sling/org.apache.sling.discovery.oak-1.2.34.jar.md5
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34.jar.md5 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34.jar.md5 Mon Jun  7 13:33:41 2021
@@ -0,0 +1 @@
+c2b821d0569544c229494963fe21a8b4
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.oak-1.2.34.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34.jar.sha1 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34.jar.sha1 Mon Jun  7 13:33:41 2021
@@ -0,0 +1 @@
+c8cd5596f1b4d1266d5e8036801d6af580af8df8
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.oak-1.2.34.pom
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34.pom (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34.pom Mon Jun  7 13:33:41 2021
@@ -0,0 +1,431 @@
+<?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>29</version>
+        <relativePath />
+    </parent>
+
+    <artifactId>org.apache.sling.discovery.oak</artifactId>
+    <packaging>bundle</packaging>
+    <version>1.2.34</version>
+
+    <name>Apache Sling Oak-Based Discovery Service</name>
+    <description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
+
+    <properties>
+      <jackrabbit.version>2.12.2</jackrabbit.version>
+      <oak.version>1.4.4</oak.version>
+      <!-- by default Slow tests are excluded - use -PincludeSlowTests to include them -->
+      <sling.excluded.surefire.groups>org.apache.sling.commons.testing.junit.categories.Slow</sling.excluded.surefire.groups>
+      <sling.java.version>7</sling.java.version>
+    </properties>
+
+    <scm>
+        <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git</connection>
+        <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git</developerConnection>
+        <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-discovery-oak.git</url>
+      <tag>org.apache.sling.discovery.oak-1.2.34</tag>
+  </scm>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.6</version>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <configuration>
+                            <propertyName>jacoco.command</propertyName>
+                        </configuration>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M4</version>
+                <configuration>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <argLine>${jacoco.command} -Xmx2048m</argLine>
+                    <excludedGroups>${sling.excluded.surefire.groups}</excludedGroups>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                  <instructions>
+                    <Import-Package>
+                      <!-- WebConsole support is optional -->
+                      org.apache.felix.webconsole;resolution:=optional,
+                      org.apache.felix.hc.api;resolution:=optional,
+                      *
+                    </Import-Package>
+		            <Embed-Dependency>
+		              commons-net;inline=org/apache/commons/net/util/SubnetUtils*
+		            </Embed-Dependency>
+                <Export-Package>
+                  !org.apache.sling.discovery.oak
+                </Export-Package>
+                <!-- remove when upgrading to bnd Maven plugin -->
+                <Provide-Capability><![CDATA[
+                  osgi.service;objectClass:List<String>="org.apache.sling.discovery.oak.Config,org.apache.sling.discovery.base.connectors.BaseConfig,org.apache.sling.discovery.commons.providers.spi.base.DiscoveryLiteConfig"
+                ]]></Provide-Capability>
+		          </instructions>
+		        </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>set-bundle-required-execution-environment</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <exportAntProperties>true</exportAntProperties>
+                            <target>
+                                <!--  apply fix as suggested in this comment:
+                                      https://issues.apache.org/jira/browse/MANTRUN-200?focusedCommentId=17016706&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-17016706 -->
+                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
+                                <script language="javascript" classpath="${plugin_classpath}">var System = java.lang.System;
+                                            var bree = "JavaSE-1.6";
+                                            var animalSnifferSignaturesVersion = "6";
+                                            var slingJavaVersion = System.getProperty("sling.java.version");
+                                            if (!slingJavaVersion) {
+                                                slingJavaVersion = project.getProperty("sling.java.version");
+                                            }
+                                            if (slingJavaVersion == "7") {
+                                                animalSnifferSignaturesVersion = "7";
+                                                bree = "JavaSE-1.7";
+                                                System.out.println("Setting Bundle-RequiredExecutionEnvironment=" + bree + " from sling.java.version=" + slingJavaVersion);
+                                            } else if ( slingJavaVersion == "8") {
+                                                animalSnifferSignaturesVersion = "8";
+                                                bree = "JavaSE-1.8";
+                                                System.out.println("Setting Bundle-RequiredExecutionEnvironment=" + bree + " from sling.java.version=" + slingJavaVersion);
+                                            } else if (slingJavaVersion != "6") {
+                                                System.out.println("Unsupported sling.java.version=" + slingJavaVersion + "; must be 6, 7 or 8.");
+                                                throw "sling.java.version must be 6, 7 or 8";
+                                            }
+                                            project.setProperty("sling.bree", bree);
+                                            project.setProperty("sling.animalSignatures.version", animalSnifferSignaturesVersion);</script>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.ant</groupId>
+                        <artifactId>ant-apache-regexp</artifactId>
+	                    <version>1.7.1</version>
+                        <scope>runtime</scope>
+                    </dependency>
+                    <dependency>
+                        <groupId>jakarta-regexp</groupId>
+                        <artifactId>jakarta-regexp</artifactId>
+                        <version>1.4</version>
+                        <scope>compile</scope>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <!-- when -PincludeSlowTests is set, the Slow tests should also be executed, 
+                hence unsetting the category excludes 'sling.excluded.surefire.groups' to 
+                achieve that. -->
+            <id>includeSlowTests</id>
+            <properties>
+                <sling.excluded.surefire.groups />
+            </properties>
+        </profile>
+    </profiles>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>biz.aQute</groupId>
+            <artifactId>bndlib</artifactId>
+            <version>1.50.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+	        <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+		<dependency>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.jcr.api</artifactId>
+			<version>2.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.jcr</groupId>
+			<artifactId>jcr</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.jackrabbit</groupId>
+			<artifactId>jackrabbit-api</artifactId>
+			<version>${jackrabbit.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.commons.osgi</artifactId>
+			<version>2.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.settings</artifactId>
+			<version>1.2.2</version>
+            <scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.discovery.api</artifactId>
+			<version>1.0.0</version>
+            <scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.discovery.commons</artifactId>
+			<version>1.0.24</version>
+            <scope>provided</scope>
+		</dependency>
+        <!-- besides including discovery.commons' normal jar above, 
+              for testing a few test helper classes are also reused.
+              in order to achieve that, also adding a test/test-jar dependency: --> 
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.discovery.commons</artifactId>
+            <version>1.0.24</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+		<dependency>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.discovery.base</artifactId>
+			<version>2.0.10</version>
+            <scope>provided</scope>
+		</dependency>
+        <!-- besides including discovery.base' normal jar above, 
+              for testing a few test helper classes are also reused.
+              in order to achieve that, also adding a test/test-jar dependency: --> 
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.discovery.base</artifactId>
+            <version>2.0.10</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </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.scheduler</artifactId>
+            <version>2.5.0</version>
+            <scope>provided</scope>
+        </dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.webconsole</artifactId>
+			<version>3.0.0</version>
+            <scope>provided</scope>
+		</dependency>
+	    <dependency>
+	      <groupId>org.eclipse.jetty</groupId>
+	      <artifactId>jetty-servlet</artifactId>
+	      <version>8.1.2.v20120308</version>
+	      <scope>test</scope>
+	    </dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient-osgi</artifactId>
+			<version>4.3.5</version>
+			<scope>provided</scope>
+		</dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.3</version>
+            <scope>provided</scope>
+        </dependency>
+      <!-- Testing -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit-addons</groupId>
+            <artifactId>junit-addons</artifactId>
+            <version>1.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jmock</groupId>
+            <artifactId>jmock-junit4</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.9.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+        	<groupId>org.apache.sling</groupId>
+        	<artifactId>org.apache.sling.commons.testing</artifactId>
+        	<version>2.0.26</version>
+        	<scope>test</scope>
+            <exclusions>
+                <!-- slf4j simple implementation logs INFO + higher to stdout (we don't want that behaviour) -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+                <!--  also excluding jcl-over-slf4j as we need a newer vesion of this which is compatible with slf4j 1.6 -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        
+        <!-- using log4j under slf4j to allow fine-grained logging config (see src/test/resources/log4j.properties) -->
+        <dependency>
+        	<groupId>org.slf4j</groupId>
+        	<artifactId>slf4j-log4j12</artifactId>
+        	<version>1.7.5</version>
+        	<scope>test</scope>
+        </dependency>
+        <dependency>
+        	<groupId>org.apache.sling</groupId>
+        	<artifactId>org.apache.sling.jcr.resource</artifactId>
+        	<version>2.3.8</version>
+        	<scope>test</scope>
+        </dependency>
+	    <dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.13</version>
+			<scope>test</scope>
+	    </dependency>
+        <dependency>
+        	<groupId>org.apache.sling</groupId>
+        	<artifactId>org.apache.sling.commons.threads</artifactId>
+        	<version>3.1.0</version>
+        	<scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.testing.tools</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.2.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+        	<groupId>org.apache.jackrabbit</groupId>
+        	<artifactId>jackrabbit-jcr-commons</artifactId>
+        	<version>${jackrabbit.version}</version>
+        	<scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-core</artifactId>
+            <version>${oak.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-jcr</artifactId>
+            <version>${oak.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+        	<groupId>org.apache.felix</groupId>
+        	<artifactId>org.apache.felix.healthcheck.api</artifactId>
+        	<version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.commons.johnzon</artifactId>
+            <version>1.0.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

Propchange: release/sling/org.apache.sling.discovery.oak-1.2.34.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Added: release/sling/org.apache.sling.discovery.oak-1.2.34.pom.asc
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34.pom.asc (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34.pom.asc Mon Jun  7 13:33:41 2021
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQIcBAABCgAGBQJguPQkAAoJEFDQukICp5ZtBEgP/i05H7qVB/uY4vrPifChopgW
+HBGIdrty2n6koe6rercgg1xfufPhiV2P6oeXyOV9OWqERM6Op1SvmM0C9ewjOFYX
+7Ehd7raNDpn1QIbRthhxF4BTHMmsgWOeY35qS+/C+NCOJBi0wI8XlPVg0o8EFslc
+GdbPk+FtILwjTK19ufRf5uNBYjOwXSO3f5NCnJJfOH7A+sLV/IGJof3meZO4hzdP
+30Mf1Z4bOZM7S7qpS7r48ES+hAmYA7lpaclM6c5tagjRWX4hvgUPm7e86NvP12bO
+GQyM1Z5JlziRYg8TK7g5tKg91au3yekK1lLYoqB+mEH6Y7F5EmMo2V/6splfRo4O
+Hc53cJZSv0dPIKi5bli6D61sslAqHU+BRum7c9GjA5vLuoOpYj+Y9EAwW74JahDJ
+NOi7DigWyvUwbxaknfI4QRFuVDX3ga1JGF1N3R7tXXrcitf7Vf2pHZfLAABvsK1P
+pumRottJoQgbyNh2xx3YV5EwAj0/a/AkFIhsqESMD/hnoaoDlYKDyiZ7pD/VpdM5
+us67kzfgGnKsbCYjORR1uKY5kiZZiOZEWMui0YWLCBYaIrrrkCicmqcuSPe2J1FT
+L0ZNcA1iPcNr19bd0bk6fqM0MA8G1wlymzgPhTtGbGcIkW5mw8LNXdbHmol5PXh+
+6F62aYXQiKfI+NXdDSVh
+=IO4S
+-----END PGP SIGNATURE-----

Added: release/sling/org.apache.sling.discovery.oak-1.2.34.pom.md5
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34.pom.md5 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34.pom.md5 Mon Jun  7 13:33:41 2021
@@ -0,0 +1 @@
+19725db8138d899b449b0974ee805f1e
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.oak-1.2.34.pom.sha1
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.34.pom.sha1 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.34.pom.sha1 Mon Jun  7 13:33:41 2021
@@ -0,0 +1 @@
+0007df847f221d53d208e5b105dc7b20d92b7159
\ No newline at end of file