You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2022/08/08 08:37:36 UTC
[sling-org-apache-sling-resourceresolver] branch master updated: SLING-11516 include adapters.json metadata in the resulting bundle (#79)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
The following commit(s) were added to refs/heads/master by this push:
new 97939db SLING-11516 include adapters.json metadata in the resulting bundle (#79)
97939db is described below
commit 97939db9a0a4b7ebe752ff7edfbbd1fc0751ade6
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Aug 8 10:37:31 2022 +0200
SLING-11516 include adapters.json metadata in the resulting bundle (#79)
Remove metadata for javax.jcr.Session adaptation (moved to JCR resource provider)
---
pom.xml | 4 ++++
.../org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 86a48e1..ae83c1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,10 @@
<goals>
<goal>generate-adapter-metadata</goal>
</goals>
+ <configuration>
+ <!-- relying on https://issues.apache.org/jira/browse/MNG-5001 until https://issues.apache.org/jira/browse/SLING-10022 -->
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
index 7581543..0a528d2 100644
--- a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
@@ -34,7 +34,6 @@ import java.util.Set;
import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentHashMap;
-import javax.jcr.Session;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
@@ -70,7 +69,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Adaptable(adaptableClass = ResourceResolver.class, adapters = { @Adapter(Session.class), @Adapter(ResourceMapper.class) })
+@Adaptable(adaptableClass = ResourceResolver.class, adapters = { @Adapter(ResourceMapper.class) })
public class ResourceResolverImpl extends SlingAdaptable implements ResourceResolver {
/** Default logger */