You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2019/06/15 15:00:29 UTC
[sling-org-apache-sling-resource-presence] branch master updated
(be96063 -> 4d26828)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-presence.git.
from be96063 Updating badges for org-apache-sling-resource-presence
new f2782d0 remove default values from bnd file
new f07c1a4 SLING-8509 Mark fields in ResourcePresenter volatile
new 4d26828 SLING-8510 Make testing compliant with Java 9 and higher
The 3 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.
Summary of changes:
bnd.bnd | 12 ------------
pom.xml | 10 +++++-----
.../sling/resource/presence/internal/ResourcePresenter.java | 4 ++--
.../resource/presence/ResourcePresenterTestSupport.java | 3 ++-
4 files changed, 9 insertions(+), 20 deletions(-)
[sling-org-apache-sling-resource-presence] 03/03: SLING-8510 Make
testing compliant with Java 9 and higher
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-presence.git
commit 4d268287206a3470407645a25d75698a93f0743a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 16:59:31 2019 +0200
SLING-8510 Make testing compliant with Java 9 and higher
* Use Sling Bundle Parent 35
* Update Pax Exam to 4.13.1
* Update Testing PaxExam to 3.0.0
* Update Felix Framework to 6.0.3
---
pom.xml | 10 +++++-----
.../sling/resource/presence/ResourcePresenterTestSupport.java | 3 ++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index fc20ee4..bb3a6d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,8 @@
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
@@ -38,7 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sling.java.version>8</sling.java.version>
- <org.ops4j.pax.exam.version>4.11.0</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.13.1</org.ops4j.pax.exam.version>
</properties>
<scm>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.10</version>
+ <version>6.0.3</version>
<scope>test</scope>
</dependency>
<!-- Apache Sling -->
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>1.0.0</version>
+ <version>3.0.0</version>
<scope>provided</scope>
</dependency>
<!-- nullability -->
diff --git a/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java b/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java
index e62645c..dcaa8c0 100644
--- a/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java
+++ b/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java
@@ -20,6 +20,7 @@ package org.apache.sling.resource.presence;
import org.apache.sling.testing.paxexam.TestSupport;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.options.ModifiableCompositeOption;
import static org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOakTar;
import static org.ops4j.pax.exam.CoreOptions.composite;
@@ -31,7 +32,7 @@ public abstract class ResourcePresenterTestSupport extends TestSupport {
protected static final String FACTORY_PID = "org.apache.sling.resource.presence.internal.ResourcePresenter";
- protected Option baseConfiguration() {
+ protected ModifiableCompositeOption baseConfiguration() {
return composite(
super.baseConfiguration(),
slingQuickstart(),
[sling-org-apache-sling-resource-presence] 01/03: remove default
values from bnd file
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-presence.git
commit f2782d0f40548cb41b55d764c439dc8f95dfa0cf
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Aug 11 14:02:40 2018 +0200
remove default values from bnd file
---
bnd.bnd | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 6f12f39..e36a0d6 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,15 +1,3 @@
-Bundle-Category: sling
-
-Bundle-Description: ${project.description}
-
-Bundle-DocURL: https://sling.apache.org
-
-Bundle-License: Apache License, Version 2.0
-
-Bundle-Vendor: The Apache Software Foundation
-
--exportcontents: ${packages;VERSIONED}
-
-removeheaders:\
Include-Resource,\
Private-Package
[sling-org-apache-sling-resource-presence] 02/03: SLING-8509 Mark
fields in ResourcePresenter volatile
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-presence.git
commit f07c1a458f112b480afe619e3bbc36013b1add12
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 16:57:52 2019 +0200
SLING-8509 Mark fields in ResourcePresenter volatile
---
.../apache/sling/resource/presence/internal/ResourcePresenter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/resource/presence/internal/ResourcePresenter.java b/src/main/java/org/apache/sling/resource/presence/internal/ResourcePresenter.java
index aa16cd1..f38cfe6 100644
--- a/src/main/java/org/apache/sling/resource/presence/internal/ResourcePresenter.java
+++ b/src/main/java/org/apache/sling/resource/presence/internal/ResourcePresenter.java
@@ -59,10 +59,10 @@ public class ResourcePresenter {
private ServiceRegistration<ResourceChangeListener> listenerRegistration;
@Reference
- private ResourceResolverFactory resourceResolverFactory;
+ private volatile ResourceResolverFactory resourceResolverFactory;
@Reference
- private ServiceUserMapped serviceUserMapped;
+ private volatile ServiceUserMapped serviceUserMapped;
private final Logger logger = LoggerFactory.getLogger(ResourcePresenter.class);