diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 3cf486f..5a03c22 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,32 @@ -apache-log4j-1.2.16.tar.gz +/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 /apache-log4j-2.0-src.tar.gz /apache-log4j-2.2-src.tar.gz /apache-log4j-2.3-src.tar.gz /apache-log4j-2.5-src.tar.gz +/apache-log4j-2.6.1-src.tar.gz +/apache-log4j-2.7-src.tar.gz +/apache-log4j-2.8.1-src.tar.gz +/apache-log4j-2.8.2-src.tar.gz +/apache-log4j-2.9.0-src.tar.gz +/apache-log4j-2.9.1-src.tar.gz +/apache-log4j-2.11.1-src.tar.gz +/apache-log4j-2.12.1-src.tar.gz +/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 diff --git a/0002-Remove-usage-of-toolchains.patch b/0002-Remove-usage-of-toolchains.patch new file mode 100644 index 0000000..5d340c2 --- /dev/null +++ b/0002-Remove-usage-of-toolchains.patch @@ -0,0 +1,46 @@ +From 22d40a2e43583647f3337489ac9e286883586bcd Mon Sep 17 00:00:00 2001 +From: Marian Koncek +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 @@ + compile + + +- +- [9, ) +- + 9 + + +@@ -98,9 +95,6 @@ + testCompile + + +- +- [9, ) +- + 9 + + ${project.basedir}/src/test/java9 +@@ -128,9 +122,6 @@ + + true + +- +- [9, ) +- + + + +-- +2.40.1 + diff --git a/changelog b/changelog new file mode 100644 index 0000000..d9631f6 --- /dev/null +++ b/changelog @@ -0,0 +1,399 @@ +* Wed Jul 24 2024 Mikolaj Izdebski - 2.20.0-9 +- Install license files in licensedir instead of docdir + +* Thu Jul 18 2024 Fedora Release Engineering - 2.20.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 2.20.0-7 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 2.20.0-6 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 2.20.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.20.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.20.0-3 +- Rebuild + +* Tue Aug 22 2023 Marian Koncek - 2.20.0-2 +- Do not install zip files + +* Mon Aug 21 2023 Marian Koncek - 2.20.0-1 +- Update to upstream version 2.20.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 2.17.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Mar 17 2023 Mikolaj Izdebski - 2.17.2-9 +- Re-enable javadoc package + +* Fri Feb 24 2023 Mikolaj Izdebski - 2.17.2-8 +- Remove dependency on jackson in jp_minimal mode + +* Thu Jan 19 2023 Fedora Release Engineering - 2.17.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Oct 24 2022 Marian Koncek - 2.17.2-6 +- Re-add log4j-web subpackage + +* Thu Oct 13 2022 Marian Koncek - 2.17.2-5 +- Remove the rest of glyphicons files + +* Thu Oct 13 2022 Marian Koncek - 2.17.2-4 +- Remove glyphicons zip archive from source package + +* Thu Jul 21 2022 Fedora Release Engineering - 2.17.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Apr 26 2022 Mikolaj Izdebski - 2.17.2-2 +- Fix compatibility with Java 8 + +* Sun Feb 27 2022 Paul Wouters - 2.17.2-1 +- Resolves: rhbz#2058949 log4j-2.17.2 is available (1.2 bridge bugfixes) + +* Sat Feb 05 2022 Jiri Vanek - 2.17.1-4 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 2.17.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jan 06 2022 Malcolm Inglis - 2.17.1-2 +- Enable GPG signature verification of sources + +* Tue Dec 28 2021 Paul Wouters - 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 - 2.17.0-1 +- Update log4j to 2.17.0 for CVE-2021-45105 Denial of Service attack + +* Mon Dec 13 2021 Paul Wouters - 2.16.0-1 +- Update log4j to 2.16.0 - Disables JNDI by default + +* Sun Dec 12 2021 Sérgio Basto - 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 - 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 - 2.13.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.13.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Dec 14 2020 Jerry James - 2.13.3-2 +- Update jansi dep to jansi1 + +* Thu Aug 20 2020 Fabio Valentini - 2.13.3-1 +- Update to version 2.13.3. + +* Tue Jul 28 2020 Fedora Release Engineering - 2.13.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 20 2020 Fabio Valentini - 2.13.1-3 +- Add missing javax.activation dependency. + +* Sat Jul 11 2020 Jiri Vanek - 2.13.1-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Mar 02 2020 Fabio Valentini - 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 - 2.13.0-3 +- Add upstream patch for compatibility with the latest slf4j versions. + +* Wed Jan 29 2020 Fedora Release Engineering - 2.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 06 2020 Alexander Scheel - 2.13.0-1 +- Rebase to version 2.13.0 + +* Sun Oct 20 2019 Fabio Valentini - 2.12.1-1 +- Update to version 2.12.1. + +* Mon Sep 30 2019 Fabio Valentini - 2.12.0-1 +- Update to version 2.12.0. + +* Thu Jul 25 2019 Fedora Release Engineering - 2.11.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 11 2019 Miro Hrončok - 2.11.1-4 +- Drop log4j-taglib, log4j-web, log4j-bom, log4j-nosql and log4j-jmx-gui + +* Fri Feb 01 2019 Fedora Release Engineering - 2.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Aug 31 2018 Severin Gehwolf - 2.11.1-2 +- Add explicit requirement on javapackages-tools for log4j-jmx + script. See RHBZ#1600426. + +* Tue Aug 07 2018 Michael Simacek - 2.11.1-1 +- Update to upstream version 2.11.1 + +* Fri Jul 13 2018 Fedora Release Engineering - 2.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon May 28 2018 Michael Simacek - 2.9.1-4 +- Disable liquibase to fix FTBFS + +* Thu Feb 08 2018 Fedora Release Engineering - 2.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Oct 13 2017 Michael Simacek - 2.9.1-2 +- Update to upstream version 2.9.1 + +* Mon Sep 18 2017 Michael Simacek - 2.9.0-1 +- Update to upstream version 2.9.0 + +* Wed Jul 26 2017 Fedora Release Engineering - 2.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Apr 06 2017 Michael Simacek - 2.8.2-1 +- Update to upstream version 2.8.2 + +* Wed Mar 29 2017 Michael Simacek - 2.8.1-1 +- Update to upstream version 2.8.1 + +* Wed Mar 15 2017 Michael Simacek - 2.7-4 +- Add jp_minimal conditional + +* Fri Feb 10 2017 Fedora Release Engineering - 2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 01 2017 Michael Simacek - 2.7-2 +- Cleanup osgi parts +- Add conditional for nosql + +* Wed Nov 09 2016 Michael Simacek - 2.7-1 +- Update to upstream version 2.7 +- Remove stuff marked as "Remove in F24" + +* Thu Jun 23 2016 Michael Simacek - 2.6.1-1 +- Update to upstream version 2.6.1 + +* Thu Jun 16 2016 Mikolaj Izdebski - 2.5-4 +- Remove RAT depenency from BOM package + +* Mon May 23 2016 Michael Simacek - 2.5-3 +- Remove maven-remote-resources-plugin to fix FTBFS + +* Mon Feb 15 2016 Michael Simacek - 2.5-2 +- Split log4j-liquibase into separate subpackage + +* Mon Feb 15 2016 Michael Simacek - 2.5-1 +- Update to upstream version 2.5 + +* Thu Feb 04 2016 Fedora Release Engineering - 2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jun 2 2015 Mikolaj Izdebski - 2.3-1 +- Update to upstream version 2.3 + +* Thu Feb 26 2015 Mikolaj Izdebski - 2.2-1 +- Update to upstream version 2.2 + +* Mon Jan 19 2015 Michael Simacek - 2.0-2 +- Remove site-plugin from all poms + +* Fri Jul 18 2014 Michael Simacek 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 - 2.0-0.3.rc1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 16 2014 Mikolaj Izdebski - 2.0-0.2.rc1 +- Drop provides for log4j-manual + +* Fri May 09 2014 Michael Simacek - 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 - 0:1.2.17-16 +- Use Requires: java-headless rebuild (#1067528) + +* Thu Feb 20 2014 Michael Simacek - 0:1.2.17-15 +- Set javamail and geronimo-jms dependency scopes to provided (removes requires) + +* Sat Aug 03 2013 Fedora Release Engineering - 0:1.2.17-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jul 11 2013 Michal Srb - 0:1.2.17-13 +- Enable tests +- Fix BR + +* Tue May 14 2013 Ville Skyttä - 0:1.2.17-12 +- Add DTD public id to XML and SGML catalogs. + +* Mon Apr 29 2013 Mikolaj Izdebski - 0:1.2.17-11 +- Remove unneeded BR: maven-idea-plugin + +* Thu Apr 11 2013 Mikolaj Izdebski - 0:1.2.17-10 +- Fix manpage names, thanks to Michal Srb for reporting + +* Mon Apr 8 2013 Mikolaj Izdebski - 0:1.2.17-9 +- Reindex sources in more sensible way +- Add manual pages; resolves: rhbz#949413 + +* Thu Feb 14 2013 Fedora Release Engineering - 0:1.2.17-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 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 - 0:1.2.17-6 +- Build aggregated javadocs with xmvn + +* Fri Jan 18 2013 Michal Srb - 0:1.2.17-5 +- Build with xmvn + +* Mon Sep 24 2012 Mikolaj Izdebski - 0:1.2.17-4 +- Generate javadocs without maven skin + +* Thu Jul 19 2012 Fedora Release Engineering - 0:1.2.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 14 2012 Stanislav Ochotnicky - 0:1.2.17-2 +- Remove "uses" OSGI directives from MANIFEST (related #826776) + +* Mon Jun 04 2012 Stanislav Ochotnicky - 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 - 0:1.2.16-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Oct 28 2011 Alexander Kurtakov 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 - 0:1.2.16-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 18 2011 Ville Skyttä - 0:1.2.16-8 +- Drop executable file mode bits from icons. + +* Fri Dec 17 2010 Stanislav Ochotnicky - 0:1.2.16-7 +- Use package instead of install mvn target to fix build + +* Thu Dec 16 2010 Alexander Kurtakov 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 - 0:1.2.16-5 +- Add patch to fix ant groupId +- Versionless jars & javadocs + +* Tue Sep 7 2010 Stanislav Ochotnicky - 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 - 0:1.2.16-3 +- Add license to javadoc and manual subpackages + +* Fri May 28 2010 Stanislav Ochotnicky - 0:1.2.16-2 +- Install pom file +- Trim changelog +- Add jpackage-utils to javadoc Requires + +* Mon May 17 2010 Stanislav Ochotnicky - 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 - 0:1.2.14-6.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0:1.2.14-5.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2.14-4.3 +- drop repotag + +* Thu May 29 2008 Tom "spot" Callaway - 0:1.2.14-4jpp.2 +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 0:1.2.14-4jpp.1 +- Autorebuild for GCC 4.3 + +* Sat May 26 2007 Vivek Lakshmanan 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 0:1.2.14-3jpp +- rebuild through mock and centos 4 +- replace vendor and distribution with macros + +* Fri Apr 20 2007 Ralph Apel - 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 - 0:1.2.14-1jpp +- Upgrade + +* Mon Feb 12 2007 Ralph Apel - 0:1.2.13-4jpp +- Add bootstrap option to build core + +* Wed Aug 09 2006 Vivek Lakshmanan - 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 - 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 - 0:1.2.13-2jpp_2fc +- Rebuilt + +* Fri Jul 21 2006 Vivek Lakshmanan - 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 - 0:1.2.8-7jpp_9fc +- rebuild + +* Mon Mar 6 2006 Jeremy Katz - 0:1.2.8-7jpp_8fc +- fix scriptlet spew + +* Wed Dec 21 2005 Jesse Keating 0:1.2.8-7jpp7fc +- rebuilt again + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Thu Nov 3 2005 Archit Shah 0:1.2.8-7jpp_6fc +- Reenable building of example that uses rmic + +* Wed Jun 22 2005 Gary Benson 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 0:1.2.8-7jpp_4fc +- Work around chainsaw failure (#157585). + +* Tue Jan 11 2005 Gary Benson 0:1.2.8-7jpp_3fc +- Reenable building of classes that require javax.swing (#130006). + +* Thu Nov 4 2004 Gary Benson 0:1.2.8-7jpp_2fc +- Build into Fedora. diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..7b6e38f --- /dev/null +++ b/gating.yaml @@ -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} diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..6959389 --- /dev/null +++ b/generate-tarball.sh @@ -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" diff --git a/log4j.spec b/log4j.spec index 413fdf1..542ad0b 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,82 +1,95 @@ +%bcond_with bootstrap +%bcond_without jp_minimal + Name: log4j -Version: 2.5 -Release: 4%{?dist} +Version: 2.20.0 +Release: %autorelease Summary: Java logging package BuildArch: noarch -License: ASL 2.0 -URL: http://logging.apache.org/%{name} -Source0: http://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz +ExclusiveArch: %{java_arches} noarch +License: Apache-2.0 -BuildRequires: maven-local +URL: https://logging.apache.org/%{name} + +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz + +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(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.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) +BuildRequires: mvn(org.jctools:jctools-core) +BuildRequires: mvn(org.osgi:osgi.core) +BuildRequires: mvn(org.slf4j:slf4j-api) +%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(commons-logging:commons-logging) -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(javax.servlet:servlet-api) -BuildRequires: mvn(org.apache:apache:pom:) -BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.commons:commons-csv) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) -BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) -BuildRequires: mvn(org.eclipse:osgi) -BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi) -BuildRequires: mvn(org.eclipse.persistence:org.eclipse.persistence.jpa) -BuildRequires: mvn(org.fusesource.jansi:jansi) -BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api) +BuildRequires: mvn(org.apache.logging:logging-parent:pom:) +BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.eclipse.jetty:jetty-util) +BuildRequires: mvn(org.eclipse.persistence:javax.persistence) +BuildRequires: mvn(org.fusesource.jansi:jansi:1) BuildRequires: mvn(org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec) +BuildRequires: mvn(org.jctools:jctools-core) BuildRequires: mvn(org.lightcouch:lightcouch) -BuildRequires: mvn(org.liquibase:liquibase-core) -BuildRequires: mvn(org.mongodb:mongo-java-driver) -BuildRequires: mvn(org.osgi:org.osgi.core) +BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-ext) BuildRequires: mvn(org.zeromq:jeromq) BuildRequires: mvn(sun.jdk:jconsole) -Obsoletes: %{name}-osgi < %{version}-%{release} +# Also needs: +# - Various Spring dependencies +# - javax.jms +# - io.fabric8.kubernetes-client +%endif + +# 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 variety of output targets. -%package osgi -Summary: Apache Log4J Core OSGi Bundles - -%description osgi -Apache Log4J Core OSGi Bundles. - %package slf4j Summary: Binding between LOG4J 2 API and SLF4J %description slf4j Binding between LOG4J 2 API and SLF4J. -%package taglib -Summary: Apache Log4j Tag Library - -%description taglib -Apache Log4j Tag Library for Web Applications. - %package jcl Summary: Apache Log4j Commons Logging Bridge %description jcl Apache Log4j Commons Logging Bridge. -%package jmx-gui -Summary: Apache Log4j JMX GUI -Requires: java-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 @@ -89,70 +102,140 @@ Summary: Apache Log4j BOM %description bom Apache Log4j 2 Bill of Material +%if %{without jp_minimal} +%package osgi +Summary: Apache Log4J Core OSGi Bundles + +%description osgi +Apache Log4J Core OSGi Bundles. + +%package taglib +Summary: Apache Log4j Tag Library + +%description taglib +Apache Log4j Tag Library for Web Applications. + +%package jmx-gui +Summary: Apache Log4j JMX GUI +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 nosql Summary: Apache Log4j NoSql %description nosql Use NoSQL databases such as MongoDB and CouchDB to append log messages. - -%package liquibase -Summary: Apache Log4j Liquibase Binding - -%description liquibase -The Apache Log4j Liquibase binding to Log4j 2 Core. - -%package javadoc -Summary: API documentation for %{name} -Obsoletes: %{name}-manual < %{version} - -%description javadoc -%{summary}. +%endif %prep -%setup -q -n apache-%{name}-%{version}-src +%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-source-plugin +%pom_remove_plugin -r :maven-toolchains-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}-samples %pom_disable_module %{name}-distribution +%pom_disable_module %{name}-samples # Apache Flume is not in Fedora yet %pom_disable_module %{name}-flume-ng -# jmh not available +# artifact for upstream testing of log4j itself, shouldn't be distributed %pom_disable_module %{name}-perf +%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 +%pom_remove_dep -r com.conversantmedia:disruptor + # kafka not available rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_remove_dep -r :kafka-clients +%pom_remove_dep -r javax.jms:javax.jms-api + +# we don't have commons-dbcp2 +%pom_disable_module %{name}-jdbc-dbcp2 + +# 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 %pom_add_dep sun.jdk:jconsole %{name}-jmx-gui -# Different AID, provided by equinox -%pom_remove_dep : %{name}-api -%pom_add_dep org.eclipse:osgi:any:provided %{name}-api +# old AID is provided by felix, we want osgi-core +%pom_change_dep -r org.osgi:org.osgi.core org.osgi:osgi.core -# Classpath hell, equinox must come before felix -%pom_remove_dep org.eclipse.osgi:org.eclipse.osgi %{name}-core -%pom_add_dep org.eclipse.osgi:org.eclipse.osgi:any:provided %{name}-core +# tests are disabled +%pom_remove_plugin :maven-failsafe-plugin -# Old version of specification -%pom_remove_dep :javax.persistence %{name}-core -%pom_add_dep org.hibernate.javax.persistence:hibernate-jpa-2.1-api:any:provided %{name}-core +# 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 -# BOM package shouldn't require Apache RAT -%pom_remove_plugin :apache-rat-plugin %{name}-bom +# Make compiled code compatible with OpenJDK 8 +%pom_xpath_inject 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration' "8" -# Required at compile-time not just test, but we don't want requires -%pom_xpath_set "pom:dependency[pom:groupId='org.eclipse.persistence']/pom:scope" provided %{name}-core -%pom_xpath_set "pom:dependency[pom:groupId='org.eclipse.osgi']/pom:scope" provided %{name}-core +%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}-jakarta-web +%pom_disable_module %{name}-iostreams +%pom_disable_module %{name}-jul +%pom_disable_module %{name}-core-its +%pom_disable_module %{name}-jpa +%pom_disable_module %{name}-couchdb +%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 :jeromq +%pom_remove_dep -r :commons-csv + +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 +rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java +rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms +%endif %mvn_alias :%{name}-1.2-api %{name}:%{name} @@ -168,269 +251,51 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %mvn_package ':%{name}-jmx-gui' jmx-gui %mvn_package ':%{name}-web' web %mvn_package ':%{name}-bom' bom -%mvn_package ':%{name}-nosql' nosql -%mvn_package ':%{name}-liquibase' liquibase +%mvn_package ':%{name}-cassandra' nosql +%mvn_package ':%{name}-couchdb' nosql + +%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 +%if %{without jp_minimal} %jpackage_script org.apache.logging.log4j.jmx.gui.ClientGUI '' '' %{name}/%{name}-jmx-gui:%{name}/%{name}-core %{name}-jmx false - -# TODO: Remove this in F-24 -%preun -if [ $1 -eq 0 ]; then - if [ -x xmlcatalog -a -w %{_sysconfdir}/xml/catalog ]; then - xmlcatalog --noout --del \ - file://%{_datadir}/sgml/%{name}/log4j.dtd \ - %{_sysconfdir}/xml/catalog > /dev/null || : - fi -fi - -# TODO: Remove this in F-24 -%postun -# Note that we're using versioned catalog, so this is always ok. -if [ -x install-catalog -a -d %{_sysconfdir}/sgml ]; then - install-catalog --remove \ - %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \ - %{_datadir}/sgml/%{name}/catalog > /dev/null || : -fi +%endif %files -f .mfiles -%dir %{_javadir}/%{name} -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %files slf4j -f .mfiles-slf4j -%files taglib -f .mfiles-taglib %files jcl -f .mfiles-jcl %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 liquibase -f .mfiles-liquibase %files jmx-gui -f .mfiles-jmx-gui %{_bindir}/%{name}-jmx - -%files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt - +%endif %changelog -* Thu Jun 16 2016 Mikolaj Izdebski - 2.5-4 -- Remove RAT depenency from BOM package - -* Mon May 23 2016 Michael Simacek - 2.5-3 -- Remove maven-remote-resources-plugin to fix FTBFS - -* Mon Feb 15 2016 Michael Simacek - 2.5-2 -- Split log4j-liquibase into separate subpackage - -* Mon Feb 15 2016 Michael Simacek - 2.5-1 -- Update to upstream version 2.5 - -* Thu Feb 04 2016 Fedora Release Engineering - 2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Jun 2 2015 Mikolaj Izdebski - 2.3-1 -- Update to upstream version 2.3 - -* Thu Feb 26 2015 Mikolaj Izdebski - 2.2-1 -- Update to upstream version 2.2 - -* Mon Jan 19 2015 Michael Simacek - 2.0-2 -- Remove site-plugin from all poms - -* Fri Jul 18 2014 Michael Simacek 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 - 2.0-0.3.rc1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 16 2014 Mikolaj Izdebski - 2.0-0.2.rc1 -- Drop provides for log4j-manual - -* Fri May 09 2014 Michael Simacek - 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 - 0:1.2.17-16 -- Use Requires: java-headless rebuild (#1067528) - -* Thu Feb 20 2014 Michael Simacek - 0:1.2.17-15 -- Set javamail and geronimo-jms dependency scopes to provided (removes requires) - -* Sat Aug 03 2013 Fedora Release Engineering - 0:1.2.17-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jul 11 2013 Michal Srb - 0:1.2.17-13 -- Enable tests -- Fix BR - -* Tue May 14 2013 Ville Skyttä - 0:1.2.17-12 -- Add DTD public id to XML and SGML catalogs. - -* Mon Apr 29 2013 Mikolaj Izdebski - 0:1.2.17-11 -- Remove unneeded BR: maven-idea-plugin - -* Thu Apr 11 2013 Mikolaj Izdebski - 0:1.2.17-10 -- Fix manpage names, thanks to Michal Srb for reporting - -* Mon Apr 8 2013 Mikolaj Izdebski - 0:1.2.17-9 -- Reindex sources in more sensible way -- Add manual pages; resolves: rhbz#949413 - -* Thu Feb 14 2013 Fedora Release Engineering - 0:1.2.17-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 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 - 0:1.2.17-6 -- Build aggregated javadocs with xmvn - -* Fri Jan 18 2013 Michal Srb - 0:1.2.17-5 -- Build with xmvn - -* Mon Sep 24 2012 Mikolaj Izdebski - 0:1.2.17-4 -- Generate javadocs without maven skin - -* Thu Jul 19 2012 Fedora Release Engineering - 0:1.2.17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jun 14 2012 Stanislav Ochotnicky - 0:1.2.17-2 -- Remove "uses" OSGI directives from MANIFEST (related #826776) - -* Mon Jun 04 2012 Stanislav Ochotnicky - 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 - 0:1.2.16-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Oct 28 2011 Alexander Kurtakov 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 - 0:1.2.16-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 18 2011 Ville Skyttä - 0:1.2.16-8 -- Drop executable file mode bits from icons. - -* Fri Dec 17 2010 Stanislav Ochotnicky - 0:1.2.16-7 -- Use package instead of install mvn target to fix build - -* Thu Dec 16 2010 Alexander Kurtakov 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 - 0:1.2.16-5 -- Add patch to fix ant groupId -- Versionless jars & javadocs - -* Tue Sep 7 2010 Stanislav Ochotnicky - 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 - 0:1.2.16-3 -- Add license to javadoc and manual subpackages - -* Fri May 28 2010 Stanislav Ochotnicky - 0:1.2.16-2 -- Install pom file -- Trim changelog -- Add jpackage-utils to javadoc Requires - -* Mon May 17 2010 Stanislav Ochotnicky - 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 - 0:1.2.14-6.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0:1.2.14-5.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2.14-4.3 -- drop repotag - -* Thu May 29 2008 Tom "spot" Callaway - 0:1.2.14-4jpp.2 -- fix license tag - -* Tue Feb 19 2008 Fedora Release Engineering - 0:1.2.14-4jpp.1 -- Autorebuild for GCC 4.3 - -* Sat May 26 2007 Vivek Lakshmanan 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 0:1.2.14-3jpp -- rebuild through mock and centos 4 -- replace vendor and distribution with macros - -* Fri Apr 20 2007 Ralph Apel - 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 - 0:1.2.14-1jpp -- Upgrade - -* Mon Feb 12 2007 Ralph Apel - 0:1.2.13-4jpp -- Add bootstrap option to build core - -* Wed Aug 09 2006 Vivek Lakshmanan - 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 - 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 - 0:1.2.13-2jpp_2fc -- Rebuilt - -* Fri Jul 21 2006 Vivek Lakshmanan - 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 - 0:1.2.8-7jpp_9fc -- rebuild - -* Mon Mar 6 2006 Jeremy Katz - 0:1.2.8-7jpp_8fc -- fix scriptlet spew - -* Wed Dec 21 2005 Jesse Keating 0:1.2.8-7jpp7fc -- rebuilt again - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Thu Nov 3 2005 Archit Shah 0:1.2.8-7jpp_6fc -- Reenable building of example that uses rmic - -* Wed Jun 22 2005 Gary Benson 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 0:1.2.8-7jpp_4fc -- Work around chainsaw failure (#157585). - -* Tue Jan 11 2005 Gary Benson 0:1.2.8-7jpp_3fc -- Reenable building of classes that require javax.swing (#130006). - -* Thu Nov 4 2004 Gary Benson 0:1.2.8-7jpp_2fc -- Build into Fedora. +%autochangelog diff --git a/logging-log4j-Remove-unsupported-EventDataConverter.patch b/logging-log4j-Remove-unsupported-EventDataConverter.patch new file mode 100644 index 0000000..6dcc056 --- /dev/null +++ b/logging-log4j-Remove-unsupported-EventDataConverter.patch @@ -0,0 +1,269 @@ +diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java +deleted file mode 100644 +index 620232a..0000000 +--- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java ++++ /dev/null +@@ -1,50 +0,0 @@ +-/* +- * Licensed to the Apache Software Foundation (ASF) under one or more +- * contributor license agreements. See the NOTICE file distributed with +- * this work for additional information regarding copyright ownership. +- * The ASF licenses this file to You 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. +- */ +-package org.apache.logging.slf4j; +- +-import java.util.Map; +- +-import org.apache.logging.log4j.message.Message; +-import org.apache.logging.log4j.message.ParameterizedMessage; +-import org.apache.logging.log4j.message.StructuredDataMessage; +-import org.slf4j.ext.EventData; +- +-/** +- * +- */ +-public class EventDataConverter { +- +- public Message convertEvent(final String message, final Object[] objects, final Throwable throwable) { +- try { +- final EventData data = objects != null && objects[0] instanceof EventData ? +- (EventData) objects[0] : new EventData(message); +- final StructuredDataMessage msg = +- new StructuredDataMessage(data.getEventId(), data.getMessage(), data.getEventType()); +- for (final Map.Entry entry : data.getEventMap().entrySet()) { +- final String key = entry.getKey(); +- if (EventData.EVENT_TYPE.equals(key) || EventData.EVENT_ID.equals(key) +- || EventData.EVENT_MESSAGE.equals(key)) { +- continue; +- } +- msg.put(key, String.valueOf(entry.getValue())); +- } +- return msg; +- } catch (final Exception ex) { +- return new ParameterizedMessage(message, objects, throwable); +- } +- } +-} +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 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; + import org.apache.logging.log4j.message.ParameterizedMessage; + import org.apache.logging.log4j.message.SimpleMessage; + import org.apache.logging.log4j.spi.ExtendedLogger; +-import org.apache.logging.log4j.util.LoaderUtil; + import org.slf4j.Marker; +-import org.slf4j.MarkerFactory; + import org.slf4j.spi.LocationAwareLogger; + + /** +@@ -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(); + +- private final boolean eventLogger; + private transient ExtendedLogger logger; + private 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; + } + +@@ -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 { +@@ -402,15 +393,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { + aOutputStream.defaultWriteObject(); + } + +- private static EventDataConverter createConverter() { +- try { +- LoaderUtil.loadClass("org.slf4j.ext.EventData"); +- return new EventDataConverter(); +- } catch (final ClassNotFoundException cnfe) { +- return null; +- } +- } +- + private static Level getLevel(final int i) { + 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 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; + import static org.junit.Assert.assertTrue; + + import java.util.List; +-import java.util.Locale; + + 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; +-import org.slf4j.ext.EventData; +-import org.slf4j.ext.EventLogger; + import org.slf4j.ext.XLogger; + import org.slf4j.ext.XLoggerFactory; + import org.slf4j.spi.LocationAwareLogger; +@@ -146,23 +143,6 @@ public class LoggerTest { + verify("List", "o.a.l.s.LoggerTest Hello, Log4j Log4j {} MDC{}" + Strings.LINE_SEPARATOR); + } + +- @Test +- public void testEventLogger() { +- MDC.put("loginId", "JohnDoe"); +- MDC.put("ipAddress", "192.168.0.120"); +- MDC.put("locale", Locale.US.getDisplayName()); +- final EventData data = new EventData(); +- data.setEventType("Transfer"); +- data.setEventId("Audit@18060"); +- data.setMessage("Transfer Complete"); +- data.put("ToAccount", "123456"); +- data.put("FromAccount", "123457"); +- data.put("Amount", "200.00"); +- EventLogger.logEvent(data); +- MDC.clear(); +- verify("EventLogger", "o.a.l.s.LoggerTest Transfer [Audit@18060 Amount=\"200.00\" FromAccount=\"123457\" ToAccount=\"123456\"] Transfer Complete" + Strings.LINE_SEPARATOR); +- } +- + @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 746eb61..0000000 +--- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java ++++ /dev/null +@@ -1,69 +0,0 @@ +-/* +- * Licensed to the Apache Software Foundation (ASF) under one or more +- * contributor license agreements. See the NOTICE file distributed with +- * this work for additional information regarding copyright ownership. +- * The ASF licenses this file to You 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. +- */ +-package org.apache.logging.slf4j; +- +-import java.util.List; +- +-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; +-import org.junit.Test; +-import org.slf4j.Logger; +-import org.slf4j.LoggerFactory; +-import org.slf4j.MDC; +-import org.slf4j.Marker; +-import org.slf4j.MarkerFactory; +- +-import static org.junit.Assert.*; +- +-/** +- * +- */ +-public class OptionalTest { +- +- private static final String CONFIG = "log4j-test1.xml"; +- +- @ClassRule +- public static final LoggerContextRule CTX = new LoggerContextRule(CONFIG); +- +- Logger logger = LoggerFactory.getLogger("EventLogger"); +- Marker marker = MarkerFactory.getMarker("EVENT"); +- +- @Test +- public void testEventLogger() { +- logger.info(marker, "This is a test"); +- MDC.clear(); +- verify("EventLogger", "o.a.l.s.OptionalTest This is a test" + Strings.LINE_SEPARATOR); +- } +- +- private void verify(final String name, final String expected) { +- final ListAppender listApp = CTX.getListAppender(name); +- final List events = listApp.getMessages(); +- assertTrue("Incorrect number of messages. Expected 1 Actual " + events.size(), events.size()== 1); +- final String actual = events.get(0); +- assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual); +- listApp.clear(); +- } +- +- @Before +- public void cleanup() { +- CTX.getListAppender("List").clear(); +- CTX.getListAppender("EventLogger").clear(); +- } +-} +diff --git a/log4j-slf4j-impl/src/test/resources/log4j-test1.xml b/log4j-slf4j-impl/src/test/resources/log4j-test1.xml +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 @@ + + + +- +- +- + + + +@@ -25,10 +22,6 @@ + + + +- +- +- > +- + + + diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..ae17c0c --- /dev/null +++ b/plans/javapackages.fmf @@ -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 diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..a1e7bfd --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/sources b/sources index 21d4f71..d1dfca1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -105869a03b459007a7591d9e4373285d apache-log4j-2.5-src.tar.gz +SHA512 (log4j-2.20.0.tar.gz) = b99f0a2f7ca3f808223fd2e3463cce2a668ed5979e7bf935470b889e9141e0da0747f50ae936f43b9292434ed56569793a340ed42b358cacc5736084e2464d46 diff --git a/tests/Sanity/smoke/Smoke.java b/tests/Sanity/smoke/Smoke.java new file mode 100644 index 0000000..e9df839 --- /dev/null +++ b/tests/Sanity/smoke/Smoke.java @@ -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"); + } +} diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf new file mode 100644 index 0000000..e8a8265 --- /dev/null +++ b/tests/Sanity/smoke/main.fmf @@ -0,0 +1,6 @@ +summary: log4j smoke test +description: | + Test basic functionality of log4j. +require: + - log4j + - java-21-openjdk-devel diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh new file mode 100755 index 0000000..2ebc06f --- /dev/null +++ b/tests/Sanity/smoke/runtest.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# Author: Mikolaj Izdebski +. /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 diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..99fd67e --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,4 @@ +contact: Mikolaj Izdebski +framework: beakerlib +test: ./runtest.sh +tier: 0