Author: rombert
Date: Fri Aug 31 15:54:28 2018
New Revision: 29065
Log:
discovery.oak 1.2.28
Added:
release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar (with
props)
release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar.asc (with
props)
release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar.md5
release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar.sha1
release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip
(with props)
release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip.asc
(with props)
release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip.md5
release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip.sha1
release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar (with
props)
release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar.asc (with
props)
release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar.md5
release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar.sha1
release/sling/org.apache.sling.discovery.oak-1.2.28.jar (with props)
release/sling/org.apache.sling.discovery.oak-1.2.28.jar.asc (with props)
release/sling/org.apache.sling.discovery.oak-1.2.28.jar.md5
release/sling/org.apache.sling.discovery.oak-1.2.28.jar.sha1
release/sling/org.apache.sling.discovery.oak-1.2.28.pom
release/sling/org.apache.sling.discovery.oak-1.2.28.pom.asc (with props)
release/sling/org.apache.sling.discovery.oak-1.2.28.pom.md5
release/sling/org.apache.sling.discovery.oak-1.2.28.pom.sha1
Removed:
release/sling/org.apache.sling.discovery.oak-1.2.22-javadoc.jar
release/sling/org.apache.sling.discovery.oak-1.2.22-javadoc.jar.asc
release/sling/org.apache.sling.discovery.oak-1.2.22-javadoc.jar.md5
release/sling/org.apache.sling.discovery.oak-1.2.22-javadoc.jar.sha1
release/sling/org.apache.sling.discovery.oak-1.2.22-source-release.zip
release/sling/org.apache.sling.discovery.oak-1.2.22-source-release.zip.asc
release/sling/org.apache.sling.discovery.oak-1.2.22-source-release.zip.md5
release/sling/org.apache.sling.discovery.oak-1.2.22-source-release.zip.sha1
release/sling/org.apache.sling.discovery.oak-1.2.22-sources.jar
release/sling/org.apache.sling.discovery.oak-1.2.22-sources.jar.asc
release/sling/org.apache.sling.discovery.oak-1.2.22-sources.jar.md5
release/sling/org.apache.sling.discovery.oak-1.2.22-sources.jar.sha1
release/sling/org.apache.sling.discovery.oak-1.2.22.jar
release/sling/org.apache.sling.discovery.oak-1.2.22.jar.asc
release/sling/org.apache.sling.discovery.oak-1.2.22.jar.md5
release/sling/org.apache.sling.discovery.oak-1.2.22.jar.sha1
release/sling/org.apache.sling.discovery.oak-1.2.22.pom
release/sling/org.apache.sling.discovery.oak-1.2.22.pom.asc
release/sling/org.apache.sling.discovery.oak-1.2.22.pom.md5
release/sling/org.apache.sling.discovery.oak-1.2.22.pom.sha1
Added: release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar
------------------------------------------------------------------------------
svn:mime-type = application/zip
Added: release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar.asc
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar.asc
------------------------------------------------------------------------------
svn:mime-type = application/pgp-signature
Added: release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar.md5
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar.md5 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar.md5 Fri Aug
31 15:54:28 2018
@@ -0,0 +1 @@
+ae8cf5a5b4cb5cf6af35ca0e48c00bf8
\ No newline at end of file
Added: release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar.sha1 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.28-javadoc.jar.sha1 Fri
Aug 31 15:54:28 2018
@@ -0,0 +1 @@
+1df7335c267d2cb376aefe3885cb9bb746b20e63
\ No newline at end of file
Added: release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip
==============================================================================
Binary file - no diff available.
Propchange:
release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip
------------------------------------------------------------------------------
svn:mime-type = application/zip
Added:
release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip.asc
==============================================================================
Binary file - no diff available.
Propchange:
release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip.asc
------------------------------------------------------------------------------
svn:mime-type = application/pgp-signature
Added:
release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip.md5
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip.md5
(added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip.md5
Fri Aug 31 15:54:28 2018
@@ -0,0 +1 @@
+c041a5f05e3b3db00735b20fb4f35027
\ No newline at end of file
Added:
release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip.sha1
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip.sha1
(added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.28-source-release.zip.sha1
Fri Aug 31 15:54:28 2018
@@ -0,0 +1 @@
+862540ddcaf85df9fa4ddecd3b7c5359d6844883
\ No newline at end of file
Added: release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar
------------------------------------------------------------------------------
svn:mime-type = application/zip
Added: release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar.asc
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar.asc
------------------------------------------------------------------------------
svn:mime-type = application/pgp-signature
Added: release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar.md5
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar.md5 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar.md5 Fri Aug
31 15:54:28 2018
@@ -0,0 +1 @@
+832dbe3a7f870d5c8f8746c7f8502370
\ No newline at end of file
Added: release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar.sha1 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.28-sources.jar.sha1 Fri
Aug 31 15:54:28 2018
@@ -0,0 +1 @@
+7ae6b61b79dadf98d3a133a00a8c395ed0add010
\ No newline at end of file
Added: release/sling/org.apache.sling.discovery.oak-1.2.28.jar
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.discovery.oak-1.2.28.jar
------------------------------------------------------------------------------
svn:mime-type = application/zip
Added: release/sling/org.apache.sling.discovery.oak-1.2.28.jar.asc
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.discovery.oak-1.2.28.jar.asc
------------------------------------------------------------------------------
svn:mime-type = application/pgp-signature
Added: release/sling/org.apache.sling.discovery.oak-1.2.28.jar.md5
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.28.jar.md5 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.28.jar.md5 Fri Aug 31
15:54:28 2018
@@ -0,0 +1 @@
+1b3ba5aead5e63c6814a96607c4dad38
\ No newline at end of file
Added: release/sling/org.apache.sling.discovery.oak-1.2.28.jar.sha1
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.28.jar.sha1 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.28.jar.sha1 Fri Aug 31
15:54:28 2018
@@ -0,0 +1 @@
+cf08cabee93a6fe80af9784ee55980756a21f7c7
\ No newline at end of file
Added: release/sling/org.apache.sling.discovery.oak-1.2.28.pom
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.28.pom (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.28.pom Fri Aug 31 15:54:28
2018
@@ -0,0 +1,342 @@
+<?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.discovery.oak</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.2.28</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.28</tag>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <argLine>-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>
+ <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>
+ </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>
+ </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>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </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.20</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.20</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.4</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.4</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.3.4</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>
+ </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.sling</groupId>
+ <artifactId>org.apache.sling.hc.core</artifactId>
+ <version>1.0.6</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>
Added: release/sling/org.apache.sling.discovery.oak-1.2.28.pom.asc
==============================================================================
Binary file - no diff available.
Propchange: release/sling/org.apache.sling.discovery.oak-1.2.28.pom.asc
------------------------------------------------------------------------------
svn:mime-type = application/pgp-signature
Added: release/sling/org.apache.sling.discovery.oak-1.2.28.pom.md5
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.28.pom.md5 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.28.pom.md5 Fri Aug 31
15:54:28 2018
@@ -0,0 +1 @@
+60e9bfb566f9942af03db729a47b03e1
\ No newline at end of file
Added: release/sling/org.apache.sling.discovery.oak-1.2.28.pom.sha1
==============================================================================
--- release/sling/org.apache.sling.discovery.oak-1.2.28.pom.sha1 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.28.pom.sha1 Fri Aug 31
15:54:28 2018
@@ -0,0 +1 @@
+827f595945dc71ff6ec5e0d45573b766eb15bf49
\ No newline at end of file