Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SLING-11303: update to sling 47 #1

Merged
merged 2 commits into from May 11, 2022
Merged

SLING-11303: update to sling 47 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90ba32f
Fix for broken builds
apelluru May 4, 2022
62ab6a3
SLING-11303: Allow java imports and fix PR comments
apelluru May 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions bnd.bnd
View file
Open in desktop
@@ -0,0 +1 @@
Bundle-DocURL: https://sling.apache.org/documentation/development/logging.html
46 changes: 23 additions & 23 deletions pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>

Expand All @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/apache/sling/commons/logservice/internal/Activator.java
View file
Open in desktop
Expand Up @@ -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;
Expand All @@ -31,6 +32,7 @@
* 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;
Expand Down