Use OSGi Annotations to produce felix.log manifest and clean up.

[wilx]

While I was working on reviving felix.logback I was going through the code and I wondered if it could be modernized a little bit. This is the result. I am not sure if it is useful for the project as I have no idea what minimum platform and JVM version it targets.

[stbischof]

Just to validate.
Could you show Manifest before and after here as comments.

Updating parent pom seems okay.
Annotations are made for that. So also good.

Need to look deeper but think this is fine.

[wilx]

Could you show Manifest before and after here as comments.

It is slightly different. I will provide the comparison later today.

[laeubi]

While I was working on reviving felix.logback I was going through the code and I wondered if it could be modernized a little bit.

There is also now some github validation so you should enable that for your module as well, just duplicate the line with your module.

felix-dev/.github/workflows/maven.yml

Line 30 in 65ac388

- name: Felix SCR

[rotty3000]

Just a few nits.

Besides that, thank you @wilx for breathing some life into this bundle. :)

[wilx]

I have pushed some changes.

This is the difference between the 1.3.0 version and the branch snapshot version in MANIFEST.MF after those changes. I have made manually concatenated the MANIFEST.MF lines for easier comparison. There are differences in uses for the Provide-Capability.

--- scratch_1.MF        2024-12-13 11:35:27.643249474 +0100
+++ scratch_2.MF        2024-12-13 11:35:55.859447078 +0100
@@ -1,7 +1,5 @@
 Manifest-Version: 1.0
-Bnd-LastModified: 1684133251156
-Build-Jdk: 11.0.19
-Built-By: jbonofre
+Build-Jdk-Spec: 17
 Bundle-Activator: org.apache.felix.log.Activator
 Bundle-Description: A simple implementation of the OSGi R8 Log service
  .
@@ -11,8 +9,8 @@
 Bundle-Name: Apache Felix Log Service
 Bundle-SymbolicName: org.apache.felix.log
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.3.0
-Created-By: Apache Maven Bundle Plugin
+Bundle-Version: 1.3.1.SNAPSHOT
+Created-By: Apache Maven Bundle Plugin 5.1.9
 Export-Package: org.osgi.service.log;version="1.5";uses:="org.osgi.fra
  mework",org.osgi.service.log.admin;version="1.0";uses:="org.osgi.serv
  ice.log"
@@ -20,8 +18,9 @@
  k.wiring;version="[1.2,2)",org.osgi.service.log;version="[1.5,1.6)",o
  rg.osgi.service.log.admin;version="[1.0,1.1)",org.osgi.util.tracker;v
  ersion="[1.5,2)"
-Provide-Capability: osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.osgi.service.log,org.osgi.service.log.admin",
- osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.osgi.service.log,org.osgi.service.log.admin",
- osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.osgi.service.log,org.osgi.service.log.admin"
+Provide-Capability: osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.apache.felix.log,org.osgi.service.log",
+ osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.apache.felix.log,org.osgi.service.log,org.osgi.service.log.admin",
+ osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.apache.felix.log,org.osgi.service.log.admin"
 Require-Capability: osgi.service;filter:="(objectClass=org.osgi.service.cm.ConfigurationAdmin)";effective:=active,osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
-Tool: Bnd-3.5.0.201709291849
+Tool: Bnd-6.3.1.202206071316
+

[rotty3000]

LGMT (though I do wish we would use provided with the "build time" dependencies.)

[stbischof]

@laeubi could you look on the ci?

@wilx i think just run pr against master is enough

Would be also greate to have a setup that runs also the original tck.

[laeubi]

I also think the branch spec should only be master at the moment, the rest of the CI change looks fine

[stbischof]

@wilx could you resolve the merge conflict on .github/workflows/maven.yml?

then i would like to merge

[wilx]

@wilx could you resolve the merge conflict on .github/workflows/maven.yml?

then i would like to merge

I have rebased the branch on master.

[stbischof]

<dependency> 
   <groupId>org.osgi</groupId> 
   <artifactId>osgi.annotation</artifactId> 
   <version>8.1.0</version> 
   <scope>provided</scope> 
 </dependency>

Could you please use the elementar API dependencies and not the aggregator.

[wilx]

@stbischof Done.

[stbischof]

And please copy Manifest before and after your changes. This helps us to see the differences .

Bit we are on a good way. Thx

[wilx]

The diff with manually concatenated lines for easier comparison:

`--> diff -upd ./org.apache.felix.log-1.3.0/META-INF/MANIFEST.MF ./org.apache.felix.log-1.3.1-SNAPSHOT/META-INF/MANIFEST.MF
--- ./org.apache.felix.log-1.3.0/META-INF/MANIFEST.MF	2025-03-17 19:53:14.737422780 +0100
+++ ./org.apache.felix.log-1.3.1-SNAPSHOT/META-INF/MANIFEST.MF	2025-03-17 19:52:52.601235604 +0100
@@ -1,7 +1,5 @@
 Manifest-Version: 1.0
-Bnd-LastModified: 1684133251156
-Build-Jdk: 11.0.19
-Built-By: jbonofre
+Build-Jdk-Spec: 17
 Bundle-Activator: org.apache.felix.log.Activator
 Bundle-Description: A simple implementation of the OSGi R8 Log service
  .
@@ -11,10 +9,11 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Apache Felix Log Service
 Bundle-SymbolicName: org.apache.felix.log
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.3.0
-Created-By: Apache Maven Bundle Plugin
+Bundle-Version: 1.3.1.SNAPSHOT
+Created-By: Apache Maven Bundle Plugin 6.0.0
 Export-Package: org.osgi.service.log;version="1.5";uses:="org.osgi.framework",org.osgi.service.log.admin;version="1.0";uses:="org.osgi.service.log"
 Import-Package: org.osgi.framework;version="[1.8,2)",org.osgi.framework.wiring;version="[1.2,2)",org.osgi.service.log;version="[1.5,1.6)",org.osgi.service.log.admin;version="[1.0,1.1)",org.osgi.util.tracker;version="[1.5,2)"
-Provide-Capability: osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.osgi.service.log,org.osgi.service.log.admin",osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.osgi.service.log,org.osgi.service.log.admin",osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.osgi.service.log,org.osgi.service.log.admin"
+Provide-Capability: osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.apache.felix.log,org.osgi.service.log",osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.apache.felix.log,org.osgi.service.log,org.osgi.service.log.admin",osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.apache.felix.log,org.osgi.service.log.admin"
 Require-Capability: osgi.service;filter:="(objectClass=org.osgi.service.cm.ConfigurationAdmin)";effective:=active,osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
-Tool: Bnd-3.5.0.201709291849
+Tool: Bnd-7.0.0.202310060912
+

[stbischof]

@laeubi final opinion?
@wilx did you investigated the diff in

-Provide-Capability: osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.osgi.service.log,org.osgi.service.log.admin",osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.osgi.service.log,org.osgi.service.log.admin",osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.osgi.service.log,org.osgi.service.log.admin"
+Provide-Capability: osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.apache.felix.log,org.osgi.service.log",osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.apache.felix.log,org.osgi.service.log,org.osgi.service.log.admin",osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.apache.felix.log,org.osgi.service.log.admin"

[wilx]

osgi.service;objectClass:List="org.osgi.service.log.LogReaderService";uses:="org.apache.felix.log,org.osgi.service.log"

This is different because what I declared, which is IMHO more accurate:

@Capability(
        namespace = ServiceNamespace.SERVICE_NAMESPACE,
        attribute = { "objectClass:List<String>=\"org.osgi.service.log.LogReaderService\"" },
        uses = { LogReaderServiceImpl.class, LogReaderService.class }
)
final class LogReaderServiceImpl implements LogReaderService

osgi.service;objectClass:List="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.apache.felix.log,org.osgi.service.log,org.osgi.service.log.admin"

@Capability(
        namespace = ServiceNamespace.SERVICE_NAMESPACE,
        attribute = { "objectClass:List<String>=\"org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory\"" },
        uses = { LogServiceImpl.class, LogService.class, LoggerFactory.class, LoggerAdmin.class }
)
final class LogServiceImpl implements LogService

objectClass:List="org.osgi.service.log.admin.LoggerAdmin";uses:="org.apache.felix.log,org.osgi.service.log.admin"

@Capability(
        namespace = ServiceNamespace.SERVICE_NAMESPACE,
        attribute = { "objectClass:List<String>=\"org.osgi.service.log.admin.LoggerAdmin\"" },
        uses = { LoggerAdminImpl.class, LoggerAdmin.class }
)
public class LoggerAdminImpl implements LoggerAdmin {

[stbischof]

Thank you!