Jenkins build is still unstable: sling-launchpad-testing-war-9 #44

2017-10-10 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: sling-launchpad-testing-9 #45

2017-10-10 Thread Apache Jenkins Server 
See

Nexus: Promotion Completed

2017-10-10 Thread Nexus Repository Manager 
Message from: https://repository.apache.orgDescription: Apache Sling Starter Startup 1.0.2Deployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.8.0_92; Mac OS X 10.12.6)""userId" = "cziegeler""ip" = "46.91.101.46"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.starter.startup/1.0.2/org.apache.sling.starter.startup-1.0.2.jar(SHA1: 41e8a5434f1403158d4bf00790f801fe66624983)/org/apache/sling/org.apache.sling.starter.startup/1.0.2/org.apache.sling.starter.startup-1.0.2-sources.jar.asc(SHA1: dad8fa42938f50478a4fad5870ee73b663eb5451)/org/apache/sling/org.apache.sling.starter.startup/1.0.2/org.apache.sling.starter.startup-1.0.2-source-release.zip(SHA1: ce78ef32c38bce701a13696f717a0f1ddcf19ca2)/org/apache/sling/org.apache.sling.starter.startup/1.0.2/org.apache.sling.starter.startup-1.0.2.pom.asc(SHA1: ffa71a5e6f068f3ea6128d469ced13e79d8cf8f0)/org/apache/sling/org.apache.sling.starter.startup/1.0.2/org.apache.sling.starter.startup-1.0.2.pom(SHA1: 8efaacc66d150657673b2353e3ff74c8394d27b4)/org/apache/sling/org.apache.sling.starter.startup/1.0.2/org.apache.sling.starter.startup-1.0.2-sources.jar(SHA1: 5932384f38731f6cf3b43c7d451cc458ba767578)/org/apache/sling/org.apache.sling.starter.startup/1.0.2/org.apache.sling.starter.startup-1.0.2-source-release.zip.asc(SHA1: 0ac2707da42fa2d238335d0480b2ac0f0235e607)/org/apache/sling/org.apache.sling.starter.startup/1.0.2/org.apache.sling.starter.startup-1.0.2.jar.asc(SHA1: 21616b5246290679b51caadf1d77538d093a548e)Action performed by Karl Pauls (pauls)

Nexus: Promotion Completed

2017-10-10 Thread Nexus Repository Manager 
Message from: https://repository.apache.orgDescription: Apache Sling Bundle Resource 2.3.0Deployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.7.0_80; Mac OS X 10.12.6)""userId" = "cziegeler""ip" = "46.91.101.46"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.bundleresource.impl/2.3.0/org.apache.sling.bundleresource.impl-2.3.0-sources.jar(SHA1: 9446752b1c7400946dc56f747b377b38924be4fb)/org/apache/sling/org.apache.sling.bundleresource.impl/2.3.0/org.apache.sling.bundleresource.impl-2.3.0.pom(SHA1: e9055addf181367e110d709f3f3c4047e76f43b5)/org/apache/sling/org.apache.sling.bundleresource.impl/2.3.0/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip(SHA1: 6aa99b5d7752f84c6f93eb57c8a88b6d40d5c409)/org/apache/sling/org.apache.sling.bundleresource.impl/2.3.0/org.apache.sling.bundleresource.impl-2.3.0.jar(SHA1: 8f23df888a16a55acd97757e2cfa07f641974cb7)/org/apache/sling/org.apache.sling.bundleresource.impl/2.3.0/org.apache.sling.bundleresource.impl-2.3.0.jar.asc(SHA1: b3b552eb995b90d61e89935d396665a2ce54a7d2)/org/apache/sling/org.apache.sling.bundleresource.impl/2.3.0/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.asc(SHA1: e9dc98f8b735182afc5b63ca4ed9cc715b149919)/org/apache/sling/org.apache.sling.bundleresource.impl/2.3.0/org.apache.sling.bundleresource.impl-2.3.0.pom.asc(SHA1: 56f1e8233b165f5c4a6dac62b576e24a86083506)/org/apache/sling/org.apache.sling.bundleresource.impl/2.3.0/org.apache.sling.bundleresource.impl-2.3.0-sources.jar.asc(SHA1: fbd00a0dbbe119399919fc6eac7326ec8237f6cc)Action performed by Karl Pauls (pauls)

svn commit: r22213 - /release/sling/

2017-10-10 Thread pauls 
Author: pauls
Date: Tue Oct 10 21:05:47 2017
New Revision: 22213

Log:
Add the Apache Sling Bundle Resource 2.3.0 and the  Apache Sling Starter 
Startup 1.0.2 releases.

Added:
release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip 
  (with props)

release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.asc

release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.md5

release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.sha1
release/sling/org.apache.sling.bundleresource.impl-2.3.0-sources.jar   
(with props)
release/sling/org.apache.sling.bundleresource.impl-2.3.0-sources.jar.asc
release/sling/org.apache.sling.bundleresource.impl-2.3.0-sources.jar.md5
release/sling/org.apache.sling.bundleresource.impl-2.3.0-sources.jar.sha1
release/sling/org.apache.sling.bundleresource.impl-2.3.0.jar   (with props)
release/sling/org.apache.sling.bundleresource.impl-2.3.0.jar.asc
release/sling/org.apache.sling.bundleresource.impl-2.3.0.jar.md5
release/sling/org.apache.sling.bundleresource.impl-2.3.0.jar.sha1
release/sling/org.apache.sling.bundleresource.impl-2.3.0.pom
release/sling/org.apache.sling.bundleresource.impl-2.3.0.pom.asc
release/sling/org.apache.sling.bundleresource.impl-2.3.0.pom.md5
release/sling/org.apache.sling.bundleresource.impl-2.3.0.pom.sha1
release/sling/org.apache.sling.starter.startup-1.0.2-source-release.zip   
(with props)
release/sling/org.apache.sling.starter.startup-1.0.2-source-release.zip.asc
release/sling/org.apache.sling.starter.startup-1.0.2-source-release.zip.md5
release/sling/org.apache.sling.starter.startup-1.0.2-source-release.zip.sha1
release/sling/org.apache.sling.starter.startup-1.0.2-sources.jar   (with 
props)
release/sling/org.apache.sling.starter.startup-1.0.2-sources.jar.asc
release/sling/org.apache.sling.starter.startup-1.0.2-sources.jar.md5
release/sling/org.apache.sling.starter.startup-1.0.2-sources.jar.sha1
release/sling/org.apache.sling.starter.startup-1.0.2.jar   (with props)
release/sling/org.apache.sling.starter.startup-1.0.2.jar.asc
release/sling/org.apache.sling.starter.startup-1.0.2.jar.md5
release/sling/org.apache.sling.starter.startup-1.0.2.jar.sha1
release/sling/org.apache.sling.starter.startup-1.0.2.pom
release/sling/org.apache.sling.starter.startup-1.0.2.pom.asc
release/sling/org.apache.sling.starter.startup-1.0.2.pom.md5
release/sling/org.apache.sling.starter.startup-1.0.2.pom.sha1
Removed:
release/sling/org.apache.sling.bundleresource.impl-2.2.0-javadoc.jar
release/sling/org.apache.sling.bundleresource.impl-2.2.0-javadoc.jar.asc
release/sling/org.apache.sling.bundleresource.impl-2.2.0-javadoc.jar.md5
release/sling/org.apache.sling.bundleresource.impl-2.2.0-javadoc.jar.sha1
release/sling/org.apache.sling.bundleresource.impl-2.2.0-source-release.zip

release/sling/org.apache.sling.bundleresource.impl-2.2.0-source-release.zip.asc

release/sling/org.apache.sling.bundleresource.impl-2.2.0-source-release.zip.md5

release/sling/org.apache.sling.bundleresource.impl-2.2.0-source-release.zip.sha1
release/sling/org.apache.sling.bundleresource.impl-2.2.0-sources.jar
release/sling/org.apache.sling.bundleresource.impl-2.2.0-sources.jar.asc
release/sling/org.apache.sling.bundleresource.impl-2.2.0-sources.jar.md5
release/sling/org.apache.sling.bundleresource.impl-2.2.0-sources.jar.sha1
release/sling/org.apache.sling.bundleresource.impl-2.2.0.jar
release/sling/org.apache.sling.bundleresource.impl-2.2.0.jar.asc
release/sling/org.apache.sling.bundleresource.impl-2.2.0.jar.md5
release/sling/org.apache.sling.bundleresource.impl-2.2.0.jar.sha1
release/sling/org.apache.sling.bundleresource.impl-2.2.0.pom
release/sling/org.apache.sling.bundleresource.impl-2.2.0.pom.asc
release/sling/org.apache.sling.bundleresource.impl-2.2.0.pom.md5
release/sling/org.apache.sling.bundleresource.impl-2.2.0.pom.sha1

Added: 
release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip
==
Binary file - no diff available.

Propchange: 
release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip
--
svn:mime-type = application/octet-stream

Added: 
release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.asc
==
--- 
release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.asc 
(added)
+++ 
release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.asc 
Tue Oct 10 21:05:47 2017
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+

Jenkins build is still unstable: sling-launchpad-testing-9 #44

2017-10-10 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: sling-launchpad-testing-war-9 #43

2017-10-10 Thread Apache Jenkins Server 
See

svn commit: r1811741 - in /sling/trunk/bundles/extensions/models/impl/src: main/java/org/apache/sling/models/impl/model/AbstractInjectableElement.java test/java/org/apache/sling/models/impl/Annotation

2017-10-10 Thread justin 
Author: justin
Date: Tue Oct 10 17:16:15 2017
New Revision: 1811741

URL: http://svn.apache.org/viewvc?rev=1811741=rev
Log:
SLING-7187 - handle conflicts between annotations

Added:

sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/AnnotationConflictsTest.java
Modified:

sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/model/AbstractInjectableElement.java

Modified: 
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/model/AbstractInjectableElement.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/model/AbstractInjectableElement.java?rev=1811741=1811740=1811741=diff
==
--- 
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/model/AbstractInjectableElement.java
 (original)
+++ 
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/model/AbstractInjectableElement.java
 Tue Oct 10 17:16:15 2017
@@ -204,13 +204,16 @@ abstract class AbstractInjectableElement
 }
 
 private static boolean getOptional(AnnotatedElement element, 
InjectAnnotationProcessor annotationProcessor) {
+if (element.isAnnotationPresent(Optional.class)) {
+return true;
+}
 if (annotationProcessor != null) {
 Boolean optional = annotationProcessor.isOptional();
 if (optional != null) {
 return optional.booleanValue();
 }
 }
-return element.isAnnotationPresent(Optional.class);
+return false;
 }
 
 private static boolean getRequired(AnnotatedElement element, 
InjectAnnotationProcessor annotationProcessor) {

Added: 
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/AnnotationConflictsTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/AnnotationConflictsTest.java?rev=1811741=auto
==
--- 
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/AnnotationConflictsTest.java
 (added)
+++ 
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/AnnotationConflictsTest.java
 Tue Oct 10 17:16:15 2017
@@ -0,0 +1,280 @@
+/*
+ * 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.
+ */
+package org.apache.sling.models.impl;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.wrappers.ValueMapDecorator;
+import org.apache.sling.models.annotations.DefaultInjectionStrategy;
+import org.apache.sling.models.annotations.Model;
+import org.apache.sling.models.annotations.Optional;
+import org.apache.sling.models.annotations.Required;
+import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
+import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
+import org.apache.sling.models.factory.MissingElementException;
+import org.apache.sling.models.factory.MissingElementsException;
+import org.apache.sling.models.impl.injectors.ValueMapInjector;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.component.ComponentContext;
+
+import java.util.Collections;
+import java.util.Hashtable;
+
+import static org.mockito.Mockito.when;
+import static org.junit.Assert.*;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AnnotationConflictsTest {
+
+@Mock
+private ComponentContext componentCtx;
+
+@Mock
+private BundleContext bundleContext;
+
+private ModelAdapterFactory factory;
+
+@Mock
+private Resource resource;
+
+@Before
+public void setup() {
+when(componentCtx.getBundleContext()).thenReturn(bundleContext);
+when(componentCtx.getProperties()).thenReturn(new Hashtable());
+

Jenkins build is still unstable: sling-launchpad-testing-9 #43

2017-10-10 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: sling-launchpad-testing-war-9 #42

2017-10-10 Thread Apache Jenkins Server 
See

svn commit: r1811715 - /sling/trunk/bundles/jcr/contentparser/pom.xml

2017-10-10 Thread sseifert 
Author: sseifert
Date: Tue Oct 10 15:40:43 2017
New Revision: 1811715

URL: http://svn.apache.org/viewvc?rev=1811715=rev
Log:
set dependency scope for javax.json to provided because artifactId is different 
for newer version of the spec

Modified:
sling/trunk/bundles/jcr/contentparser/pom.xml

Modified: sling/trunk/bundles/jcr/contentparser/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/pom.xml?rev=1811715=1811714=1811715=diff
==
--- sling/trunk/bundles/jcr/contentparser/pom.xml (original)
+++ sling/trunk/bundles/jcr/contentparser/pom.xml Tue Oct 10 15:40:43 2017
@@ -81,7 +81,7 @@
 org.apache.geronimo.specs
 geronimo-json_1.0_spec
 1.0-alpha-1
-compile
+provided
 
 
 javax.jcr

Nexus: Staging Completed

2017-10-10 Thread Nexus Repository Manager 
Message from: https://repository.apache.orgDescription:Apache Sling Discovery Oak 1.2.22 RCDeployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.7.0_80; Mac OS X 10.10.5)""userId" = "stefanegli""ip" = "192.147.117.11"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.discovery.oak/1.2.22/org.apache.sling.discovery.oak-1.2.22.jar(SHA1: 3abd1f08b22a0a6c0f3decbc46eb6189cf5022ba)/org/apache/sling/org.apache.sling.discovery.oak/1.2.22/org.apache.sling.discovery.oak-1.2.22-sources.jar.asc(SHA1: 364387e33b18cca9834cba2e676549e4c33b432e)/org/apache/sling/org.apache.sling.discovery.oak/1.2.22/org.apache.sling.discovery.oak-1.2.22.pom(SHA1: 96d9c155f3aa3973e3bb40bff6ef927cf9c6e22a)/org/apache/sling/org.apache.sling.discovery.oak/1.2.22/org.apache.sling.discovery.oak-1.2.22-source-release.zip.asc(SHA1: 465eb9e6c9976e3e4b3e29c742d84176ca049069)/org/apache/sling/org.apache.sling.discovery.oak/1.2.22/org.apache.sling.discovery.oak-1.2.22-javadoc.jar(SHA1: 3070c6b6f309ac45fbfa8a470f997726377f9494)/org/apache/sling/org.apache.sling.discovery.oak/1.2.22/org.apache.sling.discovery.oak-1.2.22-sources.jar(SHA1: a9dbd92fe719dde1412dd4a8ddb9a40d421d9399)/org/apache/sling/org.apache.sling.discovery.oak/1.2.22/org.apache.sling.discovery.oak-1.2.22-source-release.zip(SHA1: 02c30625c29108e183f3ce014eaee92de6c88bd6)/org/apache/sling/org.apache.sling.discovery.oak/1.2.22/org.apache.sling.discovery.oak-1.2.22.jar.asc(SHA1: ae6bb0cd2ec7c3e9203ed96e1d714e9c5877)/org/apache/sling/org.apache.sling.discovery.oak/1.2.22/org.apache.sling.discovery.oak-1.2.22.pom.asc(SHA1: a74cf81e73660333dc84978b6b72c2e83c42c8ff)/org/apache/sling/org.apache.sling.discovery.oak/1.2.22/org.apache.sling.discovery.oak-1.2.22-javadoc.jar.asc(SHA1: 13fe37b6e14ebfb4fdc36d4049e19dcb5d109394)Action performed by Stefan Egli (stefanegli)

Jenkins build is still unstable: sling-launchpad-testing-war-9 #41

2017-10-10 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: sling-launchpad-testing-9 #42

2017-10-10 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : sling-launchpad-testing-war-1.8 #1509

2017-10-10 Thread Apache Jenkins Server 
See

svn commit: r1811674 - /sling/tags/org.apache.sling.discovery.oak-1.2.22/

2017-10-10 Thread stefanegli 
Author: stefanegli
Date: Tue Oct 10 11:46:23 2017
New Revision: 1811674

URL: http://svn.apache.org/viewvc?rev=1811674=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.discovery.oak-1.2.22

Added:
sling/tags/org.apache.sling.discovery.oak-1.2.22/
  - copied from r1811673, sling/trunk/bundles/extensions/discovery/oak/

svn commit: r1811673 - /sling/trunk/bundles/extensions/discovery/oak/pom.xml

2017-10-10 Thread stefanegli 
Author: stefanegli
Date: Tue Oct 10 11:46:10 2017
New Revision: 1811673

URL: http://svn.apache.org/viewvc?rev=1811673=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.22

Modified:
sling/trunk/bundles/extensions/discovery/oak/pom.xml

Modified: sling/trunk/bundles/extensions/discovery/oak/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak/pom.xml?rev=1811673=1811672=1811673=diff
==
--- sling/trunk/bundles/extensions/discovery/oak/pom.xml (original)
+++ sling/trunk/bundles/extensions/discovery/oak/pom.xml Tue Oct 10 11:46:10 
2017
@@ -29,7 +29,7 @@
 
 org.apache.sling.discovery.oak
 bundle
-1.2.21-SNAPSHOT
+1.2.22
 
 Apache Sling Oak-Based Discovery Service
 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.
@@ -43,9 +43,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak
-
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.22
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.22
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.2.22

svn commit: r1811675 - /sling/trunk/bundles/extensions/discovery/oak/pom.xml

2017-10-10 Thread stefanegli 
Author: stefanegli
Date: Tue Oct 10 11:46:25 2017
New Revision: 1811675

URL: http://svn.apache.org/viewvc?rev=1811675=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/extensions/discovery/oak/pom.xml

Modified: sling/trunk/bundles/extensions/discovery/oak/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak/pom.xml?rev=1811675=1811674=1811675=diff
==
--- sling/trunk/bundles/extensions/discovery/oak/pom.xml (original)
+++ sling/trunk/bundles/extensions/discovery/oak/pom.xml Tue Oct 10 11:46:25 
2017
@@ -29,7 +29,7 @@
 
 org.apache.sling.discovery.oak
 bundle
-1.2.22
+1.2.23-SNAPSHOT
 
 Apache Sling Oak-Based Discovery Service
 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.
@@ -43,9 +43,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.22
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.22
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.2.22
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak
+
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak

svn commit: r1811672 - /sling/trunk/bundles/extensions/discovery/oak/pom.xml

2017-10-10 Thread stefanegli 
Author: stefanegli
Date: Tue Oct 10 11:42:45 2017
New Revision: 1811672

URL: http://svn.apache.org/viewvc?rev=1811672=rev
Log:
releng : switching discovery.base from 2.0.5-SNAPSHOT back to 2.0.4

Modified:
sling/trunk/bundles/extensions/discovery/oak/pom.xml

Modified: sling/trunk/bundles/extensions/discovery/oak/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak/pom.xml?rev=1811672=1811671=1811672=diff
==
--- sling/trunk/bundles/extensions/discovery/oak/pom.xml (original)
+++ sling/trunk/bundles/extensions/discovery/oak/pom.xml Tue Oct 10 11:42:45 
2017
@@ -168,7 +168,7 @@

org.apache.sling
org.apache.sling.discovery.base
-   2.0.5-SNAPSHOT
+   2.0.4
 provided

svn commit: r1811671 - /sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java

2017-10-10 Thread stefanegli 
Author: stefanegli
Date: Tue Oct 10 11:29:54 2017
New Revision: 1811671

URL: http://svn.apache.org/viewvc?rev=1811671=rev
Log:
SLING-7153 : ignoring TopologyEvent entirely when not activated - representing 
a more appropriate fix for resourceResolverFactory being null case

Modified:

sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java

Modified: 
sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java?rev=1811671=1811670=1811671=diff
==
--- 
sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java
 (original)
+++ 
sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java
 Tue Oct 10 11:29:54 2017
@@ -589,6 +589,10 @@ public class TopologyWebConsolePlugin ex
  */
 @Override
 public void handleTopologyEvent(final TopologyEvent event) {
+if (getBundleContext() == null) {
+logger.info("handleTopologyEvent: ignoring event when not 
activated: " + event);
+return;
+}
 if (event.getType() == Type.PROPERTIES_CHANGED) {
 this.currentView = event.getNewView();
 
@@ -786,11 +790,7 @@ public class TopologyWebConsolePlugin ex
 discoveryLiteHistory.remove(0);
 }
 } catch(Exception e) {
-if (resourceResolverFactory == null) {
-logger.info("addDiscoveryLiteHistoryEntry: plugin already 
deactivated (resourceResolverFactory == null), Exception: "+e);
-} else {
-logger.error("addDiscoveryLiteHistoryEntry: Exception: "+e, e);
-}
+logger.error("addDiscoveryLiteHistoryEntry: Exception: "+e, e);
 } finally {
 if (resourceResolver != null) {
 resourceResolver.close();

[sling-site] branch master updated: gitbox is the canonical repository

2017-10-10 Thread rombert 
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git


The following commit(s) were added to refs/heads/master by this push:
 new 12a6a71  gitbox is the canonical repository
12a6a71 is described below

commit 12a6a715dbe3ddb93143045df5e39e9d15021b50
Author: Robert Munteanu 
AuthorDate: Tue Oct 10 13:30:31 2017 +0300

gitbox is the canonical repository
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2025aae..4f92da5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
 
 target/${project.artifactId}-${project.version}
 Automatic publish of sling site
-
scm:git:https://github.com/apache/sling-site.git
+
scm:git:https://gitbox.apache.org/repos/asf/sling-site.git
 asf-site
 
   

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" '].

Jenkins build is still unstable: sling-launchpad-testing-war-9 #40

2017-10-10 Thread Apache Jenkins Server 
See

Jenkins build became unstable: sling-launchpad-testing-war-1.8 #1508

2017-10-10 Thread Apache Jenkins Server 
See

svn commit: r1811654 - /sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java

2017-10-10 Thread stefanegli 
Author: stefanegli
Date: Tue Oct 10 09:40:53 2017
New Revision: 1811654

URL: http://svn.apache.org/viewvc?rev=1811654=rev
Log:
SLING-7153 : in case of a late arriving TopologyEvent, don't issue a log.error, 
just a log.info

Modified:

sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java

Modified: 
sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java?rev=1811654=1811653=1811654=diff
==
--- 
sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java
 (original)
+++ 
sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java
 Tue Oct 10 09:40:53 2017
@@ -786,7 +786,11 @@ public class TopologyWebConsolePlugin ex
 discoveryLiteHistory.remove(0);
 }
 } catch(Exception e) {
-logger.error("addDiscoveryLiteHistoryEntry: Exception: "+e, e);
+if (resourceResolverFactory == null) {
+logger.info("addDiscoveryLiteHistoryEntry: plugin already 
deactivated (resourceResolverFactory == null), Exception: "+e);
+} else {
+logger.error("addDiscoveryLiteHistoryEntry: Exception: "+e, e);
+}
 } finally {
 if (resourceResolver != null) {
 resourceResolver.close();

[sling-site] branch master updated: Avoid encoding issues

2017-10-10 Thread bdelacretaz 
This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git


The following commit(s) were added to refs/heads/master by this push:
 new 7fb315a  Avoid encoding issues
7fb315a is described below

commit 7fb315ad7ac1edffc6e983fb5dcd9840097f3aef
Author: Bertrand Delacretaz 
AuthorDate: Tue Oct 10 11:51:13 2017 +0200

Avoid encoding issues
---
 src/main/jbake/templates/footer.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/jbake/templates/footer.tpl 
b/src/main/jbake/templates/footer.tpl
index 555c601..d6cf40f 100644
--- a/src/main/jbake/templates/footer.tpl
+++ b/src/main/jbake/templates/footer.tpl
@@ -4,5 +4,5 @@ p() {
 yield "may be trademarks or registered trademarks of their respective 
owners."
 }
 p() {
-yield "Copyright © 2011-2017 The Apache Software Foundation."
+yield "Copyright \u00a9 2011-2017 The Apache Software Foundation."
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" '].