diff --git a/.gitignore b/.gitignore
index 89b369c..7b83995 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
xbean-3.7.tar.xz
/xbean-3.8.tar.xz
+/xbean-3.11.1.tar.xz
diff --git a/sources b/sources
index 1341908..70c1d41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad5e6370facd5c186db4db570d0be1df xbean-3.8.tar.xz
+4c41a76a0aee8865cb3435e877eac321 xbean-3.11.1.tar.xz
diff --git a/xbean.spec b/xbean.spec
index 557f1b3..41c43a3 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -1,8 +1,8 @@
Name: xbean
-Version: 3.8
+Version: 3.11.1
BuildArch: noarch
-Release: 5%{?dist}
+Release: 1%{?dist}
Summary: Java plugin based web server
Group: Development/Libraries
@@ -23,7 +23,6 @@ BuildRequires: objectweb-asm
BuildRequires: ant
BuildRequires: qdox
BuildRequires: slf4j
-BuildRequires: felix-framework
BuildRequires: maven
BuildRequires: maven-plugin-bundle
BuildRequires: maven-antrun-plugin
@@ -34,7 +33,6 @@ BuildRequires: maven-install-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven-site-plugin
BuildRequires: maven-shade-plugin
%if !0%{?rhel:1}
@@ -42,9 +40,11 @@ BuildRequires: eclipse-rcp
%endif
Requires: java
-Requires: objectweb-asm
+Requires: jpackage-utils
Requires: apache-commons-logging
-
+Requires: objectweb-asm
+Requires: slf4j
+Requires: eclipse-rcp
%description
The goal of XBean project is to create a plugin based server
@@ -91,6 +91,17 @@ rm src/site/site.xml
"
+# Force use of Equinox
+%pom_remove_dep :org.osgi.core xbean-bundleutils
+%pom_remove_dep org.eclipse:osgi xbean-bundleutils
+%pom_xpath_inject "pom:project/pom:dependencies" "
+
+ org.eclipse.osgi
+ org.eclipse.osgi
+ any
+ " xbean-bundleutils
+
+
# Fix dependency on xbean-asm-shaded to original objectweb-asm
sed -i 's/org.apache.xbean.asm/org.objectweb.asm/' \
xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
@@ -147,6 +158,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name}
%changelog
+* Fri Jul 13 2012 Mikolaj Izdebski - 3.11.1-1
+- Update to the upstream version 3.11.1
+- Force use of Equinox instead of Felix
+- Convert patch to POM macros
+
* Thu May 3 2012 Stanislav Ochotnicky - 3.8-5
- Remove mx4j from deps (javax.management provided by JDK 1.5+)