You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ap...@apache.org on 2022/11/22 15:10:40 UTC
[sling-org-apache-sling-commons-threaddump] branch SLING-11696 updated: SLING-11695: upgrade to sling 49
This is an automated email from the ASF dual-hosted git repository.
apelluru pushed a commit to branch SLING-11696
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threaddump.git
The following commit(s) were added to refs/heads/SLING-11696 by this push:
new d8a957e SLING-11695: upgrade to sling 49
d8a957e is described below
commit d8a957e4bc8d0859299af2013501540429ee8494
Author: Ashok Pelluru <ap...@apache.org>
AuthorDate: Tue Nov 22 16:10:33 2022 +0100
SLING-11695: upgrade to sling 49
---
bnd.bnd | 9 +++++
pom.xml | 45 ++++++++--------------
.../commons/threaddump/internal/Activator.java | 3 ++
3 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..d095017
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,9 @@
+Import-Package: \
+ !org.apache.felix.shell, \
+ *
+
+DynamicImport-Package: \
+ org.apache.felix.shell;version="[1.0,2)"
+
+Private-Package: \
+ org.apache.sling.commons.threaddump.*
diff --git a/pom.xml b/pom.xml
index 4d263bc..c07cfa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>49</version>
<relativePath/>
</parent>
<artifactId>org.apache.sling.commons.threaddump</artifactId>
- <packaging>bundle</packaging>
<version>0.2.3-SNAPSHOT</version>
<name>Apache Sling Thread Dumper</name>
@@ -37,59 +36,47 @@
have the current threads with the stack traces dumped.
</description>
+ <properties>
+ <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
+ </properties>
+
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threaddump.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threaddump.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-commons-threaddump.git</url>
</scm>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- !org.apache.felix.shell,
- *
- </Import-Package>
- <DynamicImport-Package>
- org.apache.felix.shell;version="[1.0,2)"
- </DynamicImport-Package>
- <Private-Package>
- org.apache.sling.commons.threaddump.*
- </Private-Package>
- <Bundle-Activator>
- org.apache.sling.commons.threaddump.internal.Activator
- </Bundle-Activator>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.bundle</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>
<version>1.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/commons/threaddump/internal/Activator.java b/src/main/java/org/apache/sling/commons/threaddump/internal/Activator.java
index 2141c55..59bdcf9 100644
--- a/src/main/java/org/apache/sling/commons/threaddump/internal/Activator.java
+++ b/src/main/java/org/apache/sling/commons/threaddump/internal/Activator.java
@@ -31,6 +31,9 @@ import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.osgi.annotation.bundle.Header;
+
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator, UncaughtExceptionHandler {
private static final String LOG_NAME = "org.apache.sling.commons.threaddump.internal.UncaughtExceptionHandler";