diff --git a/apache-commons-jexl.spec b/apache-commons-jexl.spec
index f7a4496..3e7f70f 100644
--- a/apache-commons-jexl.spec
+++ b/apache-commons-jexl.spec
@@ -3,7 +3,7 @@
Name: apache-%{jarname}
Version: 2.1.1
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Java Expression Language (JEXL)
Group: Development/Libraries
@@ -59,18 +59,26 @@ find -name '*.txt' -exec sed -i 's/\r//' '{}' +
# Drop "-SNAPSHOT" from version
%pom_xpath_set "pom:project/pom:version" %{compatver} jexl2-compat
+%pom_xpath_set "pom:dependency[pom:artifactId='commons-jexl']/pom:version" %{version} jexl2-compat
+
+echo "
+
+ 4.0.0
+ org.fedoraproject
+ commons-jexl-aggegator
+ %{version}
+ pom
+
+ .
+ jexl2-compat
+
+" >>aggregator-pom.xml
+%mvn_package :commons-jexl-aggegator __noinstall
%build
-%mvn_build
-
-pushd jexl2-compat
- %mvn_build
-popd
+%mvn_build -- -f aggregator-pom.xml
%install
-%mvn_artifact jexl2-compat/pom.xml \
- jexl2-compat/target/%{jarname}-compat-%{compatver}.jar
-
%mvn_install
@@ -83,6 +91,9 @@ popd
%changelog
+* Mon Jul 27 2015 Mikolaj Izdebski - 2.1.1-14
+- Build compat package in the same reactor as main module
+
* Wed Jun 17 2015 Fedora Release Engineering - 2.1.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild