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-tail.git
commit afdc924cf8117bcd80c99e4c79258f071c63a2c5 Author: Robert Munteanu <[email protected]> AuthorDate: Mon Apr 20 14:50:39 2026 +0200 chore: update to parent pom 31 --- pom.xml | 20 +------------------- .../sling/tail/impl/LogTailerWebConsolePlugin.java | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index b616dbe..2a78abb 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>30</version> + <version>31</version> </parent> <artifactId>org.apache.sling.tail</artifactId> @@ -55,28 +55,10 @@ </instructions> </configuration> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-scr-plugin</artifactId> - <extensions>true</extensions> - <executions> - <execution> - <id>generate-scr-descriptor</id> - <goals> - <goal>scr</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.scr.annotations</artifactId> - <scope>provided</scope> - </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>bnd</artifactId> diff --git a/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java b/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java index 1e6ebd5..f4b7dd5 100644 --- a/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java +++ b/src/main/java/org/apache/sling/tail/impl/LogTailerWebConsolePlugin.java @@ -23,8 +23,7 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; import ch.qos.logback.core.FileAppender; -import org.apache.felix.scr.annotations.*; -import org.apache.felix.scr.annotations.Properties; +import org.osgi.service.component.annotations.Component; import org.apache.felix.utils.json.JSONWriter; import org.apache.felix.webconsole.AbstractWebConsolePlugin; import org.apache.felix.webconsole.WebConsoleConstants; @@ -46,15 +45,15 @@ import java.util.*; /** * */ -@Component -@Service(value = { Servlet.class }) -@Properties({ - @Property(name=org.osgi.framework.Constants.SERVICE_DESCRIPTION, - value="Apache Sling Web Console Plugin to tail log(s) of this Sling instance"), - @Property(name= WebConsoleConstants.PLUGIN_LABEL, value=LogTailerWebConsolePlugin.LABEL), - @Property(name=WebConsoleConstants.PLUGIN_TITLE, value=LogTailerWebConsolePlugin.TITLE), - @Property(name="felix.webconsole.configprinter.modes", value={"always"}) -}) +@Component( + service = Servlet.class, + property = { + org.osgi.framework.Constants.SERVICE_DESCRIPTION + "=Apache Sling Web Console Plugin to tail log(s) of this Sling instance", + WebConsoleConstants.PLUGIN_LABEL + "=" + LogTailerWebConsolePlugin.LABEL, + WebConsoleConstants.PLUGIN_TITLE + "=" + LogTailerWebConsolePlugin.TITLE, + "felix.webconsole.configprinter.modes=always" + } +) public class LogTailerWebConsolePlugin extends AbstractWebConsolePlugin { public static final String LABEL = "tail"; public static final String TITLE = "Tail Logs";
