From a0f95d926ddf8c063b3329b8209db4ab4439b176 Mon Sep 17 00:00:00 2001 From: gil Date: May 08 2015 05:38:01 +0000 Subject: update to 4.10.4 --- diff --git a/.gitignore b/.gitignore index e504035..c13c043 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /sorl-poms-4.10.2.tar.xz /solr-poms-4.10.3.tar.xz /solr-4.10.3-src.tgz +/solr-4.10.4-clean.tar.xz diff --git a/solr-4.10.3-SOLR-4839.patch b/solr-4.10.3-SOLR-4839.patch deleted file mode 100644 index 6d6ead5..0000000 --- a/solr-4.10.3-SOLR-4839.patch +++ /dev/null @@ -1,185 +0,0 @@ ---- solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java 2014-08-07 07:21:33.000000000 +0200 -+++ solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java.SOLR-4839 2015-01-14 00:06:05.674178208 +0100 -@@ -42,16 +42,18 @@ import javax.servlet.http.HttpServletRes - import org.apache.solr.servlet.SolrDispatchFilter; - import org.eclipse.jetty.server.Connector; - import org.eclipse.jetty.server.Server; --import org.eclipse.jetty.server.bio.SocketConnector; --import org.eclipse.jetty.server.handler.GzipHandler; --import org.eclipse.jetty.server.nio.SelectChannelConnector; -+import org.eclipse.jetty.server.HttpConfiguration; -+import org.eclipse.jetty.server.HttpConnectionFactory; -+import org.eclipse.jetty.server.LowResourceMonitor; -+import org.eclipse.jetty.server.SecureRequestCustomizer; -+import org.eclipse.jetty.server.ServerConnector; -+import org.eclipse.jetty.server.SslConnectionFactory; - import org.eclipse.jetty.server.session.HashSessionIdManager; --import org.eclipse.jetty.server.ssl.SslConnector; --import org.eclipse.jetty.server.ssl.SslSelectChannelConnector; --import org.eclipse.jetty.server.ssl.SslSocketConnector; - import org.eclipse.jetty.servlet.FilterHolder; - import org.eclipse.jetty.servlet.ServletContextHandler; - import org.eclipse.jetty.servlet.ServletHolder; -+import org.eclipse.jetty.servlets.GzipFilter; -+import org.eclipse.jetty.servlets.gzip.GzipHandler; - import org.eclipse.jetty.util.component.LifeCycle; - import org.eclipse.jetty.util.log.Logger; - import org.eclipse.jetty.util.ssl.SslContextFactory; -@@ -203,17 +205,20 @@ public class JettySolrRunner { - - private void init(String solrHome, String context, int port, boolean stopAtShutdown) { - this.context = context; -- server = new Server(port); - - this.solrHome = solrHome; - this.stopAtShutdown = stopAtShutdown; -- server.setStopAtShutdown(stopAtShutdown); -- if (!stopAtShutdown) { -- server.setGracefulShutdown(0); -- } - System.setProperty("solr.solr.home", solrHome); -+ -+ QueuedThreadPool qtp = new QueuedThreadPool(); -+ qtp.setMaxThreads(10000); -+ qtp.setIdleTimeout((int) TimeUnit.SECONDS.toMillis(5)); -+ qtp.setStopTimeout((int) TimeUnit.MINUTES.toMillis(1)); -+ server = new Server(qtp); -+ server.setStopAtShutdown(stopAtShutdown); -+ server.manage(qtp); -+ - if (System.getProperty("jetty.testMode") != null) { -- final String connectorName = System.getProperty("tests.jettyConnector", "SelectChannel"); - - // if this property is true, then jetty will be configured to use SSL - // leveraging the same system properties as java to specify -@@ -228,52 +233,46 @@ public class JettySolrRunner { - final SslContextFactory sslcontext = new SslContextFactory(false); - sslInit(useSsl, sslcontext); - -- final Connector connector; -- if ("SelectChannel".equals(connectorName)) { -- final SelectChannelConnector c = useSsl -- ? new SslSelectChannelConnector(sslcontext) -- : new SelectChannelConnector(); -- c.setReuseAddress(true); -- c.setLowResourcesMaxIdleTime(1500); -- c.setSoLingerTime(0); -- connector = c; -- } else if ("Socket".equals(connectorName)) { -- final SocketConnector c = useSsl -- ? new SslSocketConnector(sslcontext) -- : new SocketConnector(); -- c.setReuseAddress(true); -- c.setSoLingerTime(0); -+ -+ final ServerConnector connector; -+ if (useSsl) { -+ HttpConfiguration configuration = new HttpConfiguration(); -+ configuration.setSecureScheme("https"); -+ configuration.addCustomizer(new SecureRequestCustomizer()); -+ ServerConnector c = new ServerConnector(server, new SslConnectionFactory(sslcontext, "http/1.1"), -+ new HttpConnectionFactory(configuration)); - connector = c; - } else { -- throw new IllegalArgumentException("Illegal value for system property 'tests.jettyConnector': " + connectorName); -+ ServerConnector c = new ServerConnector(server, new HttpConnectionFactory()); -+ connector = c; - } - -+ connector.setReuseAddress(true); -+ connector.setSoLingerTime(0); -+ connector.setPort(port); -+ connector.setHost("127.0.0.1"); -+ - connector.setPort(port); - connector.setHost("127.0.0.1"); - -- // Connectors by default inherit server's thread pool. -- QueuedThreadPool qtp = new QueuedThreadPool(); -- qtp.setMaxThreads(10000); -- qtp.setMaxIdleTimeMs((int) TimeUnit.SECONDS.toMillis(5)); -- qtp.setMaxStopTimeMs((int) TimeUnit.MINUTES.toMillis(1)); -- server.setThreadPool(qtp); -+ // Enable Low Resources Management -+ LowResourceMonitor lowResources = new LowResourceMonitor(server); -+ lowResources.setLowResourcesIdleTimeout(1500); -+ lowResources.setMaxConnections(10000); -+ server.addBean(lowResources); - - server.setConnectors(new Connector[] {connector}); - server.setSessionIdManager(new HashSessionIdManager(new Random())); - } else { -- if (server.getThreadPool() == null) { -- // Connectors by default inherit server's thread pool. -- QueuedThreadPool qtp = new QueuedThreadPool(); -- qtp.setMaxThreads(10000); -- qtp.setMaxIdleTimeMs((int) TimeUnit.SECONDS.toMillis(5)); -- qtp.setMaxStopTimeMs((int) TimeUnit.SECONDS.toMillis(1)); -- server.setThreadPool(qtp); -- } -+ ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory()); -+ connector.setPort(port); -+ -+ server.setConnectors(new Connector[] {connector}); - } - - // Initialize the servlets - final ServletContextHandler root = new ServletContextHandler(server,context,ServletContextHandler.SESSIONS); -- root.setHandler(new GzipHandler()); -+ root.addFilter(GzipFilter.class, "*", EnumSet.of(DispatcherType.REQUEST)); - server.addLifeCycleListener(new LifeCycle.Listener() { - - @Override -@@ -340,7 +339,7 @@ public class JettySolrRunner { - sslcontext.setKeyStorePassword(sslConfig.getKeyStorePassword()); - } - if (null != sslConfig.getTrustStore()) { -- sslcontext.setTrustStore(System -+ sslcontext.setTrustStorePath(System - .getProperty(sslConfig.getTrustStore())); - } - if (null != sslConfig.getTrustStorePassword()) { -@@ -360,7 +359,7 @@ public class JettySolrRunner { - (System.getProperty("javax.net.ssl.keyStorePassword")); - } - if (null != System.getProperty("javax.net.ssl.trustStore")) { -- sslcontext.setTrustStore -+ sslcontext.setTrustStorePath - (System.getProperty("javax.net.ssl.trustStore")); - } - if (null != System.getProperty("javax.net.ssl.trustStorePassword")) { -@@ -465,7 +464,7 @@ public class JettySolrRunner { - if (0 == conns.length) { - throw new RuntimeException("Jetty Server has no Connectors"); - } -- return (proxyPort != -1) ? proxyPort : conns[0].getLocalPort(); -+ return (proxyPort != -1) ? proxyPort : ((ServerConnector) conns[0]).getLocalPort(); - } - - /** -@@ -500,12 +499,12 @@ public class JettySolrRunner { - if (0 == conns.length) { - throw new IllegalStateException("Jetty Server has no Connectors"); - } -- Connector c = conns[0]; -+ ServerConnector c = (ServerConnector) conns[0]; - if (c.getLocalPort() < 0) { - throw new IllegalStateException("Jetty Connector is not open: " + - c.getLocalPort()); - } -- protocol = (c instanceof SslConnector) ? "https" : "http"; -+ protocol = c.getDefaultProtocol().equals("SSL-http/1.1") ? "https" : "http"; - return new URL(protocol, c.getHost(), c.getLocalPort(), context); - - } catch (MalformedURLException e) { -@@ -615,6 +614,10 @@ class NoLog implements Logger { - - } - -+ public void debug(String s, long l) { -+ -+ } -+ - @Override - public String getName() { - return toString(); diff --git a/solr-4.10.4-SOLR-4839.patch b/solr-4.10.4-SOLR-4839.patch new file mode 100644 index 0000000..62c69dd --- /dev/null +++ b/solr-4.10.4-SOLR-4839.patch @@ -0,0 +1,197 @@ +--- solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java 2014-08-07 07:21:33.000000000 +0200 ++++ solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java.SOLR-4839 2015-05-08 07:01:41.290938338 +0200 +@@ -41,17 +41,18 @@ + + import org.apache.solr.servlet.SolrDispatchFilter; + import org.eclipse.jetty.server.Connector; ++import org.eclipse.jetty.server.HttpConfiguration; ++import org.eclipse.jetty.server.HttpConnectionFactory; ++import org.eclipse.jetty.server.LowResourceMonitor; ++import org.eclipse.jetty.server.SecureRequestCustomizer; + import org.eclipse.jetty.server.Server; +-import org.eclipse.jetty.server.bio.SocketConnector; +-import org.eclipse.jetty.server.handler.GzipHandler; +-import org.eclipse.jetty.server.nio.SelectChannelConnector; ++import org.eclipse.jetty.server.ServerConnector; ++import org.eclipse.jetty.server.SslConnectionFactory; + import org.eclipse.jetty.server.session.HashSessionIdManager; +-import org.eclipse.jetty.server.ssl.SslConnector; +-import org.eclipse.jetty.server.ssl.SslSelectChannelConnector; +-import org.eclipse.jetty.server.ssl.SslSocketConnector; + import org.eclipse.jetty.servlet.FilterHolder; + import org.eclipse.jetty.servlet.ServletContextHandler; + import org.eclipse.jetty.servlet.ServletHolder; ++import org.eclipse.jetty.servlets.GzipFilter; + import org.eclipse.jetty.util.component.LifeCycle; + import org.eclipse.jetty.util.log.Logger; + import org.eclipse.jetty.util.ssl.SslContextFactory; +@@ -203,17 +204,19 @@ + + private void init(String solrHome, String context, int port, boolean stopAtShutdown) { + this.context = context; +- server = new Server(port); ++ QueuedThreadPool qtp = new QueuedThreadPool(); ++ qtp.setMaxThreads(10000); ++ qtp.setIdleTimeout((int) TimeUnit.SECONDS.toMillis(5)); ++ qtp.setStopTimeout((int) TimeUnit.MINUTES.toMillis(1)); ++ server = new Server(qtp); ++ server.manage(qtp); + + this.solrHome = solrHome; + this.stopAtShutdown = stopAtShutdown; + server.setStopAtShutdown(stopAtShutdown); +- if (!stopAtShutdown) { +- server.setGracefulShutdown(0); +- } +- System.setProperty("solr.solr.home", solrHome); ++ + if (System.getProperty("jetty.testMode") != null) { +- final String connectorName = System.getProperty("tests.jettyConnector", "SelectChannel"); ++ + + // if this property is true, then jetty will be configured to use SSL + // leveraging the same system properties as java to specify +@@ -228,52 +231,39 @@ + final SslContextFactory sslcontext = new SslContextFactory(false); + sslInit(useSsl, sslcontext); + +- final Connector connector; +- if ("SelectChannel".equals(connectorName)) { +- final SelectChannelConnector c = useSsl +- ? new SslSelectChannelConnector(sslcontext) +- : new SelectChannelConnector(); +- c.setReuseAddress(true); +- c.setLowResourcesMaxIdleTime(1500); +- c.setSoLingerTime(0); +- connector = c; +- } else if ("Socket".equals(connectorName)) { +- final SocketConnector c = useSsl +- ? new SslSocketConnector(sslcontext) +- : new SocketConnector(); +- c.setReuseAddress(true); +- c.setSoLingerTime(0); +- connector = c; ++ ServerConnector connector; ++ if (useSsl) { ++ HttpConfiguration configuration = new HttpConfiguration(); ++ configuration.setSecureScheme("https"); ++ configuration.addCustomizer(new SecureRequestCustomizer()); ++ connector = new ServerConnector(server, new SslConnectionFactory(sslcontext, "http/1.1"), ++ new HttpConnectionFactory(configuration)); + } else { +- throw new IllegalArgumentException("Illegal value for system property 'tests.jettyConnector': " + connectorName); ++ connector = new ServerConnector(server, new HttpConnectionFactory()); + } + ++ connector.setReuseAddress(true); ++ connector.setSoLingerTime(0); + connector.setPort(port); + connector.setHost("127.0.0.1"); + +- // Connectors by default inherit server's thread pool. +- QueuedThreadPool qtp = new QueuedThreadPool(); +- qtp.setMaxThreads(10000); +- qtp.setMaxIdleTimeMs((int) TimeUnit.SECONDS.toMillis(5)); +- qtp.setMaxStopTimeMs((int) TimeUnit.MINUTES.toMillis(1)); +- server.setThreadPool(qtp); ++ // Enable Low Resources Management ++ LowResourceMonitor lowResources = new LowResourceMonitor(server); ++ lowResources.setLowResourcesIdleTimeout(1500); ++ lowResources.setMaxConnections(10000); ++ server.addBean(lowResources); + + server.setConnectors(new Connector[] {connector}); + server.setSessionIdManager(new HashSessionIdManager(new Random())); + } else { +- if (server.getThreadPool() == null) { +- // Connectors by default inherit server's thread pool. +- QueuedThreadPool qtp = new QueuedThreadPool(); +- qtp.setMaxThreads(10000); +- qtp.setMaxIdleTimeMs((int) TimeUnit.SECONDS.toMillis(5)); +- qtp.setMaxStopTimeMs((int) TimeUnit.SECONDS.toMillis(1)); +- server.setThreadPool(qtp); +- } ++ ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory()); ++ connector.setPort(port); ++ server.setConnectors(new Connector[] {connector}); + } + + // Initialize the servlets + final ServletContextHandler root = new ServletContextHandler(server,context,ServletContextHandler.SESSIONS); +- root.setHandler(new GzipHandler()); ++ root.addFilter(GzipFilter.class, "*", EnumSet.of(DispatcherType.REQUEST)); + server.addLifeCycleListener(new LifeCycle.Listener() { + + @Override +@@ -307,14 +297,16 @@ + extraFilters = new LinkedList<>(); + for (Class filterClass : extraRequestFilters.keySet()) { + extraFilters.add(root.addFilter(filterClass, extraRequestFilters.get(filterClass), +- EnumSet.of(DispatcherType.REQUEST))); ++ EnumSet.of(DispatcherType.REQUEST))); + } + } +- dispatchFilter = root.addFilter(SolrDispatchFilter.class, "*", EnumSet.of(DispatcherType.REQUEST) ); + for (ServletHolder servletHolder : extraServlets.keySet()) { + String pathSpec = extraServlets.get(servletHolder); + root.addServlet(servletHolder, pathSpec); + } ++ ++ dispatchFilter = root.addFilter(SolrDispatchFilter.class, "*", EnumSet.of(DispatcherType.REQUEST) ); ++ + if (solrConfigFilename != null) System.clearProperty("solrconfig"); + if (schemaFilename != null) System.clearProperty("schema"); + System.clearProperty("solr.solr.home"); +@@ -340,7 +332,7 @@ + sslcontext.setKeyStorePassword(sslConfig.getKeyStorePassword()); + } + if (null != sslConfig.getTrustStore()) { +- sslcontext.setTrustStore(System ++ sslcontext.setTrustStorePath(System + .getProperty(sslConfig.getTrustStore())); + } + if (null != sslConfig.getTrustStorePassword()) { +@@ -360,7 +352,7 @@ + (System.getProperty("javax.net.ssl.keyStorePassword")); + } + if (null != System.getProperty("javax.net.ssl.trustStore")) { +- sslcontext.setTrustStore ++ sslcontext.setTrustStorePath + (System.getProperty("javax.net.ssl.trustStore")); + } + if (null != System.getProperty("javax.net.ssl.trustStorePassword")) { +@@ -465,7 +457,7 @@ + if (0 == conns.length) { + throw new RuntimeException("Jetty Server has no Connectors"); + } +- return (proxyPort != -1) ? proxyPort : conns[0].getLocalPort(); ++ return (proxyPort != -1) ? proxyPort : ((ServerConnector) conns[0]).getLocalPort(); + } + + /** +@@ -500,12 +492,12 @@ + if (0 == conns.length) { + throw new IllegalStateException("Jetty Server has no Connectors"); + } +- Connector c = conns[0]; ++ ServerConnector c = (ServerConnector) conns[0]; + if (c.getLocalPort() < 0) { + throw new IllegalStateException("Jetty Connector is not open: " + + c.getLocalPort()); + } +- protocol = (c instanceof SslConnector) ? "https" : "http"; ++ protocol = c.getDefaultProtocol().equals("SSL-http/1.1") ? "https" : "http"; + return new URL(protocol, c.getHost(), c.getLocalPort(), context); + + } catch (MalformedURLException e) { +@@ -615,6 +607,10 @@ + + } + ++ public void debug(String s, long l) { ++ ++ } ++ + @Override + public String getName() { + return toString(); diff --git a/solr-get-poms.sh b/solr-get-poms.sh deleted file mode 100644 index 64ec951..0000000 --- a/solr-get-poms.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -if [ $# -ne 1 ]; then - echo "Usage: ./create-sources VERSION" - exit 1 -fi - -VERSION=${1} -rm -rf poms -mkdir poms -cd poms - -wget -O pom.xml http://repo1.maven.org/maven2/org/apache/lucene/lucene-solr-grandparent/${VERSION}/lucene-solr-grandparent-${VERSION}.pom - -mkdir lucene solr - -for p in benchmark classification codecs core demo expressions \ - facet grouping highlighter join memory misc queries queryparser \ - replicator sandbox spatial suggest test-framework; do - mkdir -p lucene/${p} - pushd lucene/${p} - wget -O pom.xml http://repo1.maven.org/maven2/org/apache/lucene/lucene-${p}/${VERSION}/lucene-${p}-${VERSION}.pom - popd -done - -mkdir -p lucene/analysis -for p in common icu kuromoji morfologik phonetic \ - smartcn stempel uima; do - mkdir -p lucene/analysis/${p} - pushd lucene/analysis/${p} - wget -O pom.xml http://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-${p}/${VERSION}/lucene-analyzers-${p}-${VERSION}.pom - popd -done - -for p in core solrj test-framework; do - mkdir -p solr/${p} - pushd solr/${p} - wget -O pom.xml http://central.maven.org/maven2/org/apache/solr/solr-${p}/${VERSION}/solr-${p}-${VERSION}.pom - popd -done - -for p in analysis-extras clustering dataimporthandler dataimporthandler-extras \ - langid map-reduce morphlines-cell morphlines-core uima velocity; do - mkdir -p solr/contrib/${p} - pushd solr/contrib/${p} - wget -O pom.xml http://central.maven.org/maven2/org/apache/solr/solr-${p}/${VERSION}/solr-${p}-${VERSION}.pom - popd -done - -mkdir -p solr/contrib/extraction -pushd solr/contrib/extraction - wget -O pom.xml http://central.maven.org/maven2/org/apache/solr/solr-cell/${VERSION}/solr-cell-${VERSION}.pom -popd - - -tar cJf ../solr-poms-${VERSION}.tar.xz * diff --git a/solr-repack.sh b/solr-repack.sh new file mode 100644 index 0000000..b50c285 --- /dev/null +++ b/solr-repack.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +if [ $# -ne 1 ] ; then + echo "Usage: ./create-sources VERSION" + exit 1 +fi +VERSION=$1 +rm -Rf solr-$VERSION-clean.tar.xz +#wget http://www.apache.org/dist/lucene/solr/$VERSION/solr-$VERSION-src.tgz +tar -xf solr-$VERSION-src.tgz + +find solr-$VERSION -name "*.class" -print -delete +find solr-$VERSION -name "*.jar" -print -delete +rm -Rf solr-$VERSION/lucene + +pushd solr-$VERSION + + wget -O pom.xml http://repo1.maven.org/maven2/org/apache/lucene/lucene-solr-grandparent/${VERSION}/lucene-solr-grandparent-${VERSION}.pom + + for p in core solrj test-framework; do + mkdir -p solr/${p} + pushd solr/${p} + wget -O pom.xml http://central.maven.org/maven2/org/apache/solr/solr-${p}/${VERSION}/solr-${p}-${VERSION}.pom + popd + done +# analytics + for p in analysis-extras clustering dataimporthandler dataimporthandler-extras \ + langid map-reduce morphlines-cell morphlines-core uima velocity; do + mkdir -p solr/contrib/${p} + pushd solr/contrib/${p} + wget -O pom.xml http://central.maven.org/maven2/org/apache/solr/solr-${p}/${VERSION}/solr-${p}-${VERSION}.pom + popd + done + + mkdir -p solr/contrib/extraction + pushd solr/contrib/extraction + wget -O pom.xml http://central.maven.org/maven2/org/apache/solr/solr-cell/${VERSION}/solr-cell-${VERSION}.pom + popd + +popd + +tar -cJf solr-$VERSION-clean.tar.xz solr-$VERSION +#rm -rf solr-$VERSION diff --git a/solr.spec b/solr.spec index bc5fa5b..2ce21a6 100644 --- a/solr.spec +++ b/solr.spec @@ -10,19 +10,17 @@ %endif Name: solr -Version: 4.10.3 -Release: 3%{?dist} +Version: 4.10.4 +Release: 1%{?dist} Summary: Ultra-fast Lucene-based Search Server # MIT/X11 (BSD like) solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/AlphaNumericComparator.java License: ASL 2.0 and BSD URL: http://lucene.apache.org/solr/ -Source0: http://www.apache.org/dist/lucene/solr/%{version}/%{name}-%{version}-src.tgz -# taken from http://central.maven.org/maven2/org/apache/solr and http://repo1.maven.org/maven2/org/apache/lucene/ -# Use solr-get-poms.sh -Source1: solr-poms-%{version}.tar.xz -Source2: solr-get-poms.sh +# Use solr-repack.sh +Source0: %{name}-%{version}-clean.tar.xz +Source2: solr-repack.sh # https://issues.apache.org/jira/browse/SOLR-4839 -Patch0: solr-4.10.3-SOLR-4839.patch +Patch0: solr-4.10.4-SOLR-4839.patch BuildRequires: mvn(com.cybozu.labs:langdetect) BuildRequires: mvn(com.google.guava:guava) @@ -200,34 +198,19 @@ find . -name "*.class" -print -delete find . -name "*.jar" -print -delete find . -name "*.js" -print -delete -tar -xf %{SOURCE1} - -cp -p dev-tools/maven/lucene/pom.xml.template lucene/pom.xml -cp -p dev-tools/maven/lucene/analysis/pom.xml.template lucene/analysis/pom.xml cp -p dev-tools/maven/solr/pom.xml.template solr/pom.xml cp -p dev-tools/maven/solr/contrib/pom.xml.template solr/contrib/pom.xml cp -p dev-tools/maven/solr/webapp/pom.xml.template solr/webapp/pom.xml -sed -i "s/@version@/%{version}/g" lucene/pom.xml lucene/analysis/pom.xml solr/pom.xml solr/contrib/pom.xml solr/webapp/pom.xml +sed -i "s/@version@/%{version}/g" solr/pom.xml solr/contrib/pom.xml solr/webapp/pom.xml # Fix parent pom -sed -i "s|../../../pom.xml|../pom.xml|" $(find lucene -name "pom.xml") sed -i "s|../../../pom.xml|../pom.xml|" $(find solr -name "pom.xml") # Fix non standard source/resources directories structure sed -i 's|${module-path}|${basedir}/src/java|' \ - lucene/core/pom.xml lucene/codecs/pom.xml \ solr/core/pom.xml solr/solrj/pom.xml -for p in lucene/test-framework/pom.xml lucene/analysis/common/pom.xml \ - lucene/analysis/icu/pom.xml lucene/analysis/kuromoji/pom.xml \ - lucene/analysis/morfologik/pom.xml lucene/analysis/phonetic/pom.xml \ - lucene/analysis/smartcn/pom.xml lucene/analysis/stempel/pom.xml \ - lucene/analysis/uima/pom.xml lucene/memory/pom.xml lucene/queries/pom.xml \ - lucene/highlighter/pom.xml lucene/sandbox/pom.xml lucene/queryparser/pom.xml \ - lucene/facet/pom.xml lucene/demo/pom.xml lucene/classification/pom.xml \ - lucene/benchmark/pom.xml lucene/grouping/pom.xml lucene/join/pom.xml \ - lucene/misc/pom.xml lucene/replicator/pom.xml lucene/spatial/pom.xml \ - lucene/suggest/pom.xml lucene/expressions/pom.xml solr/test-framework/pom.xml solr/contrib/analysis-extras/pom.xml \ +for p in solr/test-framework/pom.xml solr/contrib/analysis-extras/pom.xml \ solr/contrib/clustering/pom.xml solr/contrib/dataimporthandler/pom.xml solr/contrib/dataimporthandler-extras/pom.xml \ solr/contrib/extraction/pom.xml solr/contrib/langid/pom.xml solr/contrib/uima/pom.xml solr/contrib/velocity/pom.xml \ solr/contrib/morphlines-core/pom.xml solr/contrib/morphlines-cell/pom.xml solr/contrib/map-reduce/pom.xml; do @@ -236,25 +219,16 @@ for p in lucene/test-framework/pom.xml lucene/analysis/common/pom.xml \ done sed -i 's|${module-path}/src/resources|${basedir}/src/resources|' \ - lucene/test-framework/pom.xml lucene/analysis/common/pom.xml lucene/analysis/icu/pom.xml lucene/facet/pom.xml \ - lucene/analysis/kuromoji/pom.xml lucene/analysis/morfologik/pom.xml lucene/analysis/phonetic/pom.xml \ - lucene/analysis/smartcn/pom.xml lucene/analysis/stempel/pom.xml lucene/analysis/uima/pom.xml lucene/demo/pom.xml \ - lucene/classification/pom.xml lucene/queryparser/pom.xml lucene/expressions/pom.xml solr/contrib/langid/pom.xml solr/contrib/uima/pom.xml \ + solr/contrib/uima/pom.xml \ solr/contrib/clustering/pom.xml \ solr/contrib/morphlines-core/pom.xml solr/contrib/morphlines-cell/pom.xml solr/contrib/map-reduce/pom.xml -sed -i 's|${module-path}/../resources|${basedir}/src/resources|' \ - lucene/codecs/pom.xml lucene/core/pom.xml - sed -i 's|${module-path}/src/test-files|${basedir}/src/test-files|' \ - lucene/analysis/uima/pom.xml lucene/spatial/pom.xml solr/contrib/langid/pom.xml solr/contrib/uima/pom.xml \ + solr/contrib/langid/pom.xml solr/contrib/uima/pom.xml \ solr/contrib/clustering/pom.xml solr/contrib/extraction/pom.xml solr/contrib/velocity/pom.xml \ solr/contrib/analysis-extras/pom.xml solr/contrib/dataimporthandler/pom.xml solr/contrib/dataimporthandler-extras/pom.xml \ solr/contrib/morphlines-core/pom.xml solr/contrib/morphlines-cell/pom.xml solr/contrib/map-reduce/pom.xml -sed -i 's|${module-path}|${basedir}|' \ - lucene/benchmark/pom.xml - sed -i 's|${module-path}|${basedir}/src/java|' solr/test-framework/pom.xml sed -i 's|${module-path}|${basedir}/src/test|' \ @@ -263,9 +237,7 @@ sed -i 's|${module-path}|1.2.16|1.2.17|" pom.xml @@ -421,6 +391,9 @@ done %license LICENSE.txt NOTICE.txt %changelog +* Fri May 08 2015 gil cattaneo 4.10.4-1 +- update to 4.10.4 + * Wed Apr 22 2015 Peter Robinson 4.10.3-3 - ARMv7 now has hadoop diff --git a/sources b/sources index ec0201b..bae9599 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -958f078ad0fe0f07b1c3a590f93b4f32 solr-4.10.3-src.tgz -192ccf8d46c47f84c2e3f2fe79df2304 solr-poms-4.10.3.tar.xz +4376764b3f78579766ee7518b7f21e18 solr-4.10.4-clean.tar.xz