This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-logservice.git
The following commit(s) were added to refs/heads/master by this push:
new b78fde7 SLING-11303: update to sling 47 (#1)
b78fde7 is described below
commit b78fde7603d68b6703a20eb4546f0ca354819eb2
Author: Ashok Pelluru <[email protected]>
AuthorDate: Wed May 11 11:50:29 2022 +0200
SLING-11303: update to sling 47 (#1)
---
bnd.bnd | 1 +
pom.xml | 46 +++++++++++-----------
.../commons/logservice/internal/Activator.java | 2 +
3 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..a6f5eb8
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1 @@
+Bundle-DocURL: https://sling.apache.org/documentation/development/logging.html
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1440037..902f39b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,14 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>47</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.commons.logservice</artifactId>
<version>1.1.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling OSGi LogService Implementation</name>
<description>
@@ -41,25 +40,23 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-logservice.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-logservice.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-commons-logservice.git</url>
- <tag>HEAD</tag>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
+
+ <properties>
+ <sling.java.version>8</sling.java.version>
+ <project.build.outputTimestamp>1</project.build.outputTimestamp>
+ </properties>
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>
-
org.apache.sling.commons.logservice.internal.Activator
- </Bundle-Activator>
- <Bundle-DocURL>
- http://sling.apache.org/site/logging.html
- </Bundle-DocURL>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
</plugin>
</plugins>
</build>
@@ -88,8 +85,7 @@
<!-- OSGi Libraries not included here -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>6.0.0</version>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -100,7 +96,11 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component</artifactId>
- <version>1.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.bundle</artifactId>
<scope>provided</scope>
</dependency>
@@ -111,8 +111,8 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
+ <artifactId>mockito-core</artifactId>
+ <version>4.5.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/src/main/java/org/apache/sling/commons/logservice/internal/Activator.java
b/src/main/java/org/apache/sling/commons/logservice/internal/Activator.java
index 878a381..7b81dec 100644
--- a/src/main/java/org/apache/sling/commons/logservice/internal/Activator.java
+++ b/src/main/java/org/apache/sling/commons/logservice/internal/Activator.java
@@ -16,6 +16,7 @@
*/
package org.apache.sling.commons.logservice.internal;
+import org.osgi.annotation.bundle.Header;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -31,6 +32,7 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer;
* log service bundle. This activator registers the <code>LogService</code> and
* <code>LogReaderService</code>.
*/
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator {
private volatile ServiceTracker<LogReaderService, LogReaderService>
logReaderTracker;
