You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:27:10 UTC
[sling-org-apache-sling-discovery-base] annotated tag
org.apache.sling.discovery.base-2.0.4 created (now d65d6d1)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.discovery.base-2.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-base.git.
at d65d6d1 (tag)
tagging c16d73d7499aeaa0c6981d62defef98590e7f4d2 (commit)
by Stefan Egli
on Tue Jul 4 12:02:05 2017 +0000
- Log -----------------------------------------------------------------
org.apache.sling.discovery.base-2.0.4
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 976d955 SLING-5173 : introducing discovery.base which is the sharable parts of discovery.impl for discovery.oak - eg it includes topology connectors and base classes - plus it also includes many it-kind tests of discovery.impl
new 973f209 SLING-5173 : fixed getSocketConnectionTimeout to a more proper getSocketConnectTimeout
new e375668 SLING-5173 : rename commons impl packages to base as they are meant for reuse by discovery.impl and discovery.oak - plus avoid using abstract component class with scr annotations - use abstract getters instead - plus some more fine-tuning of log messages - plus make discovery.impl's Config also implement DiscoveryLiteConfig - plus properly handle binds happening before activate in DiscoveryServiceImpl
new 117b474 SLING-5173 related : minor wording fix
new c854b64 SLING-5173 : fixed test logic
new c2d2fec SLING-5196 : using maven-bundle-plugin 2.5.3 to remain backwards-compatibility
new 64c9956 SLING-5173 : using discovery.commons 1.0.0
new a40c75a [maven-release-plugin] prepare release org.apache.sling.discovery.base-1.0.0
new 2341062 [maven-release-plugin] prepare for next development iteration
new 4a397a1 update discovery dependencies to next snapshot versions until release versions available in maven central
new d54675c @no-jira : improve test stability
new 246e567 SLING-5214: include millis in testing log formats
new 6e20b46 SLING-5200 : add possibility of injecting delays into particular places during simulation, eg in resourceResolver.commit
new 3e1f21d SLING-5126 : another test variant added
new 479ea55 SLING-5126 / SLING-5195 related: fixing a test
new 65362f2 SLING-5216 / SLING-5195 : more test cases added
new 568f6d9 SLING-5216 / SLING-5195 : more test cases added
new f129180 SLING-5224 : increasing wait time from 100ms to 1000ms to avoid test failure on jenkins
new b9c1fd9 SLING-5224 : more logging for testBoostrap
new c49512e SLING-5216 : another VotingHandler test case added - changed analyzeVotings return value for this - but no other changes to the analyzeVotings algo or code
new 3279a2c SLING-5241 : increasing wait time for receiving an event from 0.5s to 1.0s
new 632c604 @no-jira using discovery.commons 1.0.2
new 983e345 [maven-release-plugin] prepare release org.apache.sling.discovery.base-1.0.2
new f6cffe9 [maven-release-plugin] prepare for next development iteration
new e892c3d @no-jira : moved discovery.commons to 1.0.3-SNAPSHOT
new ac39af5 SLING-5256 : change in localClusterSyncTokenId should always trigger a TOPOLOGY_CHANGED - ensured by adjusting ViewStateManager.onlyDiffersInProperties and DefaultTopologyView.compareTopology accordingly including new tests for both - plus added OakDiscoveryServiceTest.testDescriptorSeqNumChange to verify that discovery.oak now properly detects otherwise-equal topologies when their sequence_number==localClusterSyncTokenId differs (unlikely to happen under normal load sit [...]
new c7ead9e SLING-5260 : made loop in testConnectorSwitching4139 last 15-20sec to cope with 10sec timeout
new acd97d3 no-jira : added a 2sec wait time to increase test stability of testLongRunningListener
new 61c247c SLING-5264 : increasing timeouts to account for slowness of jenkins
new a55019d no-jira : increasing sleeps to account for another apache jenkins slowness - sling-trunk-1.7 2661
new a04c6ca no-jira : added another safety sleep of 2sec for testConnectorSwitching4139 to make sure those heartbeats/votings going on there have enough time to settle
new 0371ca6 SLING-5264 follow-up : adding more logging to analyzeVotings/promote and AbstractDiscoveryServiceTest to track down still existing issue
new 37ae575 SLING-5279 : tests made more stable wrt stopping a VirtualInstance that was likely not done yet and interfered with subsequent test runs
new 1804fd3 no-jira : just some logger.debug messages fixed
new ccd3ba5 no-jira : fixed a logger.info
new a581e02 SLING-5284 : use dedicated PeriodicBackgroundJob-thread instead of scheduler
new 717806c SLING-5286 : re-activate fast topology change propagation
new 7d02f0e SLING-5284 : new PeriodicBackgroundJob requires upping the version to 1.1.0
new c6e5b4b SLING-5287 : lowering the testThirtyInstances test to be a testTwentyFourInstances - that should use less memory - lets see if that's enough
new e171131 SLING-5251 : add config parameter useSyncTokenService that enables usage of a SyncTokenService if available. This increases synchronization QoS when for topology changes
new d1b5f01 @no-jira using discovery.commons 1.0.4
new cbc913d [maven-release-plugin] prepare release org.apache.sling.discovery.base-1.1.0
new c00f863 [maven-release-plugin] prepare for next development iteration
new 8239aae @no-jira using discovery.commons 1.0.5-SNAPSHOT
new f2183ef SLING-5303 : adding a few more loops to avoid a failure that happened on jenkins due to the fact that heartbeatsAndCheckView can throw exceptions when invoked during promotion/other repository changes in a test environment. More loops should help work around that.
new 9a0e1e9 SLING-5313 : using jcr-commons 2.10.1 instead of the one referenced by sling.commons.testing which is 2.2.9
new f120875 SLING-5326 : adding time-difference health-check 'ClocksInSyncHealthCheck'
new f6bb466 no-jira : switching to discovery.commons 1.0.6
new c571e7c [maven-release-plugin] prepare release org.apache.sling.discovery.base-1.1.2
new e1a75e2 [maven-release-plugin] prepare for next development iteration
new f35f1c5 no-jira : switching to discovery.commons 1.0.7-SNAPSHOT
new 923cb3d Remove type from bundle dependencies
new f7a5bdc Switch to parent pom 26
new 5faa5a7 SLING-5485 Remove Launchpad API dependency from Discovery Base
new 4246578 SLING-5598 : exclude slow running test by newly introduced Slow junit category - to run them nevertheless use -PincludeSlowTests
new 4a9ac3d use org.apache.sling.commons.testing 2.0.26
new 5d6933c use org.apache.sling.discovery.commons 1.0.12
new 7fcaa11 align Jackrabbit versions
new 61dbee4 [maven-release-plugin] prepare release org.apache.sling.discovery.base-1.1.4
new d7dda34 [maven-release-plugin] prepare for next development iteration
new 2e4b045 SLING-5732 : discovery : avoid empty commit when nothing has changed
new e88cbac SLING-5231 : remove getAdministrativeResourceResolver from discovery components : merged patches from Carsten
new db99b6b SLING-5231 : remove getAdministrativeResourceResolver from discovery components : adjusted dependency on discovery.commons
new 26383aa no-jira : switching to in-release discovery.commons 1.0.18
new f7d5374 [maven-release-plugin] prepare release org.apache.sling.discovery.base-1.1.6
new 8b6f5ef [maven-release-plugin] prepare for next development iteration
new 2e64d05 no-jira : switching to next discovery.commons 1.0.19-SNAPSHOT
new aea97dd SLING-6689: Replace commons.json usage in org.apache.sling.discovery.base
new ae43559 SLING-6689: Switch to geronimo provider for javax.json api.
new 2a7093c update to org.apache.sling.commons.johnzon 1.0.0
new fe51cdd SLING-6809 : toString improved to enlist more details - including a paranoia fallback that goes to the previous output in case of any Exception
new d16b968 [maven-release-plugin] prepare release org.apache.sling.discovery.base-1.1.8
new 1339ddd [maven-release-plugin] prepare for next development iteration
new 540bf4e [maven-release-plugin] rollback the release of org.apache.sling.discovery.base-1.1.8
new df4c3e6 SLING-6689: remove public method that leaks JSONObject.
new 8b7f227 [maven-release-plugin] prepare release org.apache.sling.discovery.base-2.0.0
new 7084079 [maven-release-plugin] prepare for next development iteration
new 1a0f834 SLING-6888: Remove commons.json and org.json excludes.
new 3019048 SLING-6945 : lowered a harmless log.error to log.info with more detailed log message
new b65a116 use org.apache.sling.discovery.commons 1.0.20
new 9dbc97e use org.apache.sling.discovery.commons 1.0.22
new 9b3ca52 [maven-release-plugin] prepare release org.apache.sling.discovery.base-2.0.2
new 2d65ecc [maven-release-plugin] prepare for next development iteration
new 7427802 use org.apache.sling.discovery.commons 1.0.23-SNAPSHOT - until 1.0.22 is voted and released
new 09270cd use org.apache.sling.discovery.commons 1.0.20 (1.0.22 was dropped due to johnzon requiring JRE 7 already, thus doesn't make sense to restrict commons to 6 anymore)
new dafae99 SLING-6993 : johnzon regression : apparently jsonobj.getString internally did a toString in commons.json, not in commons.johnzon it seems. fixing by doing get().toString() instead
new cb3c63d [maven-release-plugin] prepare release org.apache.sling.discovery.base-2.0.4
new c16d73d [maven-release-plugin] copy for tag org.apache.sling.discovery.base-2.0.4
The 88 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-discovery-base] 02/06: use
org.apache.sling.discovery.commons 1.0.23-SNAPSHOT - until 1.0.22 is voted
and released
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.discovery.base-2.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-base.git
commit 7427802971626e5f613a00823cc7fbcc04bd2f05
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Jul 3 12:03:08 2017 +0000
use org.apache.sling.discovery.commons 1.0.23-SNAPSHOT - until 1.0.22 is voted and released
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/base@1800656 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c83a60a..008c741 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.22</version>
+ <version>1.0.23-SNAPSHOT</version>
</dependency>
<!-- besides including discovery.commons' normal jar above,
for testing a few test helper classes are also reused.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-base] 06/06:
[maven-release-plugin] copy for tag org.apache.sling.discovery.base-2.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.discovery.base-2.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-base.git
commit c16d73d7499aeaa0c6981d62defef98590e7f4d2
Author: Stefan Egli <st...@apache.org>
AuthorDate: Tue Jul 4 12:02:05 2017 +0000
[maven-release-plugin] copy for tag org.apache.sling.discovery.base-2.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.base-2.0.4@1800759 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-base] 01/06:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.discovery.base-2.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-base.git
commit 2d65eccd36d9572757f1f2134fd876284f7e5977
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Jul 3 12:00:51 2017 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/base@1800655 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index e694a93..c83a60a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<artifactId>org.apache.sling.discovery.base</artifactId>
<packaging>bundle</packaging>
- <version>2.0.2</version>
+ <version>2.0.3-SNAPSHOT</version>
<name>Apache Sling Discovery Base</name>
<description>Contains Connector and Properties support that some implementations might choose to build upon</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.base-2.0.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.base-2.0.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.base-2.0.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/base</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/base</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base</url>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-base] 04/06: SLING-6993 : johnzon
regression : apparently jsonobj.getString internally did a toString in
commons.json,
not in commons.johnzon it seems. fixing by doing get().toString() instead
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.discovery.base-2.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-base.git
commit dafae9981459751b93253e268cc5ecf1695a8d0a
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Jul 3 14:47:14 2017 +0000
SLING-6993 : johnzon regression : apparently jsonobj.getString internally did a toString in commons.json, not in commons.johnzon it seems. fixing by doing get().toString() instead
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/base@1800683 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/discovery/base/connectors/announcement/Announcement.java | 3 ++-
.../discovery/base/connectors/ping/TopologyRequestValidator.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java
index c9de955..344a718 100644
--- a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java
+++ b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java
@@ -35,6 +35,7 @@ import javax.json.JsonObject;
import javax.json.JsonObjectBuilder;
import javax.json.JsonReaderFactory;
import javax.json.JsonValue;
+import javax.json.JsonValue.ValueType;
import org.apache.sling.api.resource.ModifiableValueMap;
import org.apache.sling.api.resource.PersistenceException;
@@ -324,7 +325,7 @@ public class Announcement {
.getJsonArray("topologyAnnouncements");
for (int i = 0; i < subAnnouncements.size(); i++) {
- String subAnnouncementJSON = subAnnouncements.getString(i);
+ String subAnnouncementJSON = subAnnouncements.get(i).toString();
result.addIncomingTopologyAnnouncement(fromJSON(subAnnouncementJSON));
}
return result;
diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java b/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java
index 833e995..fa70321 100644
--- a/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java
+++ b/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java
@@ -434,8 +434,8 @@ public class TopologyRequestValidator {
BadPaddingException, UnsupportedEncodingException, InvalidKeyException,
NoSuchAlgorithmException, NoSuchPaddingException, InvalidAlgorithmParameterException, InvalidKeySpecException {
Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
- cipher.init(Cipher.DECRYPT_MODE, getCiperKey(Base64.decodeBase64(jsonArray.getString(0).getBytes("UTF-8"))), new IvParameterSpec(Base64.decodeBase64(jsonArray.getString(1).getBytes("UTF-8"))));
- return new String(cipher.doFinal(Base64.decodeBase64(jsonArray.getString(2).getBytes("UTF-8"))));
+ cipher.init(Cipher.DECRYPT_MODE, getCiperKey(Base64.decodeBase64(jsonArray.get(0).toString().getBytes("UTF-8"))), new IvParameterSpec(Base64.decodeBase64(jsonArray.get(1).toString().getBytes("UTF-8"))));
+ return new String(cipher.doFinal(Base64.decodeBase64(jsonArray.get(2).toString().getBytes("UTF-8"))));
}
/**
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-base] 03/06: use
org.apache.sling.discovery.commons 1.0.20 (1.0.22 was dropped due to
johnzon requiring JRE 7 already,
thus doesn't make sense to restrict commons to 6 anymore)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.discovery.base-2.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-base.git
commit 09270cdbe629e1c17adc86e9a3111ac4c9b3bf5c
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Jul 3 12:53:24 2017 +0000
use org.apache.sling.discovery.commons 1.0.20 (1.0.22 was dropped due to johnzon requiring JRE 7 already, thus doesn't make sense to restrict commons to 6 anymore)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/base@1800674 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 008c741..b600803 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.23-SNAPSHOT</version>
+ <version>1.0.20</version>
</dependency>
<!-- besides including discovery.commons' normal jar above,
for testing a few test helper classes are also reused.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-base] 05/06:
[maven-release-plugin] prepare release
org.apache.sling.discovery.base-2.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.discovery.base-2.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-base.git
commit cb3c63dcb090cb789e0c33ab56fd4e5a760ddab7
Author: Stefan Egli <st...@apache.org>
AuthorDate: Tue Jul 4 12:01:52 2017 +0000
[maven-release-plugin] prepare release org.apache.sling.discovery.base-2.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/base@1800758 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index b600803..bba7035 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<artifactId>org.apache.sling.discovery.base</artifactId>
<packaging>bundle</packaging>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.4</version>
<name>Apache Sling Discovery Base</name>
<description>Contains Connector and Properties support that some implementations might choose to build upon</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/base</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/base</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.base-2.0.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.base-2.0.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.base-2.0.4</url>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.