[xbean] Remove mx4j from deps (javax.management provided by JDK 1.5+)
Stanislav Ochotnicky
sochotni at fedoraproject.org
Thu May 3 13:55:42 UTC 2012
commit 351792020aed07f5aeb43078d3fabf434d37c125
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Thu May 3 15:55:22 2012 +0200
Remove mx4j from deps (javax.management provided by JDK 1.5+)
pom-3.8.patch | 14 ++++++++++----
xbean.spec | 6 ++++--
2 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/pom-3.8.patch b/pom-3.8.patch
index d8e36a3..cfd0f15 100644
--- a/pom-3.8.patch
+++ b/pom-3.8.patch
@@ -1,5 +1,5 @@
diff --git a/pom.xml b/pom.xml
-index cfabbe5..b699aff 100644
+index cfabbe5..b3f0a12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,12 +24,6 @@
@@ -15,10 +15,16 @@ index cfabbe5..b699aff 100644
<groupId>org.apache.xbean</groupId>
<artifactId>xbean</artifactId>
<name>Apache XBean</name>
-@@ -265,33 +259,15 @@
+@@ -259,39 +253,15 @@
</dependency>
<dependency>
+- <groupId>mx4j</groupId>
+- <artifactId>mx4j</artifactId>
+- <version>3.0.1</version>
+- </dependency>
+-
+- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.5.6</version>
@@ -51,7 +57,7 @@ index cfabbe5..b699aff 100644
</dependency>
</dependencies>
</dependencyManagement>
-@@ -343,22 +319,22 @@
+@@ -343,22 +313,22 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
@@ -81,7 +87,7 @@ index cfabbe5..b699aff 100644
</modules>
<reporting>
-@@ -424,4 +400,4 @@
+@@ -424,4 +394,4 @@
</plugins>
</reporting>
diff --git a/xbean.spec b/xbean.spec
index e9d55f1..cb08333 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -2,7 +2,7 @@ Name: xbean
Version: 3.8
BuildArch: noarch
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Java plugin based web server
Group: Development/Libraries
@@ -21,7 +21,6 @@ Patch0: pom-%{version}.patch
BuildRequires: java-devel
BuildRequires: apache-commons-beanutils
BuildRequires: apache-commons-logging
-BuildRequires: mx4j
BuildRequires: objectweb-asm
BuildRequires: ant
BuildRequires: qdox
@@ -133,6 +132,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name}
%changelog
+* Thu May 3 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.8-5
+- Remove mx4j from deps (javax.management provided by JDK 1.5+)
+
* Tue Apr 24 2012 Alexander Kurtakov <akurtako at redhat.com> 3.8-4
- BR felix-framework instead of felix-osgi-core.
More information about the scm-commits
mailing list