diff --git a/activeio-3.1.4-fixbuild.patch b/activeio-3.1.4-fixbuild.patch
deleted file mode 100644
index 20ebefe..0000000
--- a/activeio-3.1.4-fixbuild.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-diff -Nru activeio-3.1.4/activeio-core/pom.xml activeio-3.1.4-gil/activeio-core/pom.xml
---- activeio-3.1.4/activeio-core/pom.xml 2012-04-19 17:40:34.000000000 +0200
-+++ activeio-3.1.4-gil/activeio-core/pom.xml 2012-05-18 13:30:38.165132211 +0200
-@@ -30,7 +30,6 @@
- A high performance IO abstraction framework
-
-
-- org.objectweb.howl.log*;resolution:=optional,
- *
-
-
-@@ -63,18 +62,50 @@
-
-
- **/NIOAsyncChannelTest.*
-+ **/JournalPerfTool.*
-
-
-
-
-+
-+ org.apache.maven.plugins
-+ maven-compiler-plugin
-+
-+
-+ default-compile
-+ compile
-+
-+
-+ **/HowlJournal.*
-+
-+
-+
-+ compile
-+
-+
-+
-+ default-testCompile
-+ test-compile
-+
-+
-+ **/JournalPerfTool.*
-+
-+
-+
-+ testCompile
-+
-+
-+
-+
-+
-
-
-
-
-
-
-- org.apache.geronimo.specs
-- geronimo-j2ee-management_1.1_spec
-+ org.jboss.spec.javax.management.j2ee
-+ jboss-j2eemgmt-api_1.1_spec
-
-
- commons-logging
-@@ -82,12 +113,17 @@
-
-
-
--
-+
-+
-+ junit
-+ junit
-+ 4.8.2
-+ test
-
--
-
-
-
-diff -Nru activeio-3.1.4/pom.xml activeio-3.1.4-gil/pom.xml
---- activeio-3.1.4/pom.xml 2012-04-19 17:40:34.000000000 +0200
-+++ activeio-3.1.4-gil/pom.xml 2012-05-18 13:26:13.055140793 +0200
-@@ -54,15 +54,15 @@
-
-
-
-- org.apache.geronimo.specs
-- geronimo-j2ee-management_1.1_spec
-- 1.0.1
-+ org.jboss.spec.javax.management.j2ee
-+ jboss-j2eemgmt-api_1.1_spec
-+ 1.0.1.Final
-
--
-+
-
- commons-logging
- commons-logging
-@@ -164,15 +164,15 @@
- maven-bundle-plugin
- 1.0.0
-
--
-+
-
-- org.codehaus.mojo
-- rat-maven-plugin
-- 1.0-alpha-3
-+ org.apache.rat
-+ apache-rat-plugin
-+ 0.8-SNAPSHOT
-
- false
-
-@@ -212,7 +212,7 @@
-
-
-
--
-+
-
- org.apache.felix
- maven-bundle-plugin
-@@ -285,11 +285,11 @@
- cobertura-maven-plugin
- 2.5.1
-
--
-+
-
-
-
-@@ -304,7 +304,7 @@
-
-
-
--
-+
-
-
-- org.apache.geronimo.genesis
-- apache-source-release-assembly-descriptor
-+
-
-- 2.0
-+
-
-
-
diff --git a/activeio.spec b/activeio.spec
index 64a690e..06cf737 100644
--- a/activeio.spec
+++ b/activeio.spec
@@ -1,8 +1,7 @@
Name: activeio
Version: 3.1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Apache ActiveMQ ActiveIO :: Core
-Group: Development/Libraries
License: ASL 2.0
Url: http://activemq.apache.org/
# svn export http://svn.apache.org/repos/asf/activemq/activeio/tags/activeio-parent-3.1.4/ activeio-3.1.4
@@ -12,7 +11,6 @@ Source0: activeio-3.1.4-src-svn.tar.gz
Patch0: activeio-3.1.4-howl-logger.patch
BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: apache-commons-logging
%if 0
@@ -23,77 +21,40 @@ BuildRequires: jboss-j2eemgmt-1.1-api
BuildRequires: junit
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
-Requires: apache-commons-logging
-%if 0
-Requires: howl-logger
-%endif
-Requires: jboss-j2eemgmt-1.1-api
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
A high performance IO abstraction framework.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
%prep
%setup -q
-%pom_remove_plugin org.codehaus.mojo:ianal-maven-plugin
-%pom_remove_plugin org.codehaus.mojo:taglist-maven-plugin
-%pom_remove_plugin org.apache.maven.plugins:maven-assembly-plugin
+%pom_remove_plugin :ianal-maven-plugin
+%pom_remove_plugin :rat-maven-plugin
+%pom_remove_plugin :taglist-maven-plugin
+%pom_remove_plugin :maven-assembly-plugin
%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec
%pom_xpath_inject "pom:project/pom:dependencyManagement/pom:dependencies" "
-
- org.jboss.spec.javax.management.j2ee
- jboss-j2eemgmt-api_1.1_spec
- 1.0.1.Final
- "
-
-%pom_remove_plugin org.codehaus.mojo:rat-maven-plugin
-%pom_xpath_inject "pom:project/pom:build/pom:pluginManagement/pom:plugins" "
-
- org.apache.rat
- apache-rat-plugin
- 0.8-SNAPSHOT
-
- false
-
- "
-
-%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec %{name}-core/pom.xml
-%pom_xpath_inject "pom:project/pom:dependencies" "
-
- org.jboss.spec.javax.management.j2ee
- jboss-j2eemgmt-api_1.1_spec
- 1.0.1.Final
- " %{name}-core/pom.xml
+
+ org.jboss.spec.javax.management.j2ee
+ jboss-j2eemgmt-api_1.1_spec
+ 1.0.1.Final
+"
-%pom_xpath_inject "pom:project/pom:dependencies" "
-
- junit
- junit
- 4.10
- test
- " %{name}-core/pom.xml
+%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec %{name}-core
+%pom_add_dep org.jboss.spec.javax.management.j2ee:jboss-j2eemgmt-api_1.1_spec %{name}-core
+
+%pom_add_dep junit:junit::test %{name}-core
# TODO remove when howl-logger is available
%pom_remove_dep howl:howl-logger
@@ -101,86 +62,73 @@ This package contains javadoc for %{name}.
%if 0
sed -i "s|0.1.8|1.0.2|" pom.xml
%pom_xpath_inject "pom:project/pom:dependencyManagement/pom:dependencies" '
-
- org.objectweb.howl
- howl
- ${howl-version}
- '
+
+ org.objectweb.howl
+ howl
+ ${howl-version}
+'
%pom_xpath_inject "pom:project/pom:dependencies" "
-
- org.objectweb.howl
- howl
- true
- " %{name}-core/pom.xml
+
+ org.objectweb.howl
+ howl
+ true
+" %{name}-core/pom.xml
%patch0 -p0
%else
-%pom_xpath_inject "pom:project/pom:build/pom:plugins" "
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- default-compile
- compile
-
-
- **/HowlJournal.*
-
-
-
- compile
-
-
-
- default-testCompile
- test-compile
-
-
- **/JournalPerfTool.*
-
-
-
- testCompile
-
-
-
- " %{name}-core/pom.xml
+%pom_add_plugin org.apache.maven.plugins:maven-compiler-plugin %{name}-core "
+
+
+ default-compile
+ compile
+
+
+ **/HowlJournal.*
+
+
+
+ compile
+
+
+
+ default-testCompile
+ test-compile
+
+
+ **/JournalPerfTool.*
+
+
+
+ testCompile
+
+
+"
%endif
sed -i 's/\r//' NOTICE
%build
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
+%mvn_file :%{name}-core activemq/%{name}-core
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
+%mvn_install
-mkdir -p %{buildroot}%{_javadir}/activemq
-install -m 644 %{name}-core/target/%{name}-core-%{version}.jar \
- %{buildroot}%{_javadir}/activemq/%{name}-core.jar
install -m 644 %{name}-core/target/%{name}-core-%{version}-tests.jar \
%{buildroot}%{_javadir}/activemq/%{name}-core-tests.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.activemq-%{name}-parent.pom
-%add_maven_depmap JPP.activemq-%{name}-parent.pom
-install -pm 644 %{name}-core/pom.xml %{buildroot}%{_mavenpomdir}/JPP.activemq-%{name}-core.pom
-%add_maven_depmap JPP.activemq-%{name}-core.pom activemq/%{name}-core.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/activemq/%{name}-core*.jar
-%{_mavenpomdir}/JPP.activemq-%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
+
+%files -f .mfiles
+%{_javadir}/activemq/%{name}-core-tests.jar
%doc LICENSE NOTICE
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
+* Sat Jul 06 2013 gil cattaneo 3.1.4-6
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Wed Feb 13 2013 Fedora Release Engineering - 3.1.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild