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 1fa6e5f..80385b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ commons-logging-1.1.1-src.tar.gz +/commons-logging-1.1.2-src.tar.gz +/commons-logging-1.1.3-src.tar.gz +/commons-logging-1.2-src.tar.gz +/commons-logging-1.3.0-src.tar.gz +/commons-logging-1.3.4-src.tar.gz +/commons-logging-1.3.5-src.tar.gz diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index d9c8baa..c0736f1 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,41 +1,32 @@ +%bcond_with bootstrap -%global base_name logging -%global short_name commons-%{base_name} - -Name: apache-%{short_name} -Version: 1.1.1 -Release: 16%{?dist} +Name: apache-commons-logging +Version: 1.3.5 +Release: %autorelease Summary: Apache Commons Logging -License: ASL 2.0 -Group: Development/Libraries -URL: http://commons.apache.org/%{base_name} -Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz -Source1: %{short_name}.depmap -Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom -# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143 -Patch0: %{short_name}-avalon-update.patch - -Patch1: %{short_name}-eclipse-manifest.patch +License: Apache-2.0 +URL: https://commons.apache.org/proper/commons-logging/ BuildArch: noarch -BuildRequires: maven -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils >= 0:1.6 -BuildRequires: avalon-framework >= 4.3 -BuildRequires: avalon-logkit -BuildRequires: apache-commons-parent -BuildRequires: maven-plugin-build-helper -BuildRequires: maven-release-plugin -BuildRequires: maven-site-plugin -BuildRequires: servlet25 +ExclusiveArch: %{java_arches} noarch -Requires: java >= 1:1.6.0 -Requires: jpackage-utils >= 0:1.6 -Requires(post): jpackage-utils -Requires(postun):jpackage-utils +Source0: https://www.apache.org/dist/commons/logging/source/commons-logging-%{version}-src.tar.gz -# This should go away with F-17 -Provides: jakarta-%{short_name} = 0:%{version}-%{release} -Obsoletes: jakarta-%{short_name} <= 0:1.0.4 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local-openjdk25 +BuildRequires: mvn(javax.servlet:javax.servlet-api) +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.apache.logging.log4j:log4j-1.2-api) +BuildRequires: mvn(org.apache.logging.log4j:log4j-api) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) +BuildRequires: mvn(org.moditect:moditect-maven-plugin) +BuildRequires: mvn(org.slf4j:slf4j-api) +%endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.3.4-8 %description The commons-logging package provides a simple, component oriented @@ -48,164 +39,43 @@ commons-logging abstraction is meant to minimize the differences between the two, and to allow a developer to not tie himself to a particular logging implementation. -%package javadoc -Summary: API documentation for %{name} -Group: Documentation -Requires: jpackage-utils - -Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4 - -%description javadoc -%{summary}. - -# ----------------------------------------------------------------------------- - %prep -%setup -q -n %{short_name}-%{version}-src +%autosetup -p1 -C -%patch0 -p1 -%patch1 +%pom_remove_dep :avalon-framework +%pom_remove_dep :logkit +rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java +rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java +rm -r src/test/java/org/apache/commons/logging/{avalon,logkit} +rm src/test/java/org/apache/commons/logging/pathable/{Parent,Child}FirstTestCase.java -sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt +# Avoid hard-coded versions in OSGi metadata +%pom_xpath_set "pom:properties/pom:commons.osgi.import" '*;resolution:=optional' -# ----------------------------------------------------------------------------- +%pom_remove_plugin :maven-scm-publish-plugin +%pom_remove_plugin :maven-enforcer-plugin + +sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt + +# for compatibility reasons +%mvn_file ":commons-logging{*}" "commons-logging@1" "%{name}@1" +%mvn_alias ":commons-logging{*}" "org.apache.commons:commons-logging@1" "apache:commons-logging@1" + +%mvn_package ":::{*}:" + +# Remove log4j12 tests +rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %build -# fails with recent surefire for some reason -rm src/test/org/apache/commons/logging/logkit/StandardTestCase.java -rm src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java - -# These files have names suggesting they are test cases but they are not. -# They should probably be renamed/excluded from surefire run properly -rm src/test/org/apache/commons/logging/log4j/log4j12/*StandardTestCase.java - -mvn-rpmbuild -X -Dmaven.local.depmap.file="%{SOURCE1}" \ - install javadoc:aggregate - -# ----------------------------------------------------------------------------- +# missing test dependencies +%mvn_build -j -f %install -# jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -install -p -m 644 target/%{short_name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar -install -p -m 644 target/%{short_name}-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters.jar +%mvn_install -pushd $RPM_BUILD_ROOT%{_javadir} -for jar in %{name}*; do - ln -sf ${jar} `echo $jar| sed "s|apache-||g"` -done -popd - -# pom -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom -install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-api.pom - -%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} -%add_to_maven_depmap org.apache.commons %{short_name}-api %{version} JPP %{short_name}-api -%add_to_maven_depmap org.apache.commons %{short_name}-adapters %{version} JPP %{short_name}-adapters - -# following lines are only for backwards compatibility. New packages -# should use proper groupid org.apache.commons and also artifactid -%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name} -%add_to_maven_depmap %{short_name} %{short_name}-api %{version} JPP %{short_name}-api -%add_to_maven_depmap %{short_name} %{short_name}-adapters %{version} JPP %{short_name}-adapters - - -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -# ----------------------------------------------------------------------------- -%post -%update_maven_depmap - -%postun -%update_maven_depmap - -%pre javadoc -# workaround for rpm bug, can be removed in F-17 -[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ -rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : - - -# ----------------------------------------------------------------------------- - -%files -%defattr(-,root,root,-) -%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt -%{_javadir}/* -%{_mavenpomdir}/JPP-%{short_name}.pom -%{_mavenpomdir}/JPP-%{short_name}-api.pom -%{_mavendepmapfragdir}/* - - -%files javadoc -%defattr(-,root,root,-) -%doc LICENSE.txt -%{_javadocdir}/%{name} - -# ----------------------------------------------------------------------------- +%files -f .mfiles +%license LICENSE.txt NOTICE.txt +%doc PROPOSAL.html RELEASE-NOTES.txt %changelog -* Thu Apr 21 2011 Stanislav Ochotnicky - 1.1.1-16 -- Build with maven 3 -- Fix build for avalon-framework - -* Mon Feb 07 2011 Fedora Release Engineering - 1.1.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Dec 16 2010 Alexander Kurtakov 1.1.1-14 -- Bring back commons-logging* symlinks. - -* Thu Dec 16 2010 Stanislav Ochotnicky - 1.1.1-13 -- Replace tomcat6 BR with servlet25 only -- Cleanups according to new packaging guidelines -- Install maven metadata for -api jar -- Versionless jars/javadocs - -* Tue Nov 9 2010 Stanislav Ochotnicky - 1.1.1-12 -- Add depmaps for api and adapters subpackages -- Use apache-commons-parent BR instead of maven-* -- Replace tomcat5 BR with tomcat6 -- Reenable tests - -* Thu Jul 8 2010 Stanislav Ochotnicky - 1.1.1-11 -- Add license to javadoc subpackage - -* Wed Jun 9 2010 Alexander Kurtakov 1.1.1-10 -- Add osgi manifest entries. - -* Fri May 21 2010 Stanislav Ochotnicky - 1.1.1-9 -- Correct depmap filename for backward compatibility - -* Mon May 17 2010 Stanislav Ochotnicky - 1.1.1-8 -- Fix wrong depmap JPP name to short_name -- Add obsoletes to javadoc subpackage - -* Wed May 12 2010 Stanislav Ochotnicky - 1.1.1-7 -- Fix symlink problems introduced previously in r5 - -* Tue May 11 2010 Stanislav Ochotnicky - 1.1.1-6 -- Add one more add_to_maven_depmap for backward compatibility - -* Mon May 10 2010 Stanislav Ochotnicky - 1.1.1-5 -- Fix up add_to_maven_depmap -- Add jpackage-utils Requires for javadoc -- Cleanup install a bit - -* Fri May 7 2010 Stanislav Ochotnicky - 1.1.1-4 -- Fix provides - -* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-3 -- Revert to using default permissions -- Drop "Package" from summary, improve javadoc summary text - -* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-2 -- Fix EOLs on docs -- Create javadoc symlinks during install -- Use version macro in Source0 URL, use _mavenpomdir macro - -* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-1 -- Rename and rebase from jakarta-commons-logging +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..f55f8c8 --- /dev/null +++ b/changelog @@ -0,0 +1,267 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 1.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.3.0-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1.3.0-4 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 1.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 04 2023 Mikolaj Izdebski - 1.3.0-1 +- Update to upstream version 1.3.0 + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.2-35 +- Rebuild + +* Wed Jul 19 2023 Jerry James - 1.2-34 +- Build with log4j support in non-bootstrap mode +- Convert the License tag to SPDX +- Update the project URL + +* Wed Jul 19 2023 Fedora Release Engineering - 1.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.2-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.2-30 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 1.2-28 +- Bump Java compiler source/target levels to 1.7 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.2-26 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Sep 10 2020 Mat Booth - 1.2-24 +- Build against log4j 2 + +* Mon Jul 27 2020 Fedora Release Engineering - 1.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.2-22 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jun 04 2020 Fabio Valentini - 1.2-21 +- Override javac source and target versions to fix builds with Java 11. + +* Tue Jan 28 2020 Fedora Release Engineering - 1.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Nov 09 2019 Fabio Valentini - 1.2-19 +- Disable avalon support by default. + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.2-15 +- Mass rebuild for javapackages-tools 201902 + +* Wed Jul 24 2019 Fedora Release Engineering - 1.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.2-14 +- Mass rebuild for javapackages-tools 201901 + +* Thu Jan 31 2019 Fedora Release Engineering - 1.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Dec 18 2018 Mat Booth - 1.2-16 +- Fix OSGi metadata + +* Mon Dec 17 2018 Mat Booth - 1.2-15 +- Rebuild to regenerate requires, fixes rhbz#1660117 + +* Thu Jul 12 2018 Fedora Release Engineering - 1.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 29 2018 Mikolaj Izdebski - 1.2-12 +- Cleanup spec file + +* Wed Jul 26 2017 Fedora Release Engineering - 1.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 22 2017 Michael Simacek - 1.2-10 +- Avoid %%add_maven_depmap + +* Mon Feb 13 2017 Michael Simacek - 1.2-9 +- Fix conditional + +* Fri Feb 10 2017 Michael Simacek - 1.2-8 +- Use log4j12 +- Add avalon conditional + +* Fri Feb 10 2017 Fedora Release Engineering - 1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue May 31 2016 Mikolaj Izdebski - 1.2-6 +- Port to maven-jar-plugin 3.0.0 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 9 2015 Mikolaj Izdebski - 1.2-3 +- Add aliases for apache groupId + +* Tue Jul 29 2014 Mikolaj Izdebski - 1.2-2 +- Generate different Bundle-SymbolicName for different JARs +- Resolves: rhbz#1123055 + +* Sun Jul 20 2014 Mikolaj Izdebski - 1.2-1 +- Update to upstream version 1.2 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.1.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue May 13 2014 Michael Simacek - 1.1.3-12 +- Disable tests that use log4j12 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.1.3-11 +- Use Requires: java-headless rebuild (#1067528) + +* Thu Feb 20 2014 Michael Simacek - 1.1.3-10 +- Set logkit dependency scope to provided + +* Thu Feb 20 2014 Michael Simacek - 1.1.3-9 +- Set avalon dependency scope to provided + +* Wed Jan 22 2014 Michal Srb - 1.1.3-8 +- Run all the tests agains + +* Sun Aug 11 2013 Michal Srb - 1.1.3-7 +- Make this package noarch again (Resolves: rhbz#995756) + +* Tue Aug 06 2013 Michal Srb - 1.1.3-6 +- Temporarily remove test which fails in koji + +* Mon Aug 05 2013 Michal Srb - 1.1.3-5 +- Add missing BR: maven-dependency-plugin, build-helper-maven-plugin + +* Mon Aug 05 2013 Michal Srb - 1.1.3-4 +- Add missing BR: maven-failsafe-plugin + +* Mon Aug 05 2013 Michal Srb - 1.1.3-3 +- Adapt to current guidelines + +* Sat Aug 03 2013 Fedora Release Engineering - 1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue May 21 2013 Mikolaj Izdebski - 1.1.3-1 +- Update to upstream version 1.1.3 +- Remove OSGi Bundle-SymbolicName patch (accepted upstream) + +* Tue Apr 9 2013 Mikolaj Izdebski - 1.1.2-2 +- Set OSGi Bundle-SymbolicName to org.apache.commons.logging +- Resolves: rhbz#949842 + +* Mon Apr 8 2013 Mikolaj Izdebski - 1.1.2-1 +- Update to upstream version 1.1.2 +- Convert POM to POM macros +- Remove OSGi manifest patch; fixed upstream + +* Wed Feb 13 2013 Fedora Release Engineering - 1.1.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.1.1-22 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Nov 22 2012 Mikolaj Izdebski - 1.1.1-21 +- Install NOTICE file +- Resolves: rhbz#879581 + +* Wed Jul 18 2012 Fedora Release Engineering - 1.1.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue May 1 2012 Alexander Kurtakov 1.1.1-19 +- Bring back jakarta-commons-logging provides/obsoletes - the comment was misleading. + +* Mon Apr 30 2012 Alexander Kurtakov 1.1.1-18 +- Fix build with latest libs. +- Adapt to current guidelines. + +* Thu Jan 12 2012 Fedora Release Engineering - 1.1.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Apr 21 2011 Stanislav Ochotnicky - 1.1.1-16 +- Build with maven 3 +- Fix build for avalon-framework + +* Mon Feb 07 2011 Fedora Release Engineering - 1.1.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 16 2010 Alexander Kurtakov 1.1.1-14 +- Bring back commons-logging* symlinks. + +* Thu Dec 16 2010 Stanislav Ochotnicky - 1.1.1-13 +- Replace tomcat6 BR with servlet25 only +- Cleanups according to new packaging guidelines +- Install maven metadata for -api jar +- Versionless jars/javadocs + +* Tue Nov 9 2010 Stanislav Ochotnicky - 1.1.1-12 +- Add depmaps for api and adapters subpackages +- Use apache-commons-parent BR instead of maven-* +- Replace tomcat5 BR with tomcat6 +- Reenable tests + +* Thu Jul 8 2010 Stanislav Ochotnicky - 1.1.1-11 +- Add license to javadoc subpackage + +* Wed Jun 9 2010 Alexander Kurtakov 1.1.1-10 +- Add osgi manifest entries. + +* Fri May 21 2010 Stanislav Ochotnicky - 1.1.1-9 +- Correct depmap filename for backward compatibility + +* Mon May 17 2010 Stanislav Ochotnicky - 1.1.1-8 +- Fix wrong depmap JPP name to short_name +- Add obsoletes to javadoc subpackage + +* Wed May 12 2010 Stanislav Ochotnicky - 1.1.1-7 +- Fix symlink problems introduced previously in r5 + +* Tue May 11 2010 Stanislav Ochotnicky - 1.1.1-6 +- Add one more add_to_maven_depmap for backward compatibility + +* Mon May 10 2010 Stanislav Ochotnicky - 1.1.1-5 +- Fix up add_to_maven_depmap +- Add jpackage-utils Requires for javadoc +- Cleanup install a bit + +* Fri May 7 2010 Stanislav Ochotnicky - 1.1.1-4 +- Fix provides + +* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-3 +- Revert to using default permissions +- Drop "Package" from summary, improve javadoc summary text + +* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-2 +- Fix EOLs on docs +- Create javadoc symlinks during install +- Use version macro in Source0 URL, use _mavenpomdir macro + +* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-1 +- Rename and rebase from jakarta-commons-logging 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/commons-logging-avalon-update.patch b/commons-logging-avalon-update.patch deleted file mode 100644 index aadaaa7..0000000 --- a/commons-logging-avalon-update.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 8efaf6d..24dc9fb 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -472,8 +472,15 @@ under the License. - - - avalon-framework -- avalon-framework -- 4.1.3 -+ avalon-framework-api -+ 4.3 -+ true -+ -+ -+ avalon-framework -+ avalon-framework-impl -+ 4.3 -+ test - true - - -@@ -520,4 +527,4 @@ under the License. - 1.2 - 1.1 - -- -\ No newline at end of file -+ diff --git a/commons-logging-eclipse-manifest.patch b/commons-logging-eclipse-manifest.patch deleted file mode 100644 index 38a39d2..0000000 --- a/commons-logging-eclipse-manifest.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/conf/MANIFEST.MF.orig 2007-11-22 01:27:52.000000000 +0200 -+++ src/conf/MANIFEST.MF 2010-06-09 21:04:06.532857757 +0300 -@@ -6,3 +6,12 @@ Implementation-Title: Commons Logging - Implementation-Vendor-Id: org.apache - Implementation-Vendor: Apache Software Foundation - Implementation-Version: 1.1.1 -+Bundle-ManifestVersion: 2 -+Export-Package: org.apache.commons.logging;version="1.1.1",org.apache. -+ commons.logging.impl;version="1.1.1" -+Bundle-Version: 1.1.1.v20080605-1930 -+Bundle-SymbolicName: org.apache.commons.logging -+Bundle-Name: Apache Commons Logging Plug-in -+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 -+Bundle-Localization: plugin -+Bundle-Vendor: Apache Software Foundation diff --git a/commons-logging-maven-release-plugin.patch b/commons-logging-maven-release-plugin.patch deleted file mode 100644 index 835db1f..0000000 --- a/commons-logging-maven-release-plugin.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 8efaf6d..4b3e8f9 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -308,21 +308,6 @@ under the License. - - - -- org.apache.maven.plugins -- maven-release-plugin -- 2.0-beta-6 -- -- -- site deploy -- -- -Prelease -- -- -- -- -