Commit Graph

1376 Commits

Author SHA1 Message Date
Matt Bishop 9bea50f144 Merge remote-tracking branch 'origin' into slf4j-344-logServiceReader
Conflicts:
	osgi-over-slf4j/pom.xml
2016-01-23 09:40:56 -08:00
Ceki Gulcu fc0ad8652b fix SLF4J-328 2016-01-22 13:20:35 +01:00
Ceki Gulcu 638d74d2b3 blurb about SLF4J-167 2016-01-22 12:51:10 +01:00
Ceki Gulcu 039df71838 minnor edits and improvements 2016-01-22 11:02:52 +01:00
Ceki Gulcu ea3cca72cd fix SLF4J-347 2016-01-21 19:37:07 +01:00
Ceki Gulcu 36209914a2 Merge branch 'master' of github.com:qos-ch/slf4j 2016-01-21 17:15:15 +01:00
Matt Bishop cb7f03af9c Merge pull request #130 from qos-ch/slf4j-341
Replaced maven-bundle-plugin with jar manifest template
2016-01-09 17:52:30 -08:00
Ceki Gulcu dac5171d96 better docs, minor changes 2015-12-15 20:59:26 +01:00
Ceki Gulcu 9c8046d9fe Merge pull request #134 from forsel/slf4j-345
SLF4J-345: Move delegation check loop from log4j-over-slf4j.jar to slf4j-log4j12.jar
2015-12-15 20:31:54 +01:00
Frans Orsel dbe2d72719 Fix ordering of import and static variable/method 2015-12-15 17:26:35 +01:00
Frans Orsel 7a23ca74ae Move delegation loop check from log4j-over-slf4j.jar to slf4j-log4j12.jar, see also SLF4J-345 2015-12-15 17:11:48 +01:00
Matt Bishop c977283dbe Completed Integration tests 2015-12-08 20:14:55 -08:00
Matt Bishop 3e749c3d6f Set framework version requirement 2015-12-08 15:29:27 -08:00
Matt Bishop 869dec3fe6 Switched to MANIFEST template instead of Bundle plugin (see slf4j-341) 2015-12-08 14:59:26 -08:00
Matt Bishop f46c2d8f9a Fixed case where an Exception can be a system-loaded exception but it's cause comes from a bundle. 2015-12-08 13:53:06 -08:00
Matt Bishop 423d7bb3d7 Reformat to match code convention of 2-space indents.
Minor doc edits.
2015-12-08 13:35:11 -08:00
Matt Bishop b62ab13fb8 Missed a copyright update. 2015-12-08 10:51:25 -08:00
Matt Bishop 61add2ba58 Full implementation of OSGi Log Service specification.
Integration test not working yet as it needs slf4j-341 first.
2015-12-08 10:16:21 -08:00
Matt Bishop 6c461383d5 Add Bundle-Category entry.
Remove unnecessary Export-Package entry.
2015-12-05 21:13:41 -08:00
Ceki Gulcu a4c645d188 revert REQUESTED_API_VERSION to 1.6.99 2015-12-03 13:18:09 -08:00
Ceki Gulcu 96d32b3b66 revert REQUESTED_API_VERSION to 1.6.99 2015-12-03 19:31:23 +01:00
Matt Bishop ae2029fae5 Replaced maven-bundle-plugin with jar manifest template. Picks up build-helper-maven-plugin config correctly. 2015-12-01 15:09:29 -08:00
Ceki Gulcu c5ae991668 update REQUESTED_API_VERSION to 1.7.x, as 1.6.x and 1.7.x are binary compatible this change should have no effect 2015-11-13 19:15:19 +01:00
Ceki Gulcu b4f20e193b prepare for next version snapshot 2015-11-11 23:12:25 +01:00
Ceki Gulcu fc84778ffe releasing 1.7.3 2015-11-10 22:02:33 +01:00
Ceki Gulcu 46a49f4303 SLF4J-324: lazy initializaiton of ClassContextSecurityManager in o.s.helpers.Util 2015-11-10 20:35:17 +01:00
Ceki Gulcu 37229d8d62 fix SLF4J-324 2015-11-10 19:54:10 +01:00
Ceki Gulcu c41df923f2 fixing SLF4J-337 2015-11-06 17:43:14 +01:00
Ceki Gulcu 715615cd36 correct line numbering 2015-11-06 15:19:09 +01:00
Ceki Gulcu acfc07008b migrate test to Junit 4 conventions 2015-11-06 14:38:39 +01:00
Ceki Gulcu 18e6156c09 minor edits, code formatting 2015-11-06 13:10:07 +01:00
Ceki Gulcu fd5d546503 Merge pull request #99 from lukecwik/master
Fixed BasicMDCAdapter leaks MDC information to non-child threads
2015-11-06 13:01:11 +01:00
Ceki Gulcu 52fcbbe855 minor update to news.html 2015-10-16 21:03:02 +02:00
Ceki Gulcu 572dabfa7c less in MANIFEST.MF 2015-10-16 20:05:15 +02:00
Ceki Gulcu 91aa1de92b define and use value where it is needed 2015-10-16 13:40:56 +02:00
Ceki Gulcu b3de4f127b removed animal-sniffer from execution during the test phase 2015-10-16 13:35:17 +02:00
Ceki Gulcu 4feb697f44 added comment on why not to pass arguments to JUL 2015-10-16 13:31:12 +02:00
Ceki Gulcu 5ec3e30cbf Revert "Pass arguments to JUL as record parameters"
This reverts commit 2a21579335.

Reasons explained in comments to pull request 97
2015-10-16 11:55:35 +02:00
Ceki Gulcu 014780fde9 Revert "Unit test update for JUL record parameters"
This reverts commit 5e3eebc08d.

Reasons explained in comments to pull request 97.
2015-10-16 11:41:01 +02:00
Ceki Gulcu f29c85d0ad updated to news.html 2015-10-16 11:40:33 +02:00
Ceki Gulcu 3bdcd7f732 reverting commit 7371d14010 dated 2015-04-11 due to issues with the maven-eclipse-plugin 2015-10-15 17:40:08 +02:00
Luke Cwik 3278345952 Merge remote-tracking branch 'upstream/master'
Fix merge conflict in BasicMDCAdapter.java
2015-07-06 09:22:37 -07:00
Matt Bishop 2b23d26bb0 Merge pull request #110 from panchenko/SLF4J-218
SLF4J-218 removed org.apache.log4j.spi.Layout should be without "spi"
2015-07-02 15:02:08 -07:00
Matt Bishop 3b369ef6cf Merge pull request #119 from SvenBunge/removeLegacyJava
Use Java5 features and remove legacy code
2015-06-03 10:18:02 -07:00
Sven Bunge a0454e3535 Remove JDK1.4 legacy check and use more Java5 features (for-each, String#contains, typed collections doesn't need casts) 2015-06-02 22:51:27 +02:00
Matt Bishop d8139b0ecf Merge pull request #117 from hazendaz/master
Move MANIFEST build to Parent
2015-05-12 06:32:10 -07:00
Matt Bishop 4dcada51bd Merge pull request #105 from jmthibault79/jmthibault79-patch-1
Update comments to point to JIRA equivalents of old Bugzilla bugs
2015-05-11 17:24:26 -07:00
Jeremy Landis 0d01426fb6 Add resources directory to site pages 2015-05-01 22:04:27 -04:00
Jeremy Landis 9c8a2b7cd0 Move MANIFEST build to Parent
Add two empty manifest files for integration and slf4j-site
Remove all pieces of manifest building on jar that can be in parent
2015-05-01 22:04:25 -04:00
Luke Cwik 26e7a4f0bf Merge remote-tracking branch 'upstream/master'
Resolved formatting changes for BasicMDCAdapater.java
2015-04-30 13:32:33 -07:00