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 2026/04/17 16:25:57 UTC
(sling-org-apache-sling-jcr-js-nodetypes) 09/12: chore(deps): update to parent pom 31
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch experiment/parent-pom-update-skills
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-js-nodetypes.git
commit 73861c567e5ea5575809ee96e6e091d8037f0e3d
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Apr 17 17:51:42 2026 +0200
chore(deps): update to parent pom 31
---
pom.xml | 11 +----------
.../sling/jcr/js/nodetypes/NodeTypesJSONServlet.java | 17 ++++++-----------
.../DownloadDefaultBinaryValueServlet.java | 19 +++++++------------
3 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/pom.xml b/pom.xml
index bfb002a..ed26ebc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>31</version>
<relativePath/>
</parent>
@@ -82,10 +82,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
@@ -164,11 +160,6 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
diff --git a/src/main/java/org/apache/sling/jcr/js/nodetypes/NodeTypesJSONServlet.java b/src/main/java/org/apache/sling/jcr/js/nodetypes/NodeTypesJSONServlet.java
index f353d2c..52c0de0 100644
--- a/src/main/java/org/apache/sling/jcr/js/nodetypes/NodeTypesJSONServlet.java
+++ b/src/main/java/org/apache/sling/jcr/js/nodetypes/NodeTypesJSONServlet.java
@@ -29,16 +29,13 @@ import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
import org.apache.sling.commons.json.JSONException;
import org.apache.sling.commons.json.JSONObject;
+import org.osgi.service.component.annotations.Component;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,13 +46,11 @@ import org.slf4j.LoggerFactory;
*
* The URL is <code>/libs/jsnodetypes/content/nodetypes.json</code>.
*/
-@Component
-@Service(Servlet.class)
-@Properties({ @Property(name = "service.description", value = "Returns the node types as a JSON file"),
- @Property(name = "service.vendor", value = "Sandro Boehme"),
- @Property(name = "sling.servlet.extensions", value = "json"),
- @Property(name = "sling.servlet.resourceTypes", value = "jsnodetypes")
-
+@Component(service = Servlet.class, property = {
+ "service.description=Returns the node types as a JSON file",
+ "service.vendor=Sandro Boehme",
+ "sling.servlet.extensions=json",
+ "sling.servlet.resourceTypes=jsnodetypes"
})
public class NodeTypesJSONServlet extends SlingSafeMethodsServlet {
/*
diff --git a/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java b/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java
index b7a10ff..7272a69 100644
--- a/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java
+++ b/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java
@@ -37,13 +37,10 @@ import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
+import org.osgi.service.component.annotations.Component;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,14 +75,12 @@ import org.slf4j.LoggerFactory;
*
*/
-@Component
-@Service(Servlet.class)
-@Properties({ @Property(name = "service.description", value = "Download Servlet for binary properties"),
- @Property(name = "service.vendor", value = "Sandro Boehme"),
- @Property(name = "sling.servlet.selectors", value = "default_binary_value"),
- @Property(name = "sling.servlet.extensions", value = "bin"),
- @Property(name = "sling.servlet.resourceTypes", value = "sling/servlet/default")
-
+@Component(service = Servlet.class, property = {
+ "service.description=Download Servlet for binary properties",
+ "service.vendor=Sandro Boehme",
+ "sling.servlet.selectors=default_binary_value",
+ "sling.servlet.extensions=bin",
+ "sling.servlet.resourceTypes=sling/servlet/default"
})
public class DownloadDefaultBinaryValueServlet extends SlingSafeMethodsServlet {