Sync from SUSE:SLFO:Main slf4j revision fc4131fb05a705172bea467b5b5f65c7
This commit is contained in:
commit
718a57edda
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
202
LICENSE-2.0.txt
Normal file
202
LICENSE-2.0.txt
Normal file
@ -0,0 +1,202 @@
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
15
_service
Normal file
15
_service
Normal file
@ -0,0 +1,15 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://github.com/qos-ch/slf4j.git</param>
|
||||
<param name="revision">v_1.7.36</param>
|
||||
<param name="match-tag">v_*</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="versionrewrite-pattern">v_(.*)</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled"/>
|
||||
</services>
|
||||
13
build-remove-slf4j_api-binder.patch
Normal file
13
build-remove-slf4j_api-binder.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Les fichiers binaires actual//build.xml.tar.bz2 et patched//build.xml.tar.bz2 sont différents.
|
||||
diff -uNr actual//slf4j-api/maven-build.xml patched//slf4j-api/maven-build.xml
|
||||
--- actual//slf4j-api/maven-build.xml 2011-04-11 14:32:50.000000000 +0200
|
||||
+++ patched//slf4j-api/maven-build.xml 2011-04-12 17:30:10.248498005 +0200
|
||||
@@ -79,6 +79,8 @@
|
||||
<copy todir="${maven.build.outputDir}">
|
||||
<fileset dir="${maven.build.resourceDir.0}"/>
|
||||
</copy>
|
||||
+ <echo>Removing slf4j-api's dummy StaticLoggerBinder and StaticMarkerBinder</echo>
|
||||
+ <delete dir="${maven.build.outputDir}/org/slf4j/impl"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
BIN
build.xml.tar.xz
(Stored with Git LFS)
Normal file
BIN
build.xml.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
2
pre_checkin.sh
Normal file
2
pre_checkin.sh
Normal file
@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
cp slf4j.changes slf4j-sources.changes
|
||||
BIN
slf4j-1.7.36.tar.xz
(Stored with Git LFS)
Normal file
BIN
slf4j-1.7.36.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
42
slf4j-commons-lang3.patch
Normal file
42
slf4j-commons-lang3.patch
Normal file
@ -0,0 +1,42 @@
|
||||
--- slf4j-1.7.25/slf4j-ext/src/main/java/org/slf4j/ext/MDCStrLookup.java 2016-12-22 19:54:22.000000000 +0100
|
||||
+++ slf4j-1.7.25/slf4j-ext/src/main/java/org/slf4j/ext/MDCStrLookup.java 2018-10-22 12:34:02.781643219 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
package org.slf4j.ext;
|
||||
|
||||
-import org.apache.commons.lang.text.StrLookup;
|
||||
+import org.apache.commons.lang3.text.StrLookup;
|
||||
import org.slf4j.MDC;
|
||||
|
||||
/**
|
||||
--- slf4j-1.7.25/slf4j-site/src/site/pages/extensions.html 2016-12-22 19:54:23.000000000 +0100
|
||||
+++ slf4j-1.7.25/slf4j-site/src/site/pages/extensions.html 2018-10-22 12:34:02.781643219 +0200
|
||||
@@ -602,7 +602,7 @@
|
||||
where data is a reference to the EventData object.</p>
|
||||
|
||||
<pre class="prettyprint source">import org.slf4j.MDC;
|
||||
-import org.apache.commons.lang.time.DateUtils;
|
||||
+import org.apache.commons.lang3.time.DateUtils;
|
||||
|
||||
import javax.servlet.Filter;
|
||||
import javax.servlet.FilterConfig;
|
||||
@@ -832,7 +832,7 @@
|
||||
<p>Some classes may misbehave when being rendered with "object.toString()" so they may be explicitly disabled
|
||||
in the logback configuration file permanently. For instance the ToStringBuilder in the Apache Jakarta commons lang
|
||||
package is a prime candidate for this. For logback add this snippet to logback.xml:
|
||||
- <pre><logger name="org.apache.commons.lang.builder" level="OFF" /></pre>
|
||||
+ <pre><logger name="org.apache.commons.lang3.builder" level="OFF" /></pre>
|
||||
</p>
|
||||
|
||||
|
||||
--- slf4j-1.7.25/slf4j-site/src/site/pages/news.html 2017-03-16 17:16:09.000000000 +0100
|
||||
+++ slf4j-1.7.25/slf4j-site/src/site/pages/news.html 2018-10-22 12:34:02.785643241 +0200
|
||||
@@ -966,7 +966,7 @@
|
||||
used with Apache Commons Lang's <code>StrSubstitutor</code> class to
|
||||
inject values in the SLF4J MDC into strings. Information on
|
||||
StrSubstitutor can be found at <a
|
||||
- href="http://commons.apache.org/lang/api-release/org/apache/commons/lang/text/StrSubstitutor.html">StrSubstitutor
|
||||
+ href="http://commons.apache.org/lang/api-release/org/apache/commons/lang3/text/StrSubstitutor.html">StrSubstitutor
|
||||
javadoc</a>.
|
||||
</p>
|
||||
|
||||
10
slf4j-reload4j-bundlename.patch
Normal file
10
slf4j-reload4j-bundlename.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- slf4j-1.7.36/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF 2022-02-08 14:32:21.000000000 +0100
|
||||
+++ slf4j-1.7.36/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF 2022-02-24 21:41:59.547775126 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
Implementation-Title: slf4j-reload4j
|
||||
Bundle-ManifestVersion: 2
|
||||
-Bundle-SymbolicName: slf4j.reload4k
|
||||
+Bundle-SymbolicName: slf4j.reload4j
|
||||
Bundle-Name: slf4j-reload4j
|
||||
Bundle-Vendor: SLF4J.ORG
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||
256
slf4j.changes
Normal file
256
slf4j.changes
Normal file
@ -0,0 +1,256 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 30 16:41:16 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Do not require junit and ant-junit, since we don't run tests
|
||||
during the build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 6 12:30:15 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Add symlink to reload4j -> log4j12 for applications that expect
|
||||
that name.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 19 08:06:45 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Build with source/target levels 8
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 25 17:24:17 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to 1.7.36
|
||||
* Changes in 1.7.36:
|
||||
+ Correct corrupt "Export-Package" declaration in MANIFEST.MF
|
||||
in log4j-over-slf4j module
|
||||
+ Starting with version 1.7.36, slf4j releases will be
|
||||
reproducible. By reproducible we mean that anyone checking out
|
||||
the code corresponding to the release version from source code
|
||||
repository and building that local copy, will obtain an
|
||||
identical binary to the published binary.
|
||||
* Changes 1.7.35
|
||||
+ In this release, the "slf4j-log4j12" artifact automatically
|
||||
instructs Maven to use the "slf4j-reload4j" artifact instead.
|
||||
As you might have guessed, the "slf4j-reload4j" binding
|
||||
delegates log processing to the reload4j logging framework.
|
||||
+ Fix incorrect version number in the relocation element in
|
||||
slf4j-log4j12/pom.ml
|
||||
* Changes in 1.7.34
|
||||
+ The relocation element in slf4j-log4j12 had incorrect version
|
||||
number. Version 1.7.34 should not be used.
|
||||
* Changes in 1.7.33
|
||||
+ SLF4J now ships with the slf4j-reload4j module delegating to
|
||||
the reload4j backend.
|
||||
+ SimpleLogger now prints the thread Id if instructed to do so.
|
||||
This fixes SLF4J-499.
|
||||
- Added patch:
|
||||
* slf4j-reload4j-bundlename.patch
|
||||
+ fix a typo in source reload4k -> reload4j
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 24 07:08:36 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Do not use a separate spec file for sources, since now they
|
||||
can be built in the same run as the other artifacts
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 23 07:17:10 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Removed patch:
|
||||
* slf4j-reload4j.patch
|
||||
+ the incompatibility is now handled in reload4j itself
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 22 20:45:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Fetch sources using source service
|
||||
- Depend for build on reload4j
|
||||
- Fix dependencies of the module slf4j-log4j12
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 22 09:50:47 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* slf4j-reload4j.patch
|
||||
+ fix build against reload4j
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 29 10:53:06 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
|
||||
|
||||
- Update to upstream version 1.7.32
|
||||
* In the slf4j-simple module, SimpleLogger now caters for
|
||||
concurrent access.
|
||||
- Update to upstream version 1.7.31
|
||||
* In the jcl-over-slf4j module avoid Object to String conversion.
|
||||
* In the log4j-over-slf4j module added empty constructors for
|
||||
ConsoleAppender.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 11 19:11:24 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Don't use %%mvn_artifact, but %%add_maven_depmap for the
|
||||
sources artifacts, so that they don't suck in half of the xmvn*
|
||||
stack in order to build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 26 12:40:57 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to upstream version 1.7.30
|
||||
- Removed patch:
|
||||
* slf4j-Disallow-EventData-deserialization-by-default.patch
|
||||
+ not needed any more
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 18 09:09:30 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Use the source tarball from github, since the previous one is
|
||||
not accessible anymore
|
||||
- Modified patches:
|
||||
* slf4j-Disallow-EventData-deserialization-by-default.patch
|
||||
+ Adapt to unix line-ends
|
||||
* slf4j-commons-lang3.patch
|
||||
+ Adapt to unix line-ends
|
||||
+ Do not patch inexisting files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 5 12:59:06 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Remove references to parent from all pom files
|
||||
- Avoid dependencies without version tag
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 1 09:01:32 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Build against the compatibility log4j12-mini package
|
||||
- Depend on mvn(log4j:log4j:1.2.17) provided by the compatibility
|
||||
packages
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 19 05:31:47 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Fix an unexpanded ${parsedVersion.osgiVersion} variable in the
|
||||
manifests.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 18 09:34:22 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Split slf4j package into several sub-packages leaving only
|
||||
parent, api, simple and nop in the main package
|
||||
- Package slf4j source jar files in a separate spec file
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 26 09:24:00 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Clean up the maven pom installation
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 22 10:44:00 UTC 2018 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to 1.7.25
|
||||
- Modify the build.xml file tarball to correspond to the right
|
||||
version
|
||||
- Modify slf4j-commons-lang3.patch to the new context
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 15 14:52:23 UTC 2018 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Install the maven artefacts to have mvn dependencies/provides
|
||||
generated automatically
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 18 09:17:44 UTC 2018 - pmonrealgonzalez@suse.com
|
||||
|
||||
- Security fix: [bsc#1085970, CVE-2018-8088]
|
||||
* Disallow EventData deserialization by default
|
||||
* Added slf4j-Disallow-EventData-deserialization-by-default.patch
|
||||
refreshed from Fedora [ https://src.fedoraproject.org/rpms/slf4j/
|
||||
blob/d7cd96bc7a8e8d8d62c8bc62baa7df02cef56c63/f/
|
||||
0001-Disallow-EventData-deserialization-by-default.patch ]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 11 09:08:10 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Adeed patch:
|
||||
* slf4j-commons-lang3.patch
|
||||
+ Use apache-commons-lang3 instead of apache-commons-lang
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 10 13:38:22 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Specify java source and target levels 1.6 in order to allow
|
||||
building with jdk9
|
||||
- Disable doclint to avoid bailing out on formatting errors
|
||||
- Recompress the build.xml.tar.bz2, so that it is a real tar.bz2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 19 16:49:25 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Remove some not-needed deps
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 10 09:07:58 UTC 2015 - dmacvicar@suse.de
|
||||
|
||||
- note:
|
||||
slf4j-pom_xml.patch was removed (not relevant anymore)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 23 10:14:51 UTC 2015 - dmacvicar@suse.de
|
||||
|
||||
- remove all unnecessary maven depmap metadata
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 23 08:56:21 UTC 2015 - dmacvicar@suse.de
|
||||
|
||||
- update to version 1.7.12
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 18 09:46:20 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Fix build with new javapackages-tools
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 29 12:50:01 UTC 2014 - coolo@suse.com
|
||||
|
||||
- build against log4j-mini to avoid a cycle
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 19 14:22:54 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
- self-provide osgi(slf4j.api) symbol
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 13 10:51:12 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
- fix build with apache-commons-lang
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 11 07:49:42 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
- use add_maven_depmap from javapackages-tools
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 9 11:06:22 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Move from jpackage-utils to javapackage-tools
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 27 09:59:40 UTC 2012 - mvyskocil@suse.cz
|
||||
|
||||
- format spec file to be suitable for Factory
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 12 19:31:15 UTC 2011 - dmacvicar@suse.de
|
||||
|
||||
- Fix absolute path in maven-build.xml that prevented
|
||||
package task in newer versions of openSUSE
|
||||
- Fix javadoc group
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 27 09:08:44 UTC 2011 - dmacvicar@suse.de
|
||||
|
||||
- Completely remove all maven build parts. Build with ant
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 4 21:18:38 UTC 2011 - dmacvicar@suse.de
|
||||
|
||||
- add BuildRoot tag
|
||||
|
||||
316
slf4j.spec
Normal file
316
slf4j.spec
Normal file
@ -0,0 +1,316 @@
|
||||
#
|
||||
# spec file for package slf4j
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2000-2009, JPackage Project
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: slf4j
|
||||
Version: 1.7.36
|
||||
Release: 0
|
||||
Summary: Simple Logging Facade for Java
|
||||
# the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
|
||||
License: Apache-2.0 AND MIT
|
||||
Group: Development/Libraries/Java
|
||||
URL: https://www.slf4j.org/
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||
Source2: build.xml.tar.xz
|
||||
Patch1: build-remove-slf4j_api-binder.patch
|
||||
Patch2: slf4j-commons-lang3.patch
|
||||
Patch3: slf4j-reload4j-bundlename.patch
|
||||
BuildRequires: ant >= 1.6.5
|
||||
BuildRequires: apache-commons-lang3
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: cal10n
|
||||
BuildRequires: java-devel >= 1.5.0
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javassist >= 3.4
|
||||
BuildRequires: reload4j
|
||||
Requires: cal10n
|
||||
Requires: java
|
||||
# this is ugly hack, which creates package which requires the same,
|
||||
# however slf4j is not splitted between -api and -impl, but pom files are modeled as it was
|
||||
Provides: osgi(slf4j.api)
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
The Simple Logging Facade for Java or (SLF4J) is intended to serve
|
||||
as a simple facade for various logging APIs allowing to the end-user
|
||||
to plug in the desired implementation at deployment time. SLF4J also
|
||||
allows for a gradual migration path away from
|
||||
Jakarta Commons Logging (JCL).
|
||||
|
||||
Logging API implementations can either choose to implement the
|
||||
SLF4J interfaces directly, e.g. NLOG4J or SimpleLogger. Alternatively,
|
||||
it is possible (and rather easy) to write SLF4J adapters for the given
|
||||
API implementation, e.g. Log4jLoggerAdapter or JDK14LoggerAdapter..
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Documentation/HTML
|
||||
|
||||
%description javadoc
|
||||
API documentation for %{name}.
|
||||
|
||||
%package manual
|
||||
Summary: Documents for %{name}
|
||||
Group: Documentation/Other
|
||||
|
||||
%description manual
|
||||
Manual for %{name}.
|
||||
|
||||
%package jdk14
|
||||
Summary: SLF4J JDK14 Binding
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(org.slf4j:slf4j-api) = %{version}
|
||||
|
||||
%description jdk14
|
||||
SLF4J JDK14 Binding.
|
||||
|
||||
%package reload4j
|
||||
Summary: SLF4J LOG4J-12 Binding
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(ch.qos.reload4j:reload4j)
|
||||
Requires: mvn(org.slf4j:slf4j-api) = %{version}
|
||||
Provides: %{name}-log4j12 = %{version}
|
||||
Obsoletes: %{name}-log4j12 < %{version}
|
||||
|
||||
%description reload4j
|
||||
SLF4J LOG4J-12 Binding.
|
||||
|
||||
%package jcl
|
||||
Summary: SLF4J JCL Binding
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(commons-logging:commons-logging)
|
||||
Requires: mvn(org.slf4j:slf4j-api) = %{version}
|
||||
|
||||
%description jcl
|
||||
SLF4J JCL Binding.
|
||||
|
||||
%package ext
|
||||
Summary: SLF4J Extensions Module
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(org.slf4j:slf4j-api) = %{version}
|
||||
|
||||
%description ext
|
||||
Extensions to the SLF4J API.
|
||||
|
||||
%package -n jcl-over-slf4j
|
||||
Summary: JCL 1.1.1 implemented over SLF4J
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(org.slf4j:slf4j-api) = %{version}
|
||||
|
||||
%description -n jcl-over-slf4j
|
||||
JCL 1.1.1 implemented over SLF4J.
|
||||
|
||||
%package -n log4j-over-slf4j
|
||||
Summary: Log4j implemented over SLF4J
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(org.slf4j:slf4j-api) = %{version}
|
||||
|
||||
%description -n log4j-over-slf4j
|
||||
Log4j implemented over SLF4J.
|
||||
|
||||
%package -n jul-to-slf4j
|
||||
Summary: JUL to SLF4J bridge
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(org.slf4j:slf4j-api) = %{version}
|
||||
|
||||
%description -n jul-to-slf4j
|
||||
JUL to SLF4J bridge.
|
||||
|
||||
%package sources
|
||||
Summary: SLF4J Source JARs
|
||||
Group: Development/Libraries/Java
|
||||
|
||||
%description sources
|
||||
SLF4J Source JARs.
|
||||
|
||||
%prep
|
||||
%setup -q -a2
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
find . -name "*.jar" | xargs rm
|
||||
cp -p %{SOURCE1} APACHE-LICENSE
|
||||
|
||||
sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml
|
||||
|
||||
sed -i -e "s|\${reload4j.version}|1\.2\.19|g" \
|
||||
log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
|
||||
|
||||
%{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | \
|
||||
%{_bindir}/xargs -t perl -pi -e 's/\r$//g'
|
||||
|
||||
# Unexpanded variable in the manifests
|
||||
for i in */src/main/resources/META-INF/MANIFEST.MF; do
|
||||
echo "" >> ${i}
|
||||
echo "Bundle-Version: %{version}" >> ${i}
|
||||
sed -i '/^$/d' ${i}
|
||||
perl -pi -e 's#\$\{parsedVersion\.osgiVersion\}#%{version}#g' ${i}
|
||||
perl -pi -e 's#\$\{slf4j\.api\.minimum\.compatible\.version\}#1\.6\.0#g' ${i}
|
||||
done
|
||||
|
||||
# The general pattern is that the API package exports API classes and does
|
||||
# # not require impl classes. slf4j was breaking that causing "A cycle was
|
||||
# # detected when generating the classpath slf4j.api, slf4j.nop, slf4j.api."
|
||||
# # The API bundle requires impl package, so to avoid cyclic dependencies
|
||||
# # during build time, it is necessary to mark the imported package as an
|
||||
# # optional one.
|
||||
# # Reported upstream: http://bugzilla.slf4j.org/show_bug.cgi?id=283
|
||||
sed -i "/Import-Package/s/$/;resolution:=optional/" slf4j-api/src/main/resources/META-INF/MANIFEST.MF
|
||||
|
||||
%pom_change_dep -r -f ::::: :::::
|
||||
|
||||
%build
|
||||
export CLASSPATH=$(build-classpath reload4j \
|
||||
commons-logging \
|
||||
commons-lang3 \
|
||||
javassist-3.14.0 \
|
||||
cal10n)
|
||||
export CLASSPATH=$CLASSPATH:$(pwd)/slf4j-api/target/slf4j-api-%{version}.jar
|
||||
export MAVEN_REPO_LOCAL=$(pwd)/.m2
|
||||
ant -Dmaven2.jpp.mode=true \
|
||||
-Dmaven.test.skip=true \
|
||||
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
||||
package javadoc \
|
||||
|
||||
# Sources
|
||||
for i in api ext jcl jdk14 reload4j nop simple; do
|
||||
mkdir -p %{name}-${i}/target
|
||||
jar cf %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar -C %{name}-${i}/src/main/java .
|
||||
jar uf %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar -C %{name}-${i}/src/main/resources .
|
||||
done
|
||||
|
||||
for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
|
||||
mkdir -p ${i}/target
|
||||
jar cf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/java .
|
||||
jar uf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/resources .
|
||||
done
|
||||
|
||||
%install
|
||||
# jars
|
||||
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
|
||||
|
||||
for i in api ext jcl jdk14 reload4j nop simple; do
|
||||
install -m 644 slf4j-${i}/target/slf4j-${i}-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{name}/${i}.jar
|
||||
ln -sf ${i}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar
|
||||
done
|
||||
|
||||
# Compatibility symlink
|
||||
ln -sf reload4j.jar %{buildroot}%{_javadir}/%{name}/log4j12.jar
|
||||
ln -sf reload4j.jar %{buildroot}%{_javadir}/%{name}/%{name}-log4j12.jar
|
||||
|
||||
for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
|
||||
install -m 644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
|
||||
done
|
||||
|
||||
for i in api ext jcl jdk14 reload4j nop simple; do
|
||||
install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar \
|
||||
%{buildroot}%{_javadir}/%{name}/%{name}-${i}-sources.jar
|
||||
done
|
||||
|
||||
for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
|
||||
install -pm 0644 ${i}/target/${i}-%{version}-sources.jar \
|
||||
%{buildroot}%{_javadir}/%{name}/${i}-sources.jar
|
||||
done
|
||||
|
||||
# poms
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
|
||||
|
||||
for i in api ext jcl jdk14 reload4j nop simple; do
|
||||
%pom_remove_parent slf4j-${i}
|
||||
%pom_xpath_inject "pom:project" "
|
||||
<groupId>org.slf4j</groupId>
|
||||
<version>%{version}</version>" slf4j-${i}
|
||||
install -pm 644 slf4j-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
|
||||
done
|
||||
|
||||
for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
|
||||
%pom_remove_parent ${i}
|
||||
%pom_xpath_inject "pom:project" "
|
||||
<groupId>org.slf4j</groupId>
|
||||
<version>%{version}</version>" ${i}
|
||||
install -pm 644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
|
||||
done
|
||||
|
||||
for i in api nop simple; do
|
||||
%add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar
|
||||
done
|
||||
|
||||
for i in ext jcl jdk14 jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
|
||||
%add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
|
||||
done
|
||||
|
||||
%add_maven_depmap %{name}/reload4j.pom %{name}/reload4j.jar -f reload4j -a org.slf4j:%{name}-log4j12
|
||||
|
||||
for i in api ext jcl jdk14 reload4j nop simple; do
|
||||
%add_maven_depmap org.slf4j:%{name}-${i}:jar:sources:%{version} %{name}/%{name}-${i}-sources.jar -f sources
|
||||
done
|
||||
|
||||
%add_maven_depmap org.slf4j:%{name}-log4j12:jar:sources:%{version} %{name}/%{name}-reload4j-sources.jar -f sources
|
||||
|
||||
for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
|
||||
%add_maven_depmap org.slf4j:${i}:jar:sources:%{version} %{name}/${i}-sources.jar -f sources
|
||||
done
|
||||
|
||||
# manual
|
||||
install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}
|
||||
rm -f target/site/.htaccess
|
||||
cp -pr target/site %{buildroot}%{_docdir}/%{name}-%{version}/
|
||||
install -m 644 LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}/
|
||||
|
||||
# javadoc
|
||||
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr target/site/* %{buildroot}%{_javadocdir}/%{name}/
|
||||
rm -rf target/site
|
||||
|
||||
%files -f .mfiles
|
||||
%dir %{_docdir}/%{name}-%{version}
|
||||
%license %{_docdir}/%{name}-%{version}/LICENSE.txt
|
||||
%{_javadir}/%{name}/%{name}-api.jar
|
||||
%{_javadir}/%{name}/%{name}-nop.jar
|
||||
%{_javadir}/%{name}/%{name}-simple.jar
|
||||
|
||||
%files jdk14 -f .mfiles-jdk14
|
||||
%{_javadir}/%{name}/%{name}-jdk14.jar
|
||||
|
||||
%files reload4j -f .mfiles-reload4j
|
||||
%{_javadir}/%{name}/%{name}-reload4j.jar
|
||||
%{_javadir}/%{name}/*log4j12.jar
|
||||
|
||||
%files jcl -f .mfiles-jcl
|
||||
%{_javadir}/%{name}/%{name}-jcl.jar
|
||||
|
||||
%files ext -f .mfiles-ext
|
||||
%{_javadir}/%{name}/%{name}-ext.jar
|
||||
|
||||
%files -n jcl-over-slf4j -f .mfiles-jcl-over-slf4j
|
||||
|
||||
%files -n log4j-over-slf4j -f .mfiles-log4j-over-slf4j
|
||||
|
||||
%files -n jul-to-slf4j -f .mfiles-jul-to-slf4j
|
||||
|
||||
%files sources -f .mfiles-sources
|
||||
|
||||
%files javadoc
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%files manual
|
||||
%{_docdir}/%{name}-%{version}/site
|
||||
|
||||
%changelog
|
||||
Loading…
Reference in New Issue
Block a user