From 7fbb47c61712d64a3a33710fb778629bfdb6df8fbbfb154a7deaee7525138cd1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 18 Mar 2019 09:40:51 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=39 --- LICENSE-2.0.txt | 202 ++++++++++++++++++++++++++++++++++++++++++ pre_checkin.sh | 2 + slf4j-sources.changes | 124 ++++++++++++++++++++++++++ slf4j-sources.spec | 76 ++++++++++++++++ slf4j.changes | 7 ++ slf4j.spec | 145 ++++++++++++++++++++++-------- 6 files changed, 518 insertions(+), 38 deletions(-) create mode 100644 LICENSE-2.0.txt create mode 100644 pre_checkin.sh create mode 100644 slf4j-sources.changes create mode 100644 slf4j-sources.spec diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt new file mode 100644 index 0000000..81fbaf6 --- /dev/null +++ b/LICENSE-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/pre_checkin.sh b/pre_checkin.sh new file mode 100644 index 0000000..b9169f4 --- /dev/null +++ b/pre_checkin.sh @@ -0,0 +1,2 @@ +#!/bin/sh +cp slf4j.changes slf4j-sources.changes diff --git a/slf4j-sources.changes b/slf4j-sources.changes new file mode 100644 index 0000000..d2ee968 --- /dev/null +++ b/slf4j-sources.changes @@ -0,0 +1,124 @@ +------------------------------------------------------------------- +Mon Mar 18 09:34:22 UTC 2019 - Fridrich Strba + +- Split slf4j package into several sub-packages leaving only + parent, api, simple and nop in the main package +- Package slf4j source jar files in a separate spec file + +------------------------------------------------------------------- +Tue Feb 26 09:24:00 UTC 2019 - Fridrich Strba + +- Clean up the maven pom installation + +------------------------------------------------------------------- +Mon Oct 22 10:44:00 UTC 2018 - Fridrich Strba + +- Upgrade to 1.7.25 +- Modify the build.xml file tarball to correspond to the right + version +- Modify slf4j-commons-lang3.patch to the new context + +------------------------------------------------------------------- +Mon Oct 15 14:52:23 UTC 2018 - Fridrich Strba + +- Install the maven artefacts to have mvn dependencies/provides + generated automatically + +------------------------------------------------------------------- +Fri May 18 09:17:44 UTC 2018 - pmonrealgonzalez@suse.com + +- Security fix: [bsc#1085970, CVE-2018-8088] + * Disallow EventData deserialization by default + * Added slf4j-Disallow-EventData-deserialization-by-default.patch + refreshed from Fedora [ https://src.fedoraproject.org/rpms/slf4j/ + blob/d7cd96bc7a8e8d8d62c8bc62baa7df02cef56c63/f/ + 0001-Disallow-EventData-deserialization-by-default.patch ] + +------------------------------------------------------------------- +Wed Oct 11 09:08:10 UTC 2017 - fstrba@suse.com + +- Adeed patch: + * slf4j-commons-lang3.patch + + Use apache-commons-lang3 instead of apache-commons-lang + +------------------------------------------------------------------- +Sun Sep 10 13:38:22 UTC 2017 - fstrba@suse.com + +- Specify java source and target levels 1.6 in order to allow + building with jdk9 +- Disable doclint to avoid bailing out on formatting errors +- Recompress the build.xml.tar.bz2, so that it is a real tar.bz2 + +------------------------------------------------------------------- +Fri May 19 16:49:25 UTC 2017 - tchvatal@suse.com + +- Remove some not-needed deps + +------------------------------------------------------------------- +Tue Nov 10 09:07:58 UTC 2015 - dmacvicar@suse.de + +- note: + slf4j-pom_xml.patch was removed (not relevant anymore) + +------------------------------------------------------------------- +Fri Oct 23 10:14:51 UTC 2015 - dmacvicar@suse.de + +- remove all unnecessary maven depmap metadata + +------------------------------------------------------------------- +Fri Oct 23 08:56:21 UTC 2015 - dmacvicar@suse.de + +- update to version 1.7.12 + +------------------------------------------------------------------- +Wed Mar 18 09:46:20 UTC 2015 - tchvatal@suse.com + +- Fix build with new javapackages-tools + +------------------------------------------------------------------- +Fri Aug 29 12:50:01 UTC 2014 - coolo@suse.com + +- build against log4j-mini to avoid a cycle + +------------------------------------------------------------------- +Thu Sep 19 14:22:54 UTC 2013 - mvyskocil@suse.com + +- self-provide osgi(slf4j.api) symbol + +------------------------------------------------------------------- +Fri Sep 13 10:51:12 UTC 2013 - mvyskocil@suse.com + +- fix build with apache-commons-lang + +------------------------------------------------------------------- +Wed Sep 11 07:49:42 UTC 2013 - mvyskocil@suse.com + +- use add_maven_depmap from javapackages-tools + +------------------------------------------------------------------- +Mon Sep 9 11:06:22 UTC 2013 - tchvatal@suse.com + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- +Fri Apr 27 09:59:40 UTC 2012 - mvyskocil@suse.cz + +- format spec file to be suitable for Factory + +------------------------------------------------------------------- +Mon Dec 12 19:31:15 UTC 2011 - dmacvicar@suse.de + +- Fix absolute path in maven-build.xml that prevented + package task in newer versions of openSUSE +- Fix javadoc group + +------------------------------------------------------------------- +Wed Jul 27 09:08:44 UTC 2011 - dmacvicar@suse.de + +- Completely remove all maven build parts. Build with ant + +------------------------------------------------------------------- +Mon Jul 4 21:18:38 UTC 2011 - dmacvicar@suse.de + +- add BuildRoot tag + diff --git a/slf4j-sources.spec b/slf4j-sources.spec new file mode 100644 index 0000000..9f91411 --- /dev/null +++ b/slf4j-sources.spec @@ -0,0 +1,76 @@ +# +# spec file for package slf4j +# +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2000-2009, JPackage Project +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global base_name slf4j +Name: %{base_name}-sources +Version: 1.7.25 +Release: 0 +Summary: SLF4J Source JARs +# the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT +License: MIT AND Apache-2.0 +Group: Development/Libraries/Java +URL: http://www.slf4j.org/ +Source0: http://www.slf4j.org/dist/%{base_name}-%{version}.tar.gz +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +Patch2: slf4j-commons-lang3.patch +Patch3: slf4j-Disallow-EventData-deserialization-by-default.patch +BuildRequires: javapackages-local +BuildRequires: xmvn-install +BuildRequires: xmvn-resolve +BuildArch: noarch +Requires: mvn(commons-logging:commons-logging) +Requires: mvn(log4j:log4j) +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description +SLF4J Source JARs. + +%prep +%setup -q -n %{base_name}-%{version} +%patch2 -p1 +%patch3 -p1 +find . -name "*.jar" | xargs rm +cp -p %{SOURCE1} APACHE-LICENSE + +# Compat symlinks +%mvn_file ':{*}' %{base_name}/@1 +%mvn_package :::sources: + +%build +rm -f */src/main/resources/META-INF/MANIFEST.MF +for i in api ext jcl jdk14 log4j12 nop simple; do + mkdir -p %{base_name}-${i}/target + jar cf %{base_name}-${i}/target/%{base_name}-${i}-%{version}-sources.jar -C %{base_name}-${i}/src/main/java . + jar uf %{base_name}-${i}/target/%{base_name}-${i}-%{version}-sources.jar -C %{base_name}-${i}/src/main/resources . + %mvn_artifact org.slf4j:%{base_name}-${i}:jar:sources:%{version} %{base_name}-${i}/target/%{base_name}-${i}-%{version}-sources.jar +done +for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do + mkdir -p ${i}/target + jar cf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/java . + jar uf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/resources . + %mvn_artifact org.slf4j:${i}:jar:sources:%{version} ${i}/target/${i}-%{version}-sources.jar +done + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE.txt APACHE-LICENSE + +%changelog diff --git a/slf4j.changes b/slf4j.changes index 9e5775b..d2ee968 100644 --- a/slf4j.changes +++ b/slf4j.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 18 09:34:22 UTC 2019 - Fridrich Strba + +- Split slf4j package into several sub-packages leaving only + parent, api, simple and nop in the main package +- Package slf4j source jar files in a separate spec file + ------------------------------------------------------------------- Tue Feb 26 09:24:00 UTC 2019 - Fridrich Strba diff --git a/slf4j.spec b/slf4j.spec index c255335..9020054 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -21,11 +21,13 @@ Name: slf4j Version: 1.7.25 Release: 0 Summary: Simple Logging Facade for Java -License: MIT +# the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT +License: MIT AND Apache-2.0 Group: Development/Libraries/Java URL: http://www.slf4j.org/ Source0: http://www.slf4j.org/dist/%{name}-%{version}.tar.gz -Source1: build.xml.tar.bz2 +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +Source2: build.xml.tar.bz2 Patch1: build-remove-slf4j_api-binder.patch Patch2: slf4j-commons-lang3.patch Patch3: slf4j-Disallow-EventData-deserialization-by-default.patch @@ -42,7 +44,7 @@ BuildRequires: junit >= 3.8.2 BuildRequires: log4j-mini Requires: cal10n Requires: java -# this is ugly hack, which creates package wich requires the same, +# this is ugly hack, which creates package which requires the same, # however slf4j is not splitted between -api and -impl, but pom files are modeled as it was Provides: osgi(slf4j.api) BuildArch: noarch @@ -73,13 +75,70 @@ Group: Documentation/Other %description manual Manual for %{name}. +%package jdk14 +Summary: SLF4J JDK14 Binding +Group: Development/Libraries/Java +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description jdk14 +SLF4J JDK14 Binding. + +%package log4j12 +Summary: SLF4J LOG4J-12 Binding +Group: Development/Libraries/Java +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description log4j12 +SLF4J LOG4J-12 Binding. + +%package jcl +Summary: SLF4J JCL Binding +Group: Development/Libraries/Java +Requires: mvn(commons-logging:commons-logging) +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description jcl +SLF4J JCL Binding. + +%package ext +Summary: SLF4J Extensions Module +Group: Development/Libraries/Java +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description ext +Extensions to the SLF4J API. + +%package -n jcl-over-slf4j +Summary: JCL 1.1.1 implemented over SLF4J +Group: Development/Libraries/Java +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description -n jcl-over-slf4j +JCL 1.1.1 implemented over SLF4J. + +%package -n log4j-over-slf4j +Summary: Log4j implemented over SLF4J +Group: Development/Libraries/Java +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description -n log4j-over-slf4j +Log4j implemented over SLF4J. + +%package -n jul-to-slf4j +Summary: JUL to SLF4J bridge +Group: Development/Libraries/Java +Requires: mvn(org.slf4j:slf4j-api) = %{version} + +%description -n jul-to-slf4j +JUL to SLF4J bridge. + %prep -%setup -q -tar xjf %{SOURCE1} +%setup -q -a2 %patch1 -p1 %patch2 -p1 %patch3 -p1 find . -name "*.jar" | xargs rm +cp -p %{SOURCE1} APACHE-LICENSE sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml @@ -111,41 +170,30 @@ ant -Dmaven2.jpp.mode=true \ %install # jars install -d -m 0755 %{buildroot}%{_javadir}/%{name} - -install -m 644 jcl-over-slf4j/target/jcl-over-slf4j-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}/jcl-over-slf4j.jar -install -m 644 jul-to-slf4j/target/jul-to-slf4j-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}/jul-to-slf4j.jar -install -m 644 log4j-over-slf4j/target/log4j-over-slf4j-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}/log4j-over-slf4j.jar -install -m 644 slf4j-api/target/%{name}-api-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}/api.jar -install -m 644 slf4j-ext/target/%{name}-ext-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}/ext.jar -install -m 644 slf4j-jcl/target/%{name}-jcl-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}/jcl.jar -install -m 644 slf4j-jdk14/target/%{name}-jdk14-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}/jdk14.jar -install -m 644 slf4j-log4j12/target/%{name}-log4j12-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}/log4j12.jar -install -m 644 slf4j-migrator/target/%{name}-migrator-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}/migrator.jar -install -m 644 slf4j-nop/target/%{name}-nop-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}/nop.jar -install -m 644 slf4j-simple/target/%{name}-simple-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}/simple.jar - -# pom -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom -%add_maven_depmap %{name}.pom -for i in api ext jcl jdk14 log4j12 migrator nop simple; do - install -pm 644 slf4j-$i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom - %add_maven_depmap %{name}-$i.pom %{name}/$i.jar +for i in api ext jcl jdk14 log4j12 nop simple; do + install -m 644 slf4j-${i}/target/slf4j-${i}-%{version}.jar \ + %{buildroot}%{_javadir}/%{name}/${i}.jar + ln -sf ${i}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar done for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do - install -pm 644 $i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom - %add_maven_depmap %{name}-$i.pom %{name}/$i.jar + install -m 644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar +done + +# poms +install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/parent.pom +for i in api ext jcl jdk14 log4j12 nop simple; do + install -pm 644 slf4j-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom +done +for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do + install -pm 644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom +done +%add_maven_depmap %{name}/parent.pom +for i in api nop simple; do + %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar +done +for i in ext jcl jdk14 log4j12 jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do + %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i} done # manual @@ -162,6 +210,27 @@ rm -rf target/site %files -f .mfiles %dir %{_docdir}/%{name}-%{version} %license %{_docdir}/%{name}-%{version}/LICENSE.txt +%{_javadir}/%{name}/%{name}-api.jar +%{_javadir}/%{name}/%{name}-nop.jar +%{_javadir}/%{name}/%{name}-simple.jar + +%files jdk14 -f .mfiles-jdk14 +%{_javadir}/%{name}/%{name}-jdk14.jar + +%files log4j12 -f .mfiles-log4j12 +%{_javadir}/%{name}/%{name}-log4j12.jar + +%files jcl -f .mfiles-jcl +%{_javadir}/%{name}/%{name}-jcl.jar + +%files ext -f .mfiles-ext +%{_javadir}/%{name}/%{name}-ext.jar + +%files -n jcl-over-slf4j -f .mfiles-jcl-over-slf4j + +%files -n log4j-over-slf4j -f .mfiles-log4j-over-slf4j + +%files -n jul-to-slf4j -f .mfiles-jul-to-slf4j %files javadoc %{_javadocdir}/%{name} From d6add94b17c95e3212707d6a54e32da75ccccd81cf800f9384bd52f0bcfc225d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 19 Mar 2019 05:32:35 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=40 --- slf4j-sources.changes | 6 ++++++ slf4j.changes | 6 ++++++ slf4j.spec | 3 +++ 3 files changed, 15 insertions(+) diff --git a/slf4j-sources.changes b/slf4j-sources.changes index d2ee968..c572839 100644 --- a/slf4j-sources.changes +++ b/slf4j-sources.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 19 05:31:47 UTC 2019 - Fridrich Strba + +- Fix an unexpanded ${parsedVersion.osgiVersion} variable in the + manifests. + ------------------------------------------------------------------- Mon Mar 18 09:34:22 UTC 2019 - Fridrich Strba diff --git a/slf4j.changes b/slf4j.changes index d2ee968..c572839 100644 --- a/slf4j.changes +++ b/slf4j.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 19 05:31:47 UTC 2019 - Fridrich Strba + +- Fix an unexpanded ${parsedVersion.osgiVersion} variable in the + manifests. + ------------------------------------------------------------------- Mon Mar 18 09:34:22 UTC 2019 - Fridrich Strba diff --git a/slf4j.spec b/slf4j.spec index 9020054..de02927 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -145,6 +145,9 @@ sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml %{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | \ %{_bindir}/xargs -t perl -pi -e 's/\r$//g' +# Unexpanded variable in the manifests +perl -pi -e 's#\${parsedVersion\.osgiVersion}#%{version}#g' */src/main/resources/META-INF/MANIFEST.MF + # The general pattern is that the API package exports API classes and does # # not require impl classes. slf4j was breaking that causing "A cycle was # # detected when generating the classpath slf4j.api, slf4j.nop, slf4j.api." From fc447a975572e0c9b07b17b9f5932fc2ee985546d8e98064314e187c437b8ab6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 19 Mar 2019 05:38:07 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=41 --- slf4j.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slf4j.spec b/slf4j.spec index de02927..04aea41 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -146,7 +146,7 @@ sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml %{_bindir}/xargs -t perl -pi -e 's/\r$//g' # Unexpanded variable in the manifests -perl -pi -e 's#\${parsedVersion\.osgiVersion}#%{version}#g' */src/main/resources/META-INF/MANIFEST.MF +perl -pi -e 's#\$\{parsedVersion\.osgiVersion\}#%{version}#g' */src/main/resources/META-INF/MANIFEST.MF # The general pattern is that the API package exports API classes and does # # not require impl classes. slf4j was breaking that causing "A cycle was From d7384548e841e5c41f406819522b1782e41513a4f86595f7da03548917d240f7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 19 Mar 2019 09:54:29 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=42 --- slf4j.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/slf4j.spec b/slf4j.spec index 04aea41..1192fd9 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -146,7 +146,11 @@ sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml %{_bindir}/xargs -t perl -pi -e 's/\r$//g' # Unexpanded variable in the manifests -perl -pi -e 's#\$\{parsedVersion\.osgiVersion\}#%{version}#g' */src/main/resources/META-INF/MANIFEST.MF +for i in */src/main/resources/META-INF/MANIFEST.MF; do + echo "Bundle-Version: %{version}" >> ${i} + perl -pi -e 's#\$\{parsedVersion\.osgiVersion\}#%{version}#g' ${i} + perl -pi -e 's#\$\{slf4j\.api\.minimum\.compatible\.version\}#1\.6\.0#g' ${i} +done # The general pattern is that the API package exports API classes and does # # not require impl classes. slf4j was breaking that causing "A cycle was From c40611b57e124d1fb68f47a5b57343216629585d4edab1429a110515020a8b8a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 20 Mar 2019 10:49:31 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=43 --- slf4j.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/slf4j.spec b/slf4j.spec index 1192fd9..4577c78 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -147,7 +147,9 @@ sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml # Unexpanded variable in the manifests for i in */src/main/resources/META-INF/MANIFEST.MF; do + echo "" >> ${i} echo "Bundle-Version: %{version}" >> ${i} + sed -i '/^$/d' ${i} perl -pi -e 's#\$\{parsedVersion\.osgiVersion\}#%{version}#g' ${i} perl -pi -e 's#\$\{slf4j\.api\.minimum\.compatible\.version\}#1\.6\.0#g' ${i} done