commit 39f85b7f46f9218d62a64ca8369b07dccbb35333
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Feb 26 14:20:20 2015 +0100
Update to upstream version 2.2
.gitignore | 1 +
log4j.spec | 13 +++++++------
sources | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index abe307b..21a86b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ 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
diff --git a/log4j.spec b/log4j.spec
index 97af6c2..6e4002b 100644
--- a/log4j.spec
+++ b/log4j.spec
@@ -1,6 +1,6 @@
Name: log4j
-Version: 2.0
-Release: 2%{?dist}
+Version: 2.2
+Release: 1%{?dist}
Summary: Java logging package
BuildArch: noarch
License: ASL 2.0
@@ -131,7 +131,8 @@ rm -rf docs/api
%pom_add_dep sun.jdk:jconsole %{name}-jmx-gui
# Different AID, provided by equinox
-%pom_remove_dep :org.osgi.core pom.xml %{name}-core %{name}-api
+%pom_remove_dep : %{name}-api
+%pom_add_dep org.eclipse:osgi:any:provided %{name}-api
# Classpath hell, equinox must come before felix
%pom_remove_dep org.eclipse.osgi:org.eclipse.osgi %{name}-core
@@ -141,9 +142,6 @@ rm -rf docs/api
%pom_remove_dep :javax.persistence %{name}-core
%pom_add_dep org.hibernate.javax.persistence:hibernate-jpa-2.1-api:any:provided
%{name}-core
-# Do not generate requires on optional dependencies
-%pom_xpath_inject "pom:dependency[pom:optional='true' and
not(pom:scope)]" '<scope>provided</scope>' %{name}-core
-
# 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
@@ -210,6 +208,9 @@ fi
%changelog
+* Thu Feb 26 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2-1
+- Update to upstream version 2.2
+
* Mon Jan 19 2015 Michael Simacek <msimacek(a)redhat.com> - 2.0-2
- Remove site-plugin from all poms
diff --git a/sources b/sources
index 7e485d0..786aaaa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15f349b34e029c2bd2baaeeffc60e32f apache-log4j-2.0-src.tar.gz
+03c788a5115812ab771f73b562d3928d apache-log4j-2.2-src.tar.gz
Show replies by date