Compare commits
54 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
92a856e31b | ||
|
|
914f989f4d | ||
|
c7a098f39a | ||
|
1b31dee501 | ||
|
|
9c283d8f78 | ||
|
|
f4d6467553 | ||
|
|
d11bb11be8 | ||
|
|
91348703eb | ||
|
|
4938821042 | ||
|
|
f714242f80 | ||
|
|
4e35a74087 | ||
|
|
40c65b758a | ||
|
|
9b2d65ce37 | ||
|
|
0fb200fe14 | ||
|
|
e2219eac0e | ||
|
|
37b6592d15 | ||
|
|
ee2793e5b3 | ||
|
|
6ce5489486 | ||
|
|
559863b3bd | ||
|
|
7eb94a38a6 | ||
|
|
87910cfe55 | ||
|
|
08a9f51941 | ||
|
2f401fd7d7 | ||
|
|
5a58514871 | ||
|
|
7c32905f7b | ||
|
|
c6a5b9dfb5 | ||
|
|
0b882bc5f0 | ||
|
|
7a07222e56 | ||
|
|
76e5c2c258 | ||
|
|
6e5af8ea01 | ||
|
|
05d12eeb1b | ||
|
|
147e4b7e66 | ||
|
|
855a63415f | ||
|
|
23475b2de7 | ||
|
|
102f227966 | ||
|
|
bef82dbdab | ||
|
|
0635f6f62d | ||
|
|
b2302665b3 | ||
|
|
8f198644fc | ||
|
|
ab22e681f5 | ||
|
|
635d8cd723 | ||
|
|
38c27f06bf | ||
|
58cef2d7e7 |
||
|
|
450e825d95 |
||
|
|
a304f8ddfb | ||
|
|
e0d59aca23 | ||
|
02521f4a35 | ||
|
|
5409c2c3d5 |
||
|
|
81ad288263 |
||
|
|
dbe5310aaf |
||
|
1a5f2821e7 | ||
|
|
aadb89a9b8 | ||
|
|
f19ba5a79a | ||
|
|
9db1579af8 |
16 changed files with 673 additions and 418 deletions
1
.fmf/version
Normal file
1
.fmf/version
Normal file
|
|
@ -0,0 +1 @@
|
|||
1
|
||||
11
.gitignore
vendored
11
.gitignore
vendored
|
|
@ -1,6 +1,7 @@
|
|||
/results_*
|
||||
/*.src.rpm
|
||||
|
||||
/KEYS
|
||||
/apache-log4j-1.2.16.tar.gz
|
||||
/log4j-1.2.17.tar.gz
|
||||
/apache-log4j-2.0-rc1-src.tar.gz
|
||||
|
|
@ -19,3 +20,13 @@
|
|||
/apache-log4j-2.13.0-src.tar.gz
|
||||
/apache-log4j-2.13.1-src.tar.gz
|
||||
/apache-log4j-2.13.3-src.tar.gz
|
||||
/apache-log4j-2.14.1-src.tar.gz
|
||||
/apache-log4j-2.15.0-src.tar.gz
|
||||
/apache-log4j-2.16.0-src.tar.gz
|
||||
/apache-log4j-2.17.0-src.tar.gz
|
||||
/apache-log4j-2.17.1-src.tar.gz
|
||||
/apache-log4j-2.17.1-src.tar.gz.asc
|
||||
/apache-log4j-2.17.2-src.tar.gz
|
||||
/apache-log4j-2.17.2-src.tar.gz.asc
|
||||
/log4j-2.17.2.tar.gz
|
||||
/log4j-2.20.0.tar.gz
|
||||
|
|
|
|||
46
0002-Remove-usage-of-toolchains.patch
Normal file
46
0002-Remove-usage-of-toolchains.patch
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
From 22d40a2e43583647f3337489ac9e286883586bcd Mon Sep 17 00:00:00 2001
|
||||
From: Marian Koncek <mkoncek@redhat.com>
|
||||
Date: Tue, 6 Jun 2023 15:06:14 +0200
|
||||
Subject: [PATCH] Remove usage of toolchains
|
||||
|
||||
---
|
||||
log4j-api-java9/pom.xml | 9 ---------
|
||||
1 file changed, 9 deletions(-)
|
||||
|
||||
diff --git a/log4j-api-java9/pom.xml b/log4j-api-java9/pom.xml
|
||||
index e78fe4a..4a669e1 100644
|
||||
--- a/log4j-api-java9/pom.xml
|
||||
+++ b/log4j-api-java9/pom.xml
|
||||
@@ -76,9 +76,6 @@
|
||||
<goal>compile</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
- <jdkToolchain>
|
||||
- <version>[9, )</version>
|
||||
- </jdkToolchain>
|
||||
<release>9</release>
|
||||
</configuration>
|
||||
</execution>
|
||||
@@ -98,9 +95,6 @@
|
||||
<goal>testCompile</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
- <jdkToolchain>
|
||||
- <version>[9, )</version>
|
||||
- </jdkToolchain>
|
||||
<release>9</release>
|
||||
<compileSourceRoots>
|
||||
<compileSourceRoot>${project.basedir}/src/test/java9</compileSourceRoot>
|
||||
@@ -128,9 +122,6 @@
|
||||
<systemPropertyVariables>
|
||||
<java.awt.headless>true</java.awt.headless>
|
||||
</systemPropertyVariables>
|
||||
- <jdkToolchain>
|
||||
- <version>[9, )</version>
|
||||
- </jdkToolchain>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
--
|
||||
2.40.1
|
||||
|
||||
399
changelog
Normal file
399
changelog
Normal file
|
|
@ -0,0 +1,399 @@
|
|||
* Wed Jul 24 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.20.0-9
|
||||
- Install license files in licensedir instead of docdir
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.20.0-7
|
||||
- Rebuilt for java-21-openjdk as system jdk
|
||||
|
||||
* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 2.20.0-6
|
||||
- bump of release for for java-21-openjdk as system jdk
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.20.0-3
|
||||
- Rebuild
|
||||
|
||||
* Tue Aug 22 2023 Marian Koncek <mkoncek@redhat.com> - 2.20.0-2
|
||||
- Do not install zip files
|
||||
|
||||
* Mon Aug 21 2023 Marian Koncek <mkoncek@redhat.com> - 2.20.0-1
|
||||
- Update to upstream version 2.20.0
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.2-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Fri Mar 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.17.2-9
|
||||
- Re-enable javadoc package
|
||||
|
||||
* Fri Feb 24 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.17.2-8
|
||||
- Remove dependency on jackson in jp_minimal mode
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Oct 24 2022 Marian Koncek <mkoncek@redhat.com> - 2.17.2-6
|
||||
- Re-add log4j-web subpackage
|
||||
|
||||
* Thu Oct 13 2022 Marian Koncek <mkoncek@redhat.com> - 2.17.2-5
|
||||
- Remove the rest of glyphicons files
|
||||
|
||||
* Thu Oct 13 2022 Marian Koncek <mkoncek@redhat.com> - 2.17.2-4
|
||||
- Remove glyphicons zip archive from source package
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Tue Apr 26 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.17.2-2
|
||||
- Fix compatibility with Java 8
|
||||
|
||||
* Sun Feb 27 2022 Paul Wouters <paul.wouters@aiven.io> - 2.17.2-1
|
||||
- Resolves: rhbz#2058949 log4j-2.17.2 is available (1.2 bridge bugfixes)
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.17.1-4
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jan 06 2022 Malcolm Inglis <miinglis@amazon.com> - 2.17.1-2
|
||||
- Enable GPG signature verification of sources
|
||||
|
||||
* Tue Dec 28 2021 Paul Wouters <paul.wouters@aiven.io> - 2.17.1-1
|
||||
- Update log4j to 2.17.1 for CVE-2021-44832 RCE via JDBC Appender (when attacker controls config)
|
||||
|
||||
* Sat Dec 18 2021 Paul Wouters <paul.wouters@aiven.io> - 2.17.0-1
|
||||
- Update log4j to 2.17.0 for CVE-2021-45105 Denial of Service attack
|
||||
|
||||
* Mon Dec 13 2021 Paul Wouters <paul.wouters@aiven.io> - 2.16.0-1
|
||||
- Update log4j to 2.16.0 - Disables JNDI by default
|
||||
|
||||
* Sun Dec 12 2021 Sérgio Basto <sergio@serjux.com> - 2.15.0-1
|
||||
- Update log4j to 2.15.0 (#2030907)
|
||||
- Security fix for CVE-2021-44228 (#2030945)
|
||||
|
||||
* Sun Aug 01 2021 Sérgio Basto <sergio@serjux.com> - 2.14.1-1
|
||||
- Update to 2.14.1
|
||||
- Disable javadoc (#1988896)
|
||||
- Build with jansi-2
|
||||
- Remove deps on slf4j-ext (no longer available in Fedora 35)
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Dec 14 2020 Jerry James <loganjerry@gmail.com> - 2.13.3-2
|
||||
- Update jansi dep to jansi1
|
||||
|
||||
* Thu Aug 20 2020 Fabio Valentini <decathorpe@gmail.com> - 2.13.3-1
|
||||
- Update to version 2.13.3.
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 20 2020 Fabio Valentini <decathorpe@gmail.com> - 2.13.1-3
|
||||
- Add missing javax.activation dependency.
|
||||
|
||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 2.13.1-2
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Mon Mar 02 2020 Fabio Valentini <decathorpe@gmail.com> - 2.13.1-1
|
||||
- Update to version 2.13.1.
|
||||
- Drop upstream patch that's included in the new release.
|
||||
- Rebase patch for removing the unsupported SLF4J EventDataConverter.
|
||||
|
||||
* Thu Jan 30 2020 Fabio Valentini <decathorpe@gmail.com> - 2.13.0-3
|
||||
- Add upstream patch for compatibility with the latest slf4j versions.
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Jan 06 2020 Alexander Scheel <ascheel@redhat.com> - 2.13.0-1
|
||||
- Rebase to version 2.13.0
|
||||
|
||||
* Sun Oct 20 2019 Fabio Valentini <decathorpe@gmail.com> - 2.12.1-1
|
||||
- Update to version 2.12.1.
|
||||
|
||||
* Mon Sep 30 2019 Fabio Valentini <decathorpe@gmail.com> - 2.12.0-1
|
||||
- Update to version 2.12.0.
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Jun 11 2019 Miro Hrončok <mhroncok@redhat.com> - 2.11.1-4
|
||||
- Drop log4j-taglib, log4j-web, log4j-bom, log4j-nosql and log4j-jmx-gui
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Aug 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 2.11.1-2
|
||||
- Add explicit requirement on javapackages-tools for log4j-jmx
|
||||
script. See RHBZ#1600426.
|
||||
|
||||
* Tue Aug 07 2018 Michael Simacek <msimacek@redhat.com> - 2.11.1-1
|
||||
- Update to upstream version 2.11.1
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon May 28 2018 Michael Simacek <msimacek@redhat.com> - 2.9.1-4
|
||||
- Disable liquibase to fix FTBFS
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Oct 13 2017 Michael Simacek <msimacek@redhat.com> - 2.9.1-2
|
||||
- Update to upstream version 2.9.1
|
||||
|
||||
* Mon Sep 18 2017 Michael Simacek <msimacek@redhat.com> - 2.9.0-1
|
||||
- Update to upstream version 2.9.0
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Thu Apr 06 2017 Michael Simacek <msimacek@redhat.com> - 2.8.2-1
|
||||
- Update to upstream version 2.8.2
|
||||
|
||||
* Wed Mar 29 2017 Michael Simacek <msimacek@redhat.com> - 2.8.1-1
|
||||
- Update to upstream version 2.8.1
|
||||
|
||||
* Wed Mar 15 2017 Michael Simacek <msimacek@redhat.com> - 2.7-4
|
||||
- Add jp_minimal conditional
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 2.7-2
|
||||
- Cleanup osgi parts
|
||||
- Add conditional for nosql
|
||||
|
||||
* Wed Nov 09 2016 Michael Simacek <msimacek@redhat.com> - 2.7-1
|
||||
- Update to upstream version 2.7
|
||||
- Remove stuff marked as "Remove in F24"
|
||||
|
||||
* Thu Jun 23 2016 Michael Simacek <msimacek@redhat.com> - 2.6.1-1
|
||||
- Update to upstream version 2.6.1
|
||||
|
||||
* Thu Jun 16 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5-4
|
||||
- Remove RAT depenency from BOM package
|
||||
|
||||
* Mon May 23 2016 Michael Simacek <msimacek@redhat.com> - 2.5-3
|
||||
- Remove maven-remote-resources-plugin to fix FTBFS
|
||||
|
||||
* Mon Feb 15 2016 Michael Simacek <msimacek@redhat.com> - 2.5-2
|
||||
- Split log4j-liquibase into separate subpackage
|
||||
|
||||
* Mon Feb 15 2016 Michael Simacek <msimacek@redhat.com> - 2.5-1
|
||||
- Update to upstream version 2.5
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Tue Jun 2 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-1
|
||||
- Update to upstream version 2.3
|
||||
|
||||
* Thu Feb 26 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-1
|
||||
- Update to upstream version 2.2
|
||||
|
||||
* Mon Jan 19 2015 Michael Simacek <msimacek@redhat.com> - 2.0-2
|
||||
- Remove site-plugin from all poms
|
||||
|
||||
* Fri Jul 18 2014 Michael Simacek <msimacek@redhat.com> 2.0-1
|
||||
- Update to upstream version 2.0
|
||||
- Remove osgi subpackage (osgi parts were moved to corresponding artifacts)
|
||||
- Add web, bom, nosql subpackages (new)
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-0.3.rc1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri May 16 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-0.2.rc1
|
||||
- Drop provides for log4j-manual
|
||||
|
||||
* Fri May 09 2014 Michael Simacek <msimacek@redhat.com> - 0:2.0-0.1.rc1
|
||||
- Update to upstream version 2.0-rc1
|
||||
- Split into subpackages
|
||||
- Remove logfactor and chainsaw scripts which are no longer shipped
|
||||
- Remove XML catalogs which are no longer shipped
|
||||
|
||||
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.17-16
|
||||
- Use Requires: java-headless rebuild (#1067528)
|
||||
|
||||
* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 0:1.2.17-15
|
||||
- Set javamail and geronimo-jms dependency scopes to provided (removes requires)
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.17-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Jul 11 2013 Michal Srb <msrb@redhat.com> - 0:1.2.17-13
|
||||
- Enable tests
|
||||
- Fix BR
|
||||
|
||||
* Tue May 14 2013 Ville Skyttä <ville.skytta@iki.fi> - 0:1.2.17-12
|
||||
- Add DTD public id to XML and SGML catalogs.
|
||||
|
||||
* Mon Apr 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2.17-11
|
||||
- Remove unneeded BR: maven-idea-plugin
|
||||
|
||||
* Thu Apr 11 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2.17-10
|
||||
- Fix manpage names, thanks to Michal Srb for reporting
|
||||
|
||||
* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2.17-9
|
||||
- Reindex sources in more sensible way
|
||||
- Add manual pages; resolves: rhbz#949413
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.17-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 0:1.2.17-7
|
||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||
- Replace maven BuildRequires with maven-local
|
||||
|
||||
* Mon Jan 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2.17-6
|
||||
- Build aggregated javadocs with xmvn
|
||||
|
||||
* Fri Jan 18 2013 Michal Srb <msrb@redhat.com> - 0:1.2.17-5
|
||||
- Build with xmvn
|
||||
|
||||
* Mon Sep 24 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2.17-4
|
||||
- Generate javadocs without maven skin
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.17-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Thu Jun 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.17-2
|
||||
- Remove "uses" OSGI directives from MANIFEST (related #826776)
|
||||
|
||||
* Mon Jun 04 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.17-1
|
||||
- Update to latest version
|
||||
- Change OSGI bundle symbolic name to org.apache.log4j
|
||||
- Resolves #826776
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.16-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Fri Oct 28 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.2.16-10
|
||||
- Remove duplicate import-package declaration.
|
||||
- Adapt to current guidelines.
|
||||
- Remove no longer needed patches.
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.16-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Tue Jan 18 2011 Ville Skyttä <ville.skytta@iki.fi> - 0:1.2.16-8
|
||||
- Drop executable file mode bits from icons.
|
||||
|
||||
* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.16-7
|
||||
- Use package instead of install mvn target to fix build
|
||||
|
||||
* Thu Dec 16 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.2.16-6
|
||||
- Do not require jaxp_parser_impl. Maven build is not using it all and it's provided by every Java5 JVM.
|
||||
|
||||
* Thu Dec 9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.16-5
|
||||
- Add patch to fix ant groupId
|
||||
- Versionless jars & javadocs
|
||||
|
||||
* Tue Sep 7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.16-4
|
||||
- Fix BRs to include ant-junit
|
||||
- Fix changed path for javadocs after build run
|
||||
|
||||
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.16-3
|
||||
- Add license to javadoc and manual subpackages
|
||||
|
||||
* Fri May 28 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.16-2
|
||||
- Install pom file
|
||||
- Trim changelog
|
||||
- Add jpackage-utils to javadoc Requires
|
||||
|
||||
* Mon May 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.16-1
|
||||
- Complete re-working of whole ebuild to work with maven
|
||||
- Rebase to new version
|
||||
- Drop gcj support
|
||||
|
||||
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.14-6.3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.14-5.3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.2.14-4.3
|
||||
- drop repotag
|
||||
|
||||
* Thu May 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.2.14-4jpp.2
|
||||
- fix license tag
|
||||
|
||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.2.14-4jpp.1
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Sat May 26 2007 Vivek Lakshmanan <vivekl@redhat.com> 0:1.2.14-3jpp.1
|
||||
- Upgrade to 1.2.14
|
||||
- Modify the categories for the .desktop files so they are only
|
||||
displayed under the development/programming menus
|
||||
- Resolves: bug 241447
|
||||
|
||||
* Fri May 11 2007 Jason Corley <jason.corley@gmail.com> 0:1.2.14-3jpp
|
||||
- rebuild through mock and centos 4
|
||||
- replace vendor and distribution with macros
|
||||
|
||||
* Fri Apr 20 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.14-2jpp
|
||||
- Patch to allow build of org.apache.log4j.jmx.* with mx4j
|
||||
- Restore Vendor: and Distribution:
|
||||
|
||||
* Sat Feb 17 2007 Fernando Nasser <fnasser@redhat.com> - 0:1.2.14-1jpp
|
||||
- Upgrade
|
||||
|
||||
* Mon Feb 12 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.13-4jpp
|
||||
- Add bootstrap option to build core
|
||||
|
||||
* Wed Aug 09 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.2.13-3jpp.2
|
||||
- Remove patch for BZ #157585 because it doesnt seem to be needed anymore.
|
||||
|
||||
* Tue Aug 08 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.2.13-3jpp.1
|
||||
- Re-sync with latest from JPP.
|
||||
- Update patch for BZ #157585 to apply cleanly.
|
||||
- Partially adopt new naming convention.
|
||||
|
||||
* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.2.13-2jpp_2fc
|
||||
- Rebuilt
|
||||
|
||||
* Fri Jul 21 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.2.13-2jpp_1fc
|
||||
- Merge spec and patches with latest from JPP.
|
||||
- Clean source tar ball off prebuilt jars and classes.
|
||||
- Use classpathx-jaf and jms for buildrequires for the time being.
|
||||
|
||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.2.8-7jpp_9fc
|
||||
- rebuild
|
||||
|
||||
* Mon Mar 6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.2.8-7jpp_8fc
|
||||
- fix scriptlet spew
|
||||
|
||||
* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> 0:1.2.8-7jpp7fc
|
||||
- rebuilt again
|
||||
|
||||
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Thu Nov 3 2005 Archit Shah <ashah@redhat.com> 0:1.2.8-7jpp_6fc
|
||||
- Reenable building of example that uses rmic
|
||||
|
||||
* Wed Jun 22 2005 Gary Benson <gbenson@redhat.com> 0:1.2.8-7jpp_5fc
|
||||
- Reenable building of classes that require jms.
|
||||
- Remove classes and jarfiles from the tarball.
|
||||
|
||||
* Mon May 23 2005 Gary Benson <gbenson@redhat.com> 0:1.2.8-7jpp_4fc
|
||||
- Work around chainsaw failure (#157585).
|
||||
|
||||
* Tue Jan 11 2005 Gary Benson <gbenson@redhat.com> 0:1.2.8-7jpp_3fc
|
||||
- Reenable building of classes that require javax.swing (#130006).
|
||||
|
||||
* Thu Nov 4 2004 Gary Benson <gbenson@redhat.com> 0:1.2.8-7jpp_2fc
|
||||
- Build into Fedora.
|
||||
1
ci.fmf
Normal file
1
ci.fmf
Normal file
|
|
@ -0,0 +1 @@
|
|||
resultsdb-testcase: separate
|
||||
9
gating.yaml
Normal file
9
gating.yaml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_contexts:
|
||||
- bodhi_update_push_testing
|
||||
- bodhi_update_push_stable
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
|
||||
29
generate-tarball.sh
Executable file
29
generate-tarball.sh
Executable file
|
|
@ -0,0 +1,29 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
name=log4j
|
||||
version="$(sed -n 's/Version:\s*//p' *.spec)"
|
||||
|
||||
# RETRIEVE
|
||||
wget "https://archive.apache.org/dist/logging/log4j/${version}/apache-log4j-${version}-src.tar.gz" -O "${name}-${version}.orig.tar.gz"
|
||||
wget "https://archive.apache.org/dist/logging/log4j/${version}/apache-log4j-${version}-src.tar.gz.asc" -O "${name}-${version}.orig.tar.gz.asc"
|
||||
wget "https://www.apache.org/dist/logging/KEYS" -O "${name}-${version}.keyring"
|
||||
|
||||
# VERIFY
|
||||
$(rpm -E '%{gpgverify}') --keyring="${name}-${version}.keyring" --signature="${name}-${version}.orig.tar.gz.asc" --data="${name}-${version}.orig.tar.gz"
|
||||
|
||||
rm -rf tarball-tmp
|
||||
mkdir tarball-tmp
|
||||
pushd tarball-tmp
|
||||
tar -xf "../${name}-${version}.orig.tar.gz"
|
||||
|
||||
# CLEAN TARBALL
|
||||
find -name '*.jar' -delete
|
||||
find -name '*.class' -delete
|
||||
find -name '*.zip' -delete
|
||||
find -name '*.dll' -delete
|
||||
rm -rf "apache-log4j-${version}-src/src/site"
|
||||
|
||||
tar -czf "../${name}-${version}.tar.gz" *
|
||||
popd
|
||||
rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
|
||||
487
log4j.spec
487
log4j.spec
|
|
@ -1,47 +1,53 @@
|
|||
%bcond_without jp_minimal
|
||||
%bcond_with bootstrap
|
||||
%bcond_without jp_minimal
|
||||
|
||||
Name: log4j
|
||||
Version: 2.13.3
|
||||
Release: 3%{?dist}
|
||||
Version: 2.20.0
|
||||
Release: %autorelease
|
||||
Summary: Java logging package
|
||||
BuildArch: noarch
|
||||
License: ASL 2.0
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
License: Apache-2.0
|
||||
|
||||
URL: http://logging.apache.org/%{name}
|
||||
Source0: http://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz
|
||||
URL: https://logging.apache.org/%{name}
|
||||
|
||||
Patch2: logging-log4j-Remove-unsupported-EventDataConverter.patch
|
||||
# ./generate-tarball.sh
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind)
|
||||
Patch: logging-log4j-Remove-unsupported-EventDataConverter.patch
|
||||
Patch: 0002-Remove-usage-of-toolchains.patch
|
||||
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: maven-local-openjdk25
|
||||
BuildRequires: mvn(com.lmax:disruptor)
|
||||
BuildRequires: mvn(com.sun.activation:jakarta.activation)
|
||||
BuildRequires: mvn(com.sun.mail:javax.mail)
|
||||
BuildRequires: mvn(commons-logging:commons-logging)
|
||||
BuildRequires: mvn(jakarta.activation:jakarta.activation-api)
|
||||
BuildRequires: mvn(jakarta.mail:jakarta.mail-api)
|
||||
BuildRequires: mvn(javax.servlet:javax.servlet-api)
|
||||
BuildRequires: mvn(org.apache.commons:commons-compress)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.apache:apache:pom:)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
|
||||
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
||||
BuildRequires: mvn(org.fusesource.jansi:jansi:1)
|
||||
BuildRequires: mvn(org.fusesource.jansi:jansi)
|
||||
BuildRequires: mvn(org.jctools:jctools-core)
|
||||
BuildRequires: mvn(org.osgi:osgi.core)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-ext)
|
||||
%endif
|
||||
|
||||
%if %{without jp_minimal}
|
||||
BuildRequires: mvn(com.datastax.cassandra:cassandra-driver-core)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-xml)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-yaml)
|
||||
BuildRequires: mvn(com.fasterxml.woodstox:woodstox-core)
|
||||
BuildRequires: mvn(com.lmax:disruptor)
|
||||
BuildRequires: mvn(com.sun.mail:javax.mail)
|
||||
BuildRequires: mvn(javax.servlet:javax.servlet-api)
|
||||
BuildRequires: mvn(jakarta.mail:jakarta.mail-api)
|
||||
BuildRequires: mvn(jakarta.servlet:jakarta.servlet-api)
|
||||
BuildRequires: mvn(javax.servlet.jsp:jsp-api)
|
||||
BuildRequires: mvn(org.apache.commons:commons-csv)
|
||||
BuildRequires: mvn(org.apache.logging:logging-parent:pom:)
|
||||
|
|
@ -58,9 +64,6 @@ BuildRequires: mvn(org.slf4j:slf4j-api)
|
|||
BuildRequires: mvn(org.slf4j:slf4j-ext)
|
||||
BuildRequires: mvn(org.zeromq:jeromq)
|
||||
BuildRequires: mvn(sun.jdk:jconsole)
|
||||
# Explicit requires for javapackages-tools since log4j-jmx script
|
||||
# uses /usr/share/java-utils/java-functions
|
||||
Requires: javapackages-tools
|
||||
|
||||
# Also needs:
|
||||
# - Various Spring dependencies
|
||||
|
|
@ -68,8 +71,8 @@ Requires: javapackages-tools
|
|||
# - io.fabric8.kubernetes-client
|
||||
%endif
|
||||
|
||||
Obsoletes: %{name}-osgi < 2.9.1-4
|
||||
Obsoletes: %{name}-liquibase < 2.9.1-4
|
||||
# TODO Remove in Fedora 46
|
||||
Obsoletes: %{name}-javadoc < 2.2.0-18
|
||||
|
||||
%description
|
||||
Log4j is a tool to help the programmer output log statements to a
|
||||
|
|
@ -87,6 +90,18 @@ Summary: Apache Log4j Commons Logging Bridge
|
|||
%description jcl
|
||||
Apache Log4j Commons Logging Bridge.
|
||||
|
||||
%package web
|
||||
Summary: Apache Log4j Web
|
||||
|
||||
%description web
|
||||
Support for Log4j in a web servlet container.
|
||||
|
||||
%package bom
|
||||
Summary: Apache Log4j BOM
|
||||
|
||||
%description bom
|
||||
Apache Log4j 2 Bill of Material
|
||||
|
||||
%if %{without jp_minimal}
|
||||
%package osgi
|
||||
Summary: Apache Log4J Core OSGi Bundles
|
||||
|
|
@ -102,53 +117,33 @@ Apache Log4j Tag Library for Web Applications.
|
|||
|
||||
%package jmx-gui
|
||||
Summary: Apache Log4j JMX GUI
|
||||
Requires: java-devel
|
||||
Requires: java-25-devel
|
||||
|
||||
%description jmx-gui
|
||||
Swing-based client for remotely editing the log4j configuration and remotely
|
||||
monitoring StatusLogger output. Includes a JConsole plug-in.
|
||||
|
||||
%package web
|
||||
Summary: Apache Log4j Web
|
||||
|
||||
%description web
|
||||
Support for Log4j in a web servlet container.
|
||||
|
||||
%package bom
|
||||
Summary: Apache Log4j BOM
|
||||
|
||||
%description bom
|
||||
Apache Log4j 2 Bill of Material
|
||||
|
||||
|
||||
%package nosql
|
||||
Summary: Apache Log4j NoSql
|
||||
|
||||
%description nosql
|
||||
Use NoSQL databases such as MongoDB and CouchDB to append log messages.
|
||||
|
||||
%endif
|
||||
|
||||
%package javadoc
|
||||
Summary: API documentation for %{name}
|
||||
Obsoletes: %{name}-manual < %{version}
|
||||
|
||||
%description javadoc
|
||||
%{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q -n apache-%{name}-%{version}-src
|
||||
%autopatch -p1
|
||||
%autosetup -p1 -C
|
||||
|
||||
%pom_remove_plugin -r :apache-rat-plugin
|
||||
%pom_remove_plugin -r :maven-site-plugin
|
||||
%pom_remove_plugin -r :maven-remote-resources-plugin
|
||||
%pom_remove_plugin -r :maven-doap-plugin
|
||||
%pom_remove_plugin -r :maven-source-plugin
|
||||
%pom_remove_plugin -r :maven-toolchains-plugin
|
||||
%pom_remove_plugin -r :revapi-maven-plugin
|
||||
%pom_remove_plugin -r :maven-enforcer-plugin
|
||||
%pom_remove_plugin -r com.diffplug.spotless:spotless-maven-plugin
|
||||
%pom_remove_plugin -r org.apache.logging.log4j:log4j-changelog-maven-plugin
|
||||
%pom_remove_plugin -r org.codehaus.mojo:xml-maven-plugin
|
||||
|
||||
# remove all the stuff we'll build ourselves
|
||||
find -name "*.jar" -o -name "*.class" -delete
|
||||
find -name '*.jar' -o -name '*.class' -delete
|
||||
rm -rf docs/api
|
||||
|
||||
%pom_disable_module %{name}-distribution
|
||||
|
|
@ -160,8 +155,14 @@ rm -rf docs/api
|
|||
# artifact for upstream testing of log4j itself, shouldn't be distributed
|
||||
%pom_disable_module %{name}-perf
|
||||
|
||||
# add dependency for javax.activation package (no longer part of OpenJDK)
|
||||
%pom_add_dep com.sun.activation:jakarta.activation
|
||||
%pom_remove_dep -r org.codehaus.groovy:groovy-bom
|
||||
%pom_remove_dep -r com.fasterxml.jackson:jackson-bom
|
||||
%pom_remove_dep -r jakarta.platform:jakarta.jakartaee-bom
|
||||
%pom_remove_dep -r org.eclipse.jetty:jetty-bom
|
||||
%pom_remove_dep -r org.junit:junit-bom
|
||||
%pom_remove_dep -r io.fabric8:kubernetes-client-bom
|
||||
%pom_remove_dep -r io.netty:netty-bom
|
||||
%pom_remove_dep -r org.springframework:spring-framework-bom
|
||||
|
||||
# unavailable com.conversantmedia:disruptor
|
||||
rm log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java
|
||||
|
|
@ -171,18 +172,14 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockin
|
|||
rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
|
||||
%pom_remove_dep -r :kafka-clients
|
||||
|
||||
# not compatible with fedora's version
|
||||
%pom_disable_module %{name}-liquibase
|
||||
|
||||
# we don't have slf4j 1.8 yet
|
||||
%pom_disable_module %{name}-slf4j18-impl
|
||||
%pom_remove_dep -r javax.jms:javax.jms-api
|
||||
|
||||
# we don't have commons-dbcp2
|
||||
%pom_disable_module %{name}-jdbc-dbcp2
|
||||
|
||||
# We have mongodb 4
|
||||
%pom_disable_module %{name}-mongodb2
|
||||
# We don't have mmongo-java
|
||||
%pom_disable_module %{name}-mongodb3
|
||||
%pom_disable_module %{name}-mongodb4
|
||||
|
||||
# System scoped dep provided by JDK
|
||||
%pom_remove_dep :jconsole %{name}-jmx-gui
|
||||
|
|
@ -191,20 +188,26 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
|
|||
# old AID is provided by felix, we want osgi-core
|
||||
%pom_change_dep -r org.osgi:org.osgi.core org.osgi:osgi.core
|
||||
|
||||
# BOM package shouldn't require Apache RAT
|
||||
%pom_remove_plugin :apache-rat-plugin %{name}-bom
|
||||
|
||||
# tests are disabled
|
||||
%pom_remove_plugin :maven-failsafe-plugin
|
||||
|
||||
# Update required version of jansi 1.x
|
||||
%pom_xpath_set "//pom:dependency[pom:artifactId='jansi']/pom:version" 1.18
|
||||
# Remove deps on slf4j-ext, it is no longer available in Fedora 35
|
||||
%pom_remove_dep -r :slf4j-ext
|
||||
%pom_remove_parent
|
||||
%pom_remove_parent log4j-bom
|
||||
|
||||
# Make compiled code compatible with OpenJDK 8
|
||||
%pom_xpath_inject 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration' "<release>8</release>"
|
||||
|
||||
%pom_disable_module %{name}-api-test
|
||||
%pom_disable_module %{name}-core-test
|
||||
%pom_disable_module %{name}-layout-template-json-test
|
||||
%pom_disable_module %{name}-slf4j2-impl
|
||||
|
||||
%if %{with jp_minimal}
|
||||
%pom_disable_module %{name}-taglib
|
||||
%pom_disable_module %{name}-jmx-gui
|
||||
%pom_disable_module %{name}-bom
|
||||
%pom_disable_module %{name}-web
|
||||
%pom_disable_module %{name}-jakarta-web
|
||||
%pom_disable_module %{name}-iostreams
|
||||
%pom_disable_module %{name}-jul
|
||||
%pom_disable_module %{name}-core-its
|
||||
|
|
@ -213,17 +216,20 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
|
|||
%pom_disable_module %{name}-cassandra
|
||||
%pom_disable_module %{name}-appserver
|
||||
%pom_disable_module %{name}-spring-cloud-config
|
||||
%pom_disable_module %{name}-spring-boot
|
||||
%pom_disable_module %{name}-docker
|
||||
%pom_disable_module %{name}-kubernetes
|
||||
%pom_disable_module %{name}-layout-template-json
|
||||
|
||||
%pom_remove_dep -r :jackson-core
|
||||
%pom_remove_dep -r :jackson-databind
|
||||
%pom_remove_dep -r :jackson-dataformat-yaml
|
||||
%pom_remove_dep -r :jackson-dataformat-xml
|
||||
%pom_remove_dep -r :woodstox-core
|
||||
%pom_remove_dep -r :javax.persistence
|
||||
%pom_remove_dep -r :jboss-jms-api_1.1_spec
|
||||
%pom_remove_dep -r :jeromq
|
||||
%pom_remove_dep -r :commons-csv
|
||||
|
||||
rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/{jackson,config/yaml,parser}
|
||||
rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/{jackson,config/yaml,config/json,parser}
|
||||
rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/{db,mom,nosql}
|
||||
rm log4j-core/src/main/java/org/apache/logging/log4j/core/layout/*{Csv,Jackson,Xml,Yaml,Json,Gelf}*.java
|
||||
rm log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/*Xml*.java
|
||||
|
|
@ -250,9 +256,25 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms
|
|||
|
||||
%mvn_package :log4j-core-its __noinstall
|
||||
|
||||
%mvn_package ::zip: __noinstall
|
||||
|
||||
%pom_remove_dep com.sun.mail:javax.mail log4j-core
|
||||
%pom_remove_dep javax.mail:javax.mail-api log4j-core
|
||||
%pom_remove_dep javax.activation:javax.activation-api log4j-core
|
||||
rm log4j-core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java
|
||||
rm log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java
|
||||
rm log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
|
||||
rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java
|
||||
|
||||
%pom_remove_dep org.eclipse.angus:angus-activation log4j-jakarta-smtp
|
||||
%pom_remove_dep org.eclipse.angus:jakarta.mail log4j-jakarta-smtp
|
||||
|
||||
%pom_remove_plugin -r org.apache.maven.plugins:maven-failsafe-plugin
|
||||
%pom_remove_plugin -r org.ops4j.pax.exam:exam-maven-plugin
|
||||
|
||||
%build
|
||||
# missing test deps (mockejb)
|
||||
%mvn_build -f
|
||||
%mvn_build -j -f
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
|
@ -262,333 +284,18 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms
|
|||
%endif
|
||||
|
||||
%files -f .mfiles
|
||||
%dir %{_javadir}/%{name}
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
%license LICENSE.txt NOTICE.txt
|
||||
|
||||
%files slf4j -f .mfiles-slf4j
|
||||
%files jcl -f .mfiles-jcl
|
||||
%if %{without jp_minimal}
|
||||
%files taglib -f .mfiles-taglib
|
||||
%files web -f .mfiles-web
|
||||
%files bom -f .mfiles-bom
|
||||
%if %{without jp_minimal}
|
||||
%files taglib -f .mfiles-taglib
|
||||
%files nosql -f .mfiles-nosql
|
||||
%files jmx-gui -f .mfiles-jmx-gui
|
||||
%{_bindir}/%{name}-jmx
|
||||
%endif
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Dec 14 2020 Jerry James <loganjerry@gmail.com> - 2.13.3-2
|
||||
- Update jansi dep to jansi1
|
||||
|
||||
* Thu Aug 20 2020 Fabio Valentini <decathorpe@gmail.com> - 2.13.3-1
|
||||
- Update to version 2.13.3.
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 20 2020 Fabio Valentini <decathorpe@gmail.com> - 2.13.1-3
|
||||
- Add missing javax.activation dependency.
|
||||
|
||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 2.13.1-2
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Mon Mar 02 2020 Fabio Valentini <decathorpe@gmail.com> - 2.13.1-1
|
||||
- Update to version 2.13.1.
|
||||
- Drop upstream patch that's included in the new release.
|
||||
- Rebase patch for removing the unsupported SLF4J EventDataConverter.
|
||||
|
||||
* Thu Jan 30 2020 Fabio Valentini <decathorpe@gmail.com> - 2.13.0-3
|
||||
- Add upstream patch for compatibility with the latest slf4j versions.
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Jan 06 2020 Alexander Scheel <ascheel@redhat.com> - 2.13.0-1
|
||||
- Rebase to version 2.13.0
|
||||
|
||||
* Sun Oct 20 2019 Fabio Valentini <decathorpe@gmail.com> - 2.12.1-1
|
||||
- Update to version 2.12.1.
|
||||
|
||||
* Mon Sep 30 2019 Fabio Valentini <decathorpe@gmail.com> - 2.12.0-1
|
||||
- Update to version 2.12.0.
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Jun 11 2019 Miro Hrončok <mhroncok@redhat.com> - 2.11.1-4
|
||||
- Drop log4j-taglib, log4j-web, log4j-bom, log4j-nosql and log4j-jmx-gui
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Aug 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 2.11.1-2
|
||||
- Add explicit requirement on javapackages-tools for log4j-jmx
|
||||
script. See RHBZ#1600426.
|
||||
|
||||
* Tue Aug 07 2018 Michael Simacek <msimacek@redhat.com> - 2.11.1-1
|
||||
- Update to upstream version 2.11.1
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon May 28 2018 Michael Simacek <msimacek@redhat.com> - 2.9.1-4
|
||||
- Disable liquibase to fix FTBFS
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Oct 13 2017 Michael Simacek <msimacek@redhat.com> - 2.9.1-2
|
||||
- Update to upstream version 2.9.1
|
||||
|
||||
* Mon Sep 18 2017 Michael Simacek <msimacek@redhat.com> - 2.9.0-1
|
||||
- Update to upstream version 2.9.0
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Thu Apr 06 2017 Michael Simacek <msimacek@redhat.com> - 2.8.2-1
|
||||
- Update to upstream version 2.8.2
|
||||
|
||||
* Wed Mar 29 2017 Michael Simacek <msimacek@redhat.com> - 2.8.1-1
|
||||
- Update to upstream version 2.8.1
|
||||
|
||||
* Wed Mar 15 2017 Michael Simacek <msimacek@redhat.com> - 2.7-4
|
||||
- Add jp_minimal conditional
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 2.7-2
|
||||
- Cleanup osgi parts
|
||||
- Add conditional for nosql
|
||||
|
||||
* Wed Nov 09 2016 Michael Simacek <msimacek@redhat.com> - 2.7-1
|
||||
- Update to upstream version 2.7
|
||||
- Remove stuff marked as "Remove in F24"
|
||||
|
||||
* Thu Jun 23 2016 Michael Simacek <msimacek@redhat.com> - 2.6.1-1
|
||||
- Update to upstream version 2.6.1
|
||||
|
||||
* Thu Jun 16 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5-4
|
||||
- Remove RAT depenency from BOM package
|
||||
|
||||
* Mon May 23 2016 Michael Simacek <msimacek@redhat.com> - 2.5-3
|
||||
- Remove maven-remote-resources-plugin to fix FTBFS
|
||||
|
||||
* Mon Feb 15 2016 Michael Simacek <msimacek@redhat.com> - 2.5-2
|
||||
- Split log4j-liquibase into separate subpackage
|
||||
|
||||
* Mon Feb 15 2016 Michael Simacek <msimacek@redhat.com> - 2.5-1
|
||||
- Update to upstream version 2.5
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Tue Jun 2 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-1
|
||||
- Update to upstream version 2.3
|
||||
|
||||
* Thu Feb 26 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-1
|
||||
- Update to upstream version 2.2
|
||||
|
||||
* Mon Jan 19 2015 Michael Simacek <msimacek@redhat.com> - 2.0-2
|
||||
- Remove site-plugin from all poms
|
||||
|
||||
* Fri Jul 18 2014 Michael Simacek <msimacek@redhat.com> 2.0-1
|
||||
- Update to upstream version 2.0
|
||||
- Remove osgi subpackage (osgi parts were moved to corresponding artifacts)
|
||||
- Add web, bom, nosql subpackages (new)
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-0.3.rc1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri May 16 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-0.2.rc1
|
||||
- Drop provides for log4j-manual
|
||||
|
||||
* Fri May 09 2014 Michael Simacek <msimacek@redhat.com> - 0:2.0-0.1.rc1
|
||||
- Update to upstream version 2.0-rc1
|
||||
- Split into subpackages
|
||||
- Remove logfactor and chainsaw scripts which are no longer shipped
|
||||
- Remove XML catalogs which are no longer shipped
|
||||
|
||||
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.17-16
|
||||
- Use Requires: java-headless rebuild (#1067528)
|
||||
|
||||
* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 0:1.2.17-15
|
||||
- Set javamail and geronimo-jms dependency scopes to provided (removes requires)
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.17-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Jul 11 2013 Michal Srb <msrb@redhat.com> - 0:1.2.17-13
|
||||
- Enable tests
|
||||
- Fix BR
|
||||
|
||||
* Tue May 14 2013 Ville Skyttä <ville.skytta@iki.fi> - 0:1.2.17-12
|
||||
- Add DTD public id to XML and SGML catalogs.
|
||||
|
||||
* Mon Apr 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2.17-11
|
||||
- Remove unneeded BR: maven-idea-plugin
|
||||
|
||||
* Thu Apr 11 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2.17-10
|
||||
- Fix manpage names, thanks to Michal Srb for reporting
|
||||
|
||||
* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2.17-9
|
||||
- Reindex sources in more sensible way
|
||||
- Add manual pages; resolves: rhbz#949413
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.17-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 0:1.2.17-7
|
||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||
- Replace maven BuildRequires with maven-local
|
||||
|
||||
* Mon Jan 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2.17-6
|
||||
- Build aggregated javadocs with xmvn
|
||||
|
||||
* Fri Jan 18 2013 Michal Srb <msrb@redhat.com> - 0:1.2.17-5
|
||||
- Build with xmvn
|
||||
|
||||
* Mon Sep 24 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2.17-4
|
||||
- Generate javadocs without maven skin
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.17-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Thu Jun 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.17-2
|
||||
- Remove "uses" OSGI directives from MANIFEST (related #826776)
|
||||
|
||||
* Mon Jun 04 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.17-1
|
||||
- Update to latest version
|
||||
- Change OSGI bundle symbolic name to org.apache.log4j
|
||||
- Resolves #826776
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.16-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Fri Oct 28 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.2.16-10
|
||||
- Remove duplicate import-package declaration.
|
||||
- Adapt to current guidelines.
|
||||
- Remove no longer needed patches.
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.16-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Tue Jan 18 2011 Ville Skyttä <ville.skytta@iki.fi> - 0:1.2.16-8
|
||||
- Drop executable file mode bits from icons.
|
||||
|
||||
* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.16-7
|
||||
- Use package instead of install mvn target to fix build
|
||||
|
||||
* Thu Dec 16 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.2.16-6
|
||||
- Do not require jaxp_parser_impl. Maven build is not using it all and it's provided by every Java5 JVM.
|
||||
|
||||
* Thu Dec 9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.16-5
|
||||
- Add patch to fix ant groupId
|
||||
- Versionless jars & javadocs
|
||||
|
||||
* Tue Sep 7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.16-4
|
||||
- Fix BRs to include ant-junit
|
||||
- Fix changed path for javadocs after build run
|
||||
|
||||
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.16-3
|
||||
- Add license to javadoc and manual subpackages
|
||||
|
||||
* Fri May 28 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.16-2
|
||||
- Install pom file
|
||||
- Trim changelog
|
||||
- Add jpackage-utils to javadoc Requires
|
||||
|
||||
* Mon May 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.16-1
|
||||
- Complete re-working of whole ebuild to work with maven
|
||||
- Rebase to new version
|
||||
- Drop gcj support
|
||||
|
||||
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.14-6.3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.14-5.3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.2.14-4.3
|
||||
- drop repotag
|
||||
|
||||
* Thu May 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.2.14-4jpp.2
|
||||
- fix license tag
|
||||
|
||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.2.14-4jpp.1
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Sat May 26 2007 Vivek Lakshmanan <vivekl@redhat.com> 0:1.2.14-3jpp.1
|
||||
- Upgrade to 1.2.14
|
||||
- Modify the categories for the .desktop files so they are only
|
||||
displayed under the development/programming menus
|
||||
- Resolves: bug 241447
|
||||
|
||||
* Fri May 11 2007 Jason Corley <jason.corley@gmail.com> 0:1.2.14-3jpp
|
||||
- rebuild through mock and centos 4
|
||||
- replace vendor and distribution with macros
|
||||
|
||||
* Fri Apr 20 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.14-2jpp
|
||||
- Patch to allow build of org.apache.log4j.jmx.* with mx4j
|
||||
- Restore Vendor: and Distribution:
|
||||
|
||||
* Sat Feb 17 2007 Fernando Nasser <fnasser@redhat.com> - 0:1.2.14-1jpp
|
||||
- Upgrade
|
||||
|
||||
* Mon Feb 12 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.13-4jpp
|
||||
- Add bootstrap option to build core
|
||||
|
||||
* Wed Aug 09 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.2.13-3jpp.2
|
||||
- Remove patch for BZ #157585 because it doesnt seem to be needed anymore.
|
||||
|
||||
* Tue Aug 08 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.2.13-3jpp.1
|
||||
- Re-sync with latest from JPP.
|
||||
- Update patch for BZ #157585 to apply cleanly.
|
||||
- Partially adopt new naming convention.
|
||||
|
||||
* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.2.13-2jpp_2fc
|
||||
- Rebuilt
|
||||
|
||||
* Fri Jul 21 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.2.13-2jpp_1fc
|
||||
- Merge spec and patches with latest from JPP.
|
||||
- Clean source tar ball off prebuilt jars and classes.
|
||||
- Use classpathx-jaf and jms for buildrequires for the time being.
|
||||
|
||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.2.8-7jpp_9fc
|
||||
- rebuild
|
||||
|
||||
* Mon Mar 6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.2.8-7jpp_8fc
|
||||
- fix scriptlet spew
|
||||
|
||||
* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> 0:1.2.8-7jpp7fc
|
||||
- rebuilt again
|
||||
|
||||
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Thu Nov 3 2005 Archit Shah <ashah@redhat.com> 0:1.2.8-7jpp_6fc
|
||||
- Reenable building of example that uses rmic
|
||||
|
||||
* Wed Jun 22 2005 Gary Benson <gbenson@redhat.com> 0:1.2.8-7jpp_5fc
|
||||
- Reenable building of classes that require jms.
|
||||
- Remove classes and jarfiles from the tarball.
|
||||
|
||||
* Mon May 23 2005 Gary Benson <gbenson@redhat.com> 0:1.2.8-7jpp_4fc
|
||||
- Work around chainsaw failure (#157585).
|
||||
|
||||
* Tue Jan 11 2005 Gary Benson <gbenson@redhat.com> 0:1.2.8-7jpp_3fc
|
||||
- Reenable building of classes that require javax.swing (#130006).
|
||||
|
||||
* Thu Nov 4 2004 Gary Benson <gbenson@redhat.com> 0:1.2.8-7jpp_2fc
|
||||
- Build into Fedora.
|
||||
%autochangelog
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ index 620232a..0000000
|
|||
- }
|
||||
-}
|
||||
diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java
|
||||
index 1fa8080..90cfe4e 100644
|
||||
index 39cb2e7..1d654f8 100644
|
||||
--- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java
|
||||
+++ b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java
|
||||
@@ -27,9 +27,7 @@ import org.apache.logging.log4j.message.Message;
|
||||
|
|
@ -65,14 +65,12 @@ index 1fa8080..90cfe4e 100644
|
|||
-import org.apache.logging.log4j.util.LoaderUtil;
|
||||
import org.slf4j.Marker;
|
||||
-import org.slf4j.MarkerFactory;
|
||||
import org.slf4j.impl.StaticMarkerBinder;
|
||||
import org.slf4j.spi.LocationAwareLogger;
|
||||
|
||||
@@ -39,18 +37,13 @@ import org.slf4j.spi.LocationAwareLogger;
|
||||
public class Log4jLogger implements LocationAwareLogger, Serializable {
|
||||
|
||||
/**
|
||||
@@ -40,10 +38,7 @@ public class Log4jLogger implements LocationAwareLogger, Serializable {
|
||||
public static final String FQCN = Log4jLogger.class.getName();
|
||||
-
|
||||
|
||||
private static final long serialVersionUID = 7869000638091304316L;
|
||||
- private static final Marker EVENT_MARKER = MarkerFactory.getMarker("EVENT");
|
||||
- private static final EventDataConverter CONVERTER = createConverter();
|
||||
|
|
@ -80,25 +78,28 @@ index 1fa8080..90cfe4e 100644
|
|||
- private final boolean eventLogger;
|
||||
private transient ExtendedLogger logger;
|
||||
private final String name;
|
||||
|
||||
public Log4jLogger(final ExtendedLogger logger, final String name) {
|
||||
private transient Log4jMarkerFactory markerFactory;
|
||||
@@ -51,7 +46,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable {
|
||||
public Log4jLogger(final Log4jMarkerFactory markerFactory, final ExtendedLogger logger, final String name) {
|
||||
this.markerFactory = markerFactory;
|
||||
this.logger = logger;
|
||||
- this.eventLogger = "EventLogger".equals(name);
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@@ -363,9 +356,7 @@ public class Log4jLogger implements LocationAwareLogger, Serializable {
|
||||
return;
|
||||
@@ -365,10 +359,7 @@ public class Log4jLogger implements LocationAwareLogger, Serializable {
|
||||
}
|
||||
final Message msg;
|
||||
final Throwable actualThrowable;
|
||||
- if (CONVERTER != null && eventLogger && marker != null && marker.contains(EVENT_MARKER)) {
|
||||
- msg = CONVERTER.convertEvent(message, params, throwable);
|
||||
- actualThrowable = throwable != null ? throwable : msg.getThrowable();
|
||||
- } else if (params == null) {
|
||||
+ if (params == null) {
|
||||
msg = new SimpleMessage(message);
|
||||
actualThrowable = throwable;
|
||||
} else {
|
||||
msg = new ParameterizedMessage(message, params, throwable);
|
||||
@@ -410,15 +401,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable {
|
||||
@@ -402,15 +393,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable {
|
||||
aOutputStream.defaultWriteObject();
|
||||
}
|
||||
|
||||
|
|
@ -115,7 +116,7 @@ index 1fa8080..90cfe4e 100644
|
|||
switch (i) {
|
||||
case TRACE_INT:
|
||||
diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java
|
||||
index 0524074..c60f1ad 100644
|
||||
index 2239dc0..c09be84 100644
|
||||
--- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java
|
||||
+++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java
|
||||
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertNotNull;
|
||||
|
|
@ -124,9 +125,9 @@ index 0524074..c60f1ad 100644
|
|||
import java.util.List;
|
||||
-import java.util.Locale;
|
||||
|
||||
import org.apache.logging.log4j.junit.LoggerContextRule;
|
||||
import org.apache.logging.log4j.test.appender.ListAppender;
|
||||
@@ -34,8 +33,6 @@ import org.slf4j.Logger;
|
||||
import org.apache.logging.log4j.core.LogEvent;
|
||||
import org.apache.logging.log4j.core.test.appender.ListAppender;
|
||||
@@ -35,8 +34,6 @@ import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.slf4j.MDC;
|
||||
import org.slf4j.Marker;
|
||||
|
|
@ -135,7 +136,7 @@ index 0524074..c60f1ad 100644
|
|||
import org.slf4j.ext.XLogger;
|
||||
import org.slf4j.ext.XLoggerFactory;
|
||||
import org.slf4j.spi.LocationAwareLogger;
|
||||
@@ -145,23 +142,6 @@ public class LoggerTest {
|
||||
@@ -146,23 +143,6 @@ public class LoggerTest {
|
||||
verify("List", "o.a.l.s.LoggerTest Hello, Log4j Log4j {} MDC{}" + Strings.LINE_SEPARATOR);
|
||||
}
|
||||
|
||||
|
|
@ -156,19 +157,19 @@ index 0524074..c60f1ad 100644
|
|||
- verify("EventLogger", "o.a.l.s.LoggerTest Transfer [Audit@18060 Amount=\"200.00\" FromAccount=\"123457\" ToAccount=\"123456\"] Transfer Complete" + Strings.LINE_SEPARATOR);
|
||||
- }
|
||||
-
|
||||
private void verify(final String name, final String expected) {
|
||||
final ListAppender listApp = ctx.getListAppender(name);
|
||||
assertNotNull("Missing Appender", listApp);
|
||||
@@ -177,6 +157,5 @@ public class LoggerTest {
|
||||
public void cleanup() {
|
||||
@Test
|
||||
public void testThrowable() {
|
||||
final Throwable expected = new RuntimeException();
|
||||
@@ -217,6 +197,5 @@ public class LoggerTest {
|
||||
MDC.clear();
|
||||
ctx.getListAppender("List").clear();
|
||||
ctx.getListAppender("UnformattedList").clear();
|
||||
- ctx.getListAppender("EventLogger").clear();
|
||||
}
|
||||
}
|
||||
diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java
|
||||
deleted file mode 100644
|
||||
index a6e9fd5..0000000
|
||||
index 746eb61..0000000
|
||||
--- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java
|
||||
+++ /dev/null
|
||||
@@ -1,69 +0,0 @@
|
||||
|
|
@ -192,8 +193,8 @@ index a6e9fd5..0000000
|
|||
-
|
||||
-import java.util.List;
|
||||
-
|
||||
-import org.apache.logging.log4j.junit.LoggerContextRule;
|
||||
-import org.apache.logging.log4j.test.appender.ListAppender;
|
||||
-import org.apache.logging.log4j.core.test.appender.ListAppender;
|
||||
-import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
|
||||
-import org.apache.logging.log4j.util.Strings;
|
||||
-import org.junit.Before;
|
||||
-import org.junit.ClassRule;
|
||||
|
|
@ -242,7 +243,7 @@ index a6e9fd5..0000000
|
|||
- }
|
||||
-}
|
||||
diff --git a/log4j-slf4j-impl/src/test/resources/log4j-test1.xml b/log4j-slf4j-impl/src/test/resources/log4j-test1.xml
|
||||
index a64bdfa..07a2be6 100644
|
||||
index 1ba09ca..2dee2c1 100644
|
||||
--- a/log4j-slf4j-impl/src/test/resources/log4j-test1.xml
|
||||
+++ b/log4j-slf4j-impl/src/test/resources/log4j-test1.xml
|
||||
@@ -6,9 +6,6 @@
|
||||
|
|
@ -255,7 +256,7 @@ index a64bdfa..07a2be6 100644
|
|||
<Console name="STDOUT">
|
||||
<PatternLayout pattern="%C{1.} %m MDC%X%n"/>
|
||||
</Console>
|
||||
@@ -24,10 +21,6 @@
|
||||
@@ -25,10 +22,6 @@
|
||||
</Appenders>
|
||||
|
||||
<Loggers>
|
||||
|
|
|
|||
7
plans/javapackages.fmf
Normal file
7
plans/javapackages.fmf
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
summary: Run javapackages-specific tests
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
|
||||
ref: f43
|
||||
execute:
|
||||
how: tmt
|
||||
5
plans/smoke.fmf
Normal file
5
plans/smoke.fmf
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
summary: Basic smoke test
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (apache-log4j-2.13.3-src.tar.gz) = b759f008e99ba3eaeb7f928e66d96529ece6fc9d9532a825775e11a00c256543aaa43a8e7f383b729be23a21ba90df42b8b12aa2802d40a0e227e17b629d8ecc
|
||||
SHA512 (log4j-2.20.0.tar.gz) = b99f0a2f7ca3f808223fd2e3463cce2a668ed5979e7bf935470b889e9141e0da0747f50ae936f43b9292434ed56569793a340ed42b358cacc5736084e2464d46
|
||||
|
|
|
|||
11
tests/Sanity/smoke/Smoke.java
Normal file
11
tests/Sanity/smoke/Smoke.java
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
import org.apache.logging.log4j.*;
|
||||
|
||||
public class Smoke
|
||||
{
|
||||
public static void main(String[] args)
|
||||
{
|
||||
Logger log = LogManager.getLogger(Smoke.class);
|
||||
log.error("Hello from Log4J");
|
||||
System.out.println("SMOKE TEST COMPLETE");
|
||||
}
|
||||
}
|
||||
6
tests/Sanity/smoke/main.fmf
Normal file
6
tests/Sanity/smoke/main.fmf
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
summary: log4j smoke test
|
||||
description: |
|
||||
Test basic functionality of log4j.
|
||||
require:
|
||||
- log4j
|
||||
- java-21-openjdk-devel
|
||||
18
tests/Sanity/smoke/runtest.sh
Executable file
18
tests/Sanity/smoke/runtest.sh
Executable file
|
|
@ -0,0 +1,18 @@
|
|||
#!/bin/bash
|
||||
# Author: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
. /usr/share/beakerlib/beakerlib.sh
|
||||
|
||||
rlJournalStart
|
||||
|
||||
rlPhaseStartTest "hello world"
|
||||
rlAssertRpm log4j
|
||||
java_home=/usr/lib/jvm/java-21-openjdk/bin
|
||||
jar=/usr/share/java/jctools/jctools-core.jar
|
||||
rlRun "${java_home}/javac -cp /usr/share/java/log4j/log4j-api.jar -d out Smoke.java"
|
||||
rlRun -s "${java_home}/java -cp /usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:out Smoke 2>&1"
|
||||
rlAssertGrep "ERROR Smoke - Hello from Log4J" $rlRun_LOG
|
||||
rlAssertGrep "SMOKE TEST COMPLETE" $rlRun_LOG
|
||||
rlPhaseEnd
|
||||
|
||||
rlJournalEnd
|
||||
rlJournalPrintText
|
||||
4
tests/main.fmf
Normal file
4
tests/main.fmf
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
contact: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
framework: beakerlib
|
||||
test: ./runtest.sh
|
||||
tier: 0
|
||||
Loading…
Add table
Add a link
Reference in a new issue