diff --git a/.gitignore b/.gitignore
index 7594e46..89b369c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xbean-3.7.tar.xz
+/xbean-3.8.tar.xz
diff --git a/pom-3.7.patch b/pom-3.7.patch
deleted file mode 100644
index 18c823a..0000000
--- a/pom-3.7.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur xbean-3.7/pom.xml xbean-3.7-work/pom.xml
---- xbean-3.7/pom.xml 2010-05-14 10:21:23.000000000 -0400
-+++ xbean-3.7-work/pom.xml 2011-05-28 07:55:22.461631687 -0400
-@@ -24,12 +24,6 @@
-
- 4.0.0
-
--
-- org.apache.geronimo.genesis
-- genesis-java5-flava
-- 2.0
--
--
- org.apache.xbean
- xbean
- Apache XBean
-@@ -265,33 +259,15 @@
-
-
-
-- org.springframework
-- spring-beans
-- 2.5.6
--
--
--
-- org.springframework
-- spring-context
-- 2.5.6
--
--
--
-- org.springframework
-- spring-web
-- 2.5.6
--
--
--
- com.thoughtworks.qdox
- qdox
- 1.6.3
-
--
-+
-
- org.slf4j
- slf4j-api
-- 1.5.11
-+ 1.5.11
-
-
-
-@@ -327,13 +303,13 @@
- maven-bundle-plugin
- 2.0.0
- true
--
--
-- ${project.url}
-- org.apache.xbean.*;version=${pom.version}
--
--
--
-+
-+-
-+- ${project.url}
-+- org.apache.xbean.*;version=${pom.version}
-+-
-+-
-+-
-
-
-
-@@ -343,22 +319,22 @@
- org.apache.felix
- maven-bundle-plugin
-
-+
-+ maven-compiler-plugin
-+
-+ 1.5
-+ 1.5
-+
-+
-
-
-
-
-- xbean-classloader
- xbean-classpath
- xbean-bundleutils
- xbean-finder
- xbean-naming
- xbean-reflect
-- xbean-blueprint
-- xbean-spring
-- xbean-telnet
-- maven-xbean-plugin
-- xbean-asm-shaded
-- xbean-finder-shaded
-
-
-
-@@ -422,4 +398,4 @@
-
-
-
--
-\ No newline at end of file
-+
-diff -Naur xbean-3.7/xbean-reflect/pom.xml xbean-3.7-work/xbean-reflect/pom.xml
---- xbean-3.7/xbean-reflect/pom.xml 2010-05-14 10:21:23.000000000 -0400
-+++ xbean-3.7-work/xbean-reflect/pom.xml 2011-05-28 07:53:16.040651498 -0400
-@@ -47,13 +47,6 @@
- true
-
-
-- org.apache.xbean
-- xbean-asm-shaded
-- 3.7
-- provided
-- true
--
--
- log4j
- log4j
- 1.2.12
diff --git a/pom-3.8.patch b/pom-3.8.patch
new file mode 100644
index 0000000..d8e36a3
--- /dev/null
+++ b/pom-3.8.patch
@@ -0,0 +1,108 @@
+diff --git a/pom.xml b/pom.xml
+index cfabbe5..b699aff 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -24,12 +24,6 @@
+
+ 4.0.0
+
+-
+- org.apache.geronimo.genesis
+- genesis-java5-flava
+- 2.0
+-
+-
+ org.apache.xbean
+ xbean
+ Apache XBean
+@@ -265,33 +259,15 @@
+
+
+
+- org.springframework
+- spring-beans
+- 2.5.6
+-
+-
+-
+- org.springframework
+- spring-context
+- 2.5.6
+-
+-
+-
+- org.springframework
+- spring-web
+- 2.5.6
+-
+-
+-
+ com.thoughtworks.qdox
+ qdox
+ 1.6.3
+
+-
++
+
+ org.slf4j
+ slf4j-api
+- 1.5.11
++ 1.5.11
+
+
+
+@@ -343,22 +319,22 @@
+ org.apache.felix
+ maven-bundle-plugin
+
++
++ maven-compiler-plugin
++
++ 1.5
++ 1.5
++
++
+
+
+
+
+- xbean-classloader
+ xbean-classpath
+ xbean-bundleutils
+ xbean-finder
+ xbean-naming
+ xbean-reflect
+- xbean-blueprint
+- xbean-spring
+- xbean-telnet
+- maven-xbean-plugin
+- xbean-asm-shaded
+- xbean-finder-shaded
+
+
+
+@@ -424,4 +400,4 @@
+
+
+
+-
+\ No newline at end of file
++
+diff --git a/xbean-reflect/pom.xml b/xbean-reflect/pom.xml
+index b2a76b2..3985b46 100644
+--- a/xbean-reflect/pom.xml
++++ b/xbean-reflect/pom.xml
+@@ -47,13 +47,6 @@
+ true
+
+
+- org.apache.xbean
+- xbean-asm-shaded
+- 3.8
+- provided
+- true
+-
+-
+ log4j
+ log4j
+ 1.2.12
diff --git a/sources b/sources
index 9f53590..1341908 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-987f14094e03d803e948d6c09ad8a2d4 xbean-3.7.tar.xz
+ad5e6370facd5c186db4db570d0be1df xbean-3.8.tar.xz
diff --git a/xbean.spec b/xbean.spec
index 3e04011..9732c9c 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -1,8 +1,8 @@
Name: xbean
-Version: 3.7
+Version: 3.8
BuildArch: noarch
-Release: 7%{?dist}
+Release: 1%{?dist}
Summary: Java plugin based web server
Group: Development/Libraries
@@ -11,8 +11,8 @@ URL: http://geronimo.apache.org/xbean/
# unfortunately no source/binary releases are being made lately, just
# tags in repos and binary releases in maven repositories
-# svn export http://svn.apache.org/repos/asf/geronimo/xbean/tags/xbean-3.7
-# tar caf xbean-3.7.tar.xz xbean-3.7
+# svn export http://svn.apache.org/repos/asf/geronimo/xbean/tags/xbean-3.8
+# tar caf xbean-3.8.tar.xz xbean-3.8
Source0: xbean-%{version}.tar.xz
Source1: xbean.depmap
@@ -27,16 +27,20 @@ BuildRequires: ant
BuildRequires: qdox
BuildRequires: slf4j
BuildRequires: felix-osgi-core >= 1.4.0
+BuildRequires: maven
BuildRequires: maven-plugin-bundle
BuildRequires: maven-antrun-plugin
BuildRequires: maven-compiler-plugin
+BuildRequires: maven-dependency-plugin
BuildRequires: maven-idea-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven-site-plugin
BuildRequires: maven-shade-plugin
+BuildRequires: eclipse-rcp
Requires: java
Requires: objectweb-asm
@@ -75,10 +79,9 @@ sed -i 's/org.apache.xbean.asm/org.objectweb.asm/' \
xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
+mvn-rpmbuild -e \
+ -Dmaven.local.depmap.file="%{SOURCE1}" \
+ -Dmaven.test.skip=true \
install javadoc:aggregate
@@ -93,7 +96,7 @@ for sub in bundleutils finder reflect naming classpath; do
install -Dpm 644 %{name}-${sub}/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-${sub}.pom
# maven depmap
- %add_to_maven_depmap org.apache.xbean %{name}-${sub} %{version} JPP/%{name} %{name}-${sub}
+ %add_maven_depmap JPP.%{name}-%{name}-${sub}.pom %{name}/%{name}-${sub}.jar
done
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -101,32 +104,29 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# parent pom
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-main.pom
-%add_to_maven_depmap org.apache.xbean %{name} %{version} JPP/%{name} main
+%add_maven_depmap JPP.%{name}-main.pom
%pre javadoc
# workaround for rpm bug, can be removed in F-17
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%doc LICENSE NOTICE
%{_mavenpomdir}/*.pom
%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE
%{_javadocdir}/%{name}
%changelog
+* Tue Dec 6 2011 Stanislav Ochotnicky - 3.8-1
+- Update to latest upstream version
+- Build with maven 3
+- Packaging & guidelines fixes
+
* Sat May 28 2011 Marek Goldmann - 3.7-7
- Added xbean-finder and xbean-bundleutils submodules