commit 7ac424e7e6e65913fb7b2714fcb1ca6955636627
Author: gil <puntogil(a)libero.it>
Date: Thu Jan 8 14:06:53 2015 +0100
update to 4.10.3
solr.spec | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/solr.spec b/solr.spec
index 3028a5f..3e3e1cd 100644
--- a/solr.spec
+++ b/solr.spec
@@ -56,17 +56,19 @@ BuildRequires: mvn(org.apache.velocity:velocity-tools)
BuildRequires: mvn(org.apache.zookeeper:zookeeper)
BuildRequires: mvn(org.carrot2:morfologik-polish)
BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl)
-%if %{without jetty8}
-BuildRequires: mvn(org.eclipse.jetty:jetty-server)
-BuildRequires: mvn(org.eclipse.jetty:jetty-servlet)
-BuildRequires: mvn(org.eclipse.jetty:jetty-util)
-BuildRequires: mvn(org.eclipse.jetty:jetty-webapp)
-%else
-# 8.1.14.v20131031
-BuildRequires: mvn(org.eclipse.jetty:jetty-server:8.1.14)
-BuildRequires: mvn(org.eclipse.jetty:jetty-servlet:8.1.14)
-BuildRequires: mvn(org.eclipse.jetty:jetty-util:8.1.14)
-BuildRequires: mvn(org.eclipse.jetty:jetty-webapp:8.1.14)
+
+%if %{with jetty8}
+BuildRequires: mvn(org.eclipse.jetty:jetty-continuation:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-deploy:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-http:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-io:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-jmx:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-security:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-server:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-servlet:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-util:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-webapp:8.1.14.v20131031)
+BuildRequires: mvn(org.eclipse.jetty:jetty-xml:8.1.14.v20131031)
Requires: jetty8
%endif
BuildRequires: mvn(org.noggit:noggit)
@@ -353,8 +355,19 @@ done
%pom_disable_module lucene
rm -r lucene
-# Disable Jetty8 support ... for now
+
+%if %{without jetty8}
+# Disable Jetty8 support
+%pom_remove_dep org.eclipse.jetty: solr/core
rm -r solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+%else
+# Add jetty compat version RHBZ#1057670
+%pom_xpath_set "pom:properties/pom:jetty.version" 8.1.14.v20131031
+for m in solr/core solr/test-framework; do
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId =
'org.eclipse.jetty']" \
+ '<version>${jetty.version}</version>' ${m}
+done
+%endif
# fix log4j version
sed -i
"s|<version>1.2.16</version>|<version>1.2.17</version>|"
pom.xml
Show replies by date