Commit Graph

2109 Commits

Author SHA1 Message Date
Hannes Wellmann 0b4d88edef Use project.name in Bundle-Name and simplify slf4j-api OSGi metadata gen
The value of project.name is more expressive than the previously used
project.artifactId.

Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
2023-04-10 00:11:41 +02:00
Hannes Wellmann 2ec7c1034c Replace all remaining OSGi MANIFEST.MF by bundle-plugin instructions
This ensures that there is only a single source for OSGi metadata.
Additionally this improves the metadata for some Export-Package entries.

Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
2023-04-10 00:11:41 +02:00
Hannes Wellmann df44ace9c3 Automate OSGi metadata creation and fix metadata for other slf4j-modules
Only use the maven-bundle-plugin to generate all OSGi metadata into
slf4j's Manifest.MF files. This unifies the resulting MANIFEST.MFs
that are currently partly generated and partly statically defined and
fixes the following aspects:

- Fix the package-export of slf4j-jdk-platform-logging (from
'slf4j.jdk.platform.logging' to 'org.slf4j.jdk.platform.logging')
- Import missing packages for slf4j-reload4j and log4j-over-slf4j
- Replace the deprecated 'Bundle-RequiredExecutionEnvironment' by a
corresponding required 'osgi.ee' capability
- Restores the exported packages of jcl-over-slf4j

Fixes https://jira.qos.ch/browse/SLF4J-578

Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
2023-04-10 00:11:41 +02:00
Hannes Wellmann 661869eeb2 Adapt project names from 'Binding' to 'Provider'
Since slf4j 2 Bindings are now called Providers. The corresponding Maven
project names and descriptions should be adapted accordingly.

Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
2023-04-09 18:25:43 +02:00
Ceki Gulcu cff3312e43 start work on 2.0.8-SNAPSHOT
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2023-03-17 20:41:07 +01:00
Ceki Gulcu d6a21ae68f update javadoc plugin to version 3.0.5
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2023-03-17 20:35:35 +01:00
Ceki Gulcu 13950e51a6 prepare release 2.0.7
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2023-03-17 19:49:13 +01:00
Ceki Gulcu 122e0c18dd add LICENSE.txt files to all modules, rename LICENSE as LICENSE.txt when appropriate
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2023-03-17 19:35:56 +01:00
TWI 2a8ca99caf add license file to jar 2023-03-17 19:25:44 +01:00
Hannes Wellmann b363bb31ed SLF4J-579: Export client packages of slf4j-api in version 1
Fixes https://jira.qos.ch/browse/SLF4J-576

This allows to use the slf4j-api version 2 artifact as drop-in
replacement for slf4j-api version 1 in OSGi environments as well.
slf4j-api can now be wired to bundles that require packages of slf4j-api
in version 1 or 2.

Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
2023-03-17 18:01:31 +01:00
Hannes Wellmann 2235d3c698
Fully automate OSGi metadata creation and fix brocken OSGi-metadata in slf4j-api (#330)
* Improve generated OSGi metadata and restore Bundle-SymbolicName

Enhance the generated OSGi metadata for all slf4j-modules in the
following ways:
- Restore the Bundle-SymbolicName, Bundle-Name, Bundle-Vendor and
Bundle-DocURL from SLF4J-2.0.5 and before
- Removes Export-Package: META-INF.versions.9
- Removes self-Imports of exported package (has to be added again in a
follow up, where desired)
- Remove unnecessary BND-internal headers

Additionally move the maven-bundle-plugin configuration from the
execution configuration up into the configuration of the plugin so that
it can be easier overwritten in child-modules.

Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>

* Automate OSGi metadata creation and restore package-exports of slf4j-api

Only use the maven-bundle-plugin to generate all OSGi metadata into
slf4j-api's Manifest.MF file. This unifies the resulting MANIFEST.MFs
that are currently partly generated and partly statically defined.

Furthermore it fixes the following flaws in the currently generated OSGi
metadata of slf4j-api:
- Import only the exported org.slf4j.spi package (like in slf4j 2.0.5
and before)
- Replace the deprecated 'Bundle-RequiredExecutionEnvironment' header by
a corresponding required 'osgi.ee' capability

Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>

---------

Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
2023-03-15 21:28:25 +01:00
Sean C. Sullivan a5540ad510 setup-java v3
Signed-off-by: Sean C. Sullivan <github@seansullivan.com>
2022-12-19 20:40:13 +01:00
Ceki Gulcu 1ed084cbc0 add missing distribution instruction to github action
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-12-19 20:25:11 +01:00
Ceki Gulcu b2cb017422 update github action versions
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-12-19 20:21:52 +01:00
Sean C. Sullivan fa6721a53e add JDK 19 to CI build
Signed-off-by: Sean C. Sullivan <github@seansullivan.com>
2022-12-19 20:19:54 +01:00
Ceki Gulcu f85104040c start work on 2.0.7-SNAPSHOT
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-12-12 20:19:53 +01:00
Ceki Gulcu 5ff6f2c385 prepare for release 2.0.6
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-12-12 20:11:11 +01:00
Ceki Gulcu 2f4aa75445 fix SLF4J-575
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-12-10 19:30:48 +01:00
Ceki Gulcu 363f0a534e remove unused parts
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-12-10 00:38:56 +01:00
Jonah Graham 171679baa8 SLF4J-574: Add full OSGi headers, especially "uses" clauses
Fixes: https://jira.qos.ch/browse/SLF4J-574

This uses the BND tool, via org.apache.felix to generate
the MANIFEST.MF to be fully compliant with OSGi.
Compared to using just the maven-jar-plugin to create
the MANIFEST.MF the uses clauses are added to the
Export-Package

Signed-off-by: Jonah Graham <jonah@kichwacoders.com>
2022-12-10 00:10:39 +01:00
Ceki Gulcu 921b5b31e1 fix FUNDING file
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-12-09 13:31:52 +01:00
Ceki Gulcu e02244c39f fix FUNDING file
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-12-09 13:31:16 +01:00
Ceki Gulcu 441d4584be fix FUNDING file
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-12-09 13:30:56 +01:00
Ceki Gulcu f5e741ba1a add FUNDING file
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-12-09 13:30:01 +01:00
Ceki Gulcu 2e71327c8e remove unused log4j dependency in the version definition section of pom.xml
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-11-26 20:43:43 +01:00
Ceki Gulcu 3ff2a30e05 start work on 2.0.6-SNAPSHOT
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-11-25 13:33:29 +01:00
Ceki Gulcu 7e62e1e691 prepare release 2.0.5
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-11-25 12:40:18 +01:00
Ceki Gulcu d250ad79eb in jcl-over-slf4j rename LICENSE.TXT as LICENSE, add LICENSE file to log4j-over-slf4j
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-11-25 09:56:46 +01:00
Ceki Gulcu 3bc58f3e81 add SecurityManager support
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-11-24 20:12:00 +01:00
Ceki Gulcu 207bb299c3 start work on 2.0.5-SNAPSHOT
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-11-17 21:38:06 +01:00
Ceki Gulcu 35dd7ff1e7 removed unused META-INF/services entry
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-11-17 21:25:09 +01:00
Ceki Gulcu 440c2f3000 prepare release 2.0.4
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-11-17 21:04:44 +01:00
Ceki Gulcu 43a36303e5 use the class loader that loaded LoggerFactory (instead of the threadContextClassLoader) to find providers
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-11-17 20:49:29 +01:00
Piotr P. Karwasz 557bf7c0bd [SLF4J-548] Fix ServiceLoader usage in servlet environment
If both the servlet container and a web application use SLF4J,
`ServiceLoader` calls are susceptible to three problems:

1. The SLF4J copy in the webapp detects the common providers by can not
instantiate them (they implement a different copy of
`SLF4JProviderService`),
2. The SLF4J copy in the common classloader can bind the providers in
the webapp classloader and cause a memory leak,
3. If the server uses a SecurityManager the static initialization of
`LoggerFactory` fails if called by unprivileged code.

This PR should solve these problems.

Signed-off-by: Piotr P. Karwasz <piotr.github@karwasz.org>
2022-11-17 19:28:19 +01:00
Stefan Bischof 632410565b enhance manifest with capabilities
provide for SLF4JServiceProvider (with name attribute
require for registrar

Signed-off-by: Stefan Bischof <stbischof@bipolis.org>
2022-11-14 18:30:33 +01:00
Ceki Gulcu e540299d58 edit blurb on release championing 2022-10-11 21:18:58 +02:00
Ceki Gülcü dfb41b06a8
Update README.md 2022-10-11 21:04:18 +02:00
Ceki Gulcu 47c7cc7fa4 clarify Logger.makeLoggingEventBuilder javadoc
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-09-28 15:25:09 +02:00
Ceki Gulcu 0be1bc15f2 Merge branch 'master' of github.com:qos-ch/slf4j 2022-09-28 15:24:06 +02:00
Ceki Gülcü d60690c0b9
more flexible way to 2022-09-28 15:23:30 +02:00
Ceki Gülcü 6720d8db66
Update README.md 2022-09-28 15:10:51 +02:00
Ceki Gülcü 72a0bc6528
Update README.md 2022-09-28 15:04:47 +02:00
Ceki Gülcü f276d52d96
Update README.md 2022-09-28 15:04:20 +02:00
Ceki Gulcu 7cad6082dc Merge branch 'master' of github.com:qos-ch/slf4j 2022-09-28 13:44:04 +02:00
Kengo TODA 143978ce05 annotates new methods to help static analysis tools
Signed-off-by: Kengo TODA <skypencil@gmail.com>
2022-09-28 13:43:36 +02:00
Ceki Gulcu 88b0ee3c1f start work on 2.0.4-SNAPSHOT
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-09-28 13:30:20 +02:00
Ceki Gulcu b2cb05f16a prepare release 2.0.3
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-09-28 12:15:18 +02:00
Ceki Gulcu 4b5bb41ede fix SLF4J-546, Fluent logging API doesn't populate timestamp with Reload4JLogger
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-09-28 12:05:26 +02:00
Ceki Gulcu b500a6fdfd javadoc explaining using multiple markers instead of nested markers
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-09-26 19:58:49 +02:00
Ceki Gulcu d81affb012 comment about ThreadLocal key or value types
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
2022-09-26 19:57:31 +02:00