rpms/apache-commons-logging
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Build with log4j support in non-bootstrap mode

Browse Source
This commit is contained in:
Jerry James 2023-07-19 15:41:06 -06:00
parent 96ac51e51a
commit c50c700566
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apache-commons-logging.spec
View File

@ -21,6 +21,7 @@ BuildRequires: javapackages-bootstrap
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(log4j:log4j)
BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
@ -45,13 +46,16 @@ logging implementation.
%pom_remove_dep -r :avalon-framework %pom_remove_dep -r :avalon-framework
%pom_remove_dep -r :logkit %pom_remove_dep -r :logkit
%pom_remove_dep -r :log4j
rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java
rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java
rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java
rm -r src/test/java/org/apache/commons/logging/{avalon,log4j,logkit} rm -r src/test/java/org/apache/commons/logging/{avalon,logkit}
rm src/test/java/org/apache/commons/logging/pathable/{Parent,Child}FirstTestCase.java rm src/test/java/org/apache/commons/logging/pathable/{Parent,Child}FirstTestCase.java
%if %{with bootstrap}
%pom_remove_dep -r :log4j
rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java
rm -r src/test/java/org/apache/commons/logging/log4j
%endif
# Avoid hard-coded versions in OSGi metadata # Avoid hard-coded versions in OSGi metadata
%pom_xpath_set "pom:properties/pom:commons.osgi.import" '*;resolution:=optional' %pom_xpath_set "pom:properties/pom:commons.osgi.import" '*;resolution:=optional'
@ -84,6 +88,7 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
%changelog %changelog
* Wed Jul 19 2023 Jerry James <loganjerry@gmail.com> - 1.2-34 * Wed Jul 19 2023 Jerry James <loganjerry@gmail.com> - 1.2-34
- Build with log4j support in non-bootstrap mode
- Convert the License tag to SPDX - Convert the License tag to SPDX
- Update the project URL - Update the project URL