Use log4j 1.2 compat package
This commit is contained in:
parent
ce4adb7025
commit
6d500644a6
25
0004-Use-log4j-1.2.17.patch
Normal file
25
0004-Use-log4j-1.2.17.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From cec42bf7ae8b4b72850c3cdea74a07603f11786f Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Wed, 18 Jun 2014 07:25:12 +0200
|
||||
Subject: [PATCH 4/4] Use log4j 1.2.17
|
||||
|
||||
---
|
||||
pom.xml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index e35d72d..c8d48fd 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -187,7 +187,7 @@
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
- <version>1.2.12</version>
|
||||
+ <version>1.2.17</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
--
|
||||
1.9.3
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
Name: velocity
|
||||
Version: 1.7
|
||||
Release: 12%{?dist}
|
||||
Release: 13%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Java-based template engine
|
||||
License: ASL 2.0
|
||||
@ -38,6 +38,7 @@ URL: http://velocity.apache.org/
|
||||
Source0: http://www.apache.org/dist/%{name}/engine/%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: http://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}.pom
|
||||
Patch0: 0001-Remove-avalon-logkit.patch
|
||||
Patch1: 0004-Use-log4j-1.2.17.patch
|
||||
Patch2: 0003-Use-system-jars.patch
|
||||
Patch3: 0004-JDBC-41-compat.patch
|
||||
Patch4: 0001-Don-t-use-Werken-XPath.patch
|
||||
@ -156,7 +157,7 @@ commons-logging \
|
||||
tomcat-servlet-api \
|
||||
junit \
|
||||
jakarta-oro \
|
||||
log4j \
|
||||
log4j:log4j:1.2.17 \
|
||||
jaxen \
|
||||
jdom \
|
||||
bcel \
|
||||
@ -208,6 +209,9 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||
%{_datadir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-13
|
||||
- Use log4j 1.2 compat package
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user