From 40a6fcd768b28dbfc8e705ec5337fa484f3e2859 Mon Sep 17 00:00:00 2001 From: gil Date: Jan 23 2016 16:16:04 +0000 Subject: disable maven-enforcer-plugin support --- diff --git a/solr.spec b/solr.spec index 33ee2bc..a8aa4b1 100644 --- a/solr.spec +++ b/solr.spec @@ -98,7 +98,7 @@ BuildRequires: mvn(org.apache.lucene:lucene-sandbox) BuildRequires: mvn(org.apache.lucene:lucene-spatial) BuildRequires: mvn(org.apache.lucene:lucene-suggest) BuildRequires: mvn(org.apache.lucene:lucene-test-framework) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +#BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin) BuildRequires: mvn(org.apache.james:apache-mime4j-core) @@ -282,7 +282,7 @@ rm -r solr/core/src/java/org/apache/solr/util/hll %pom_add_dep net.agkn:hll:1.6.0 solr/core find ./solr -name "*.java" -exec sed -i "s/org.apache.solr.util.hll/net.agkn.hll/g" {} + -sed -i "s|return hasher.hashString(v).asLong();|return hasher.hashString(v, null).asLong();|" \ +sed -i.guava18 "s|return hasher.hashString(v).asLong();|return hasher.hashUnencodedChars(v).asLong();|" \ solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java %if %{?fedora} >= 23 @@ -333,6 +333,7 @@ sed -i 's|@spec.version@|${project.version}|' pom.xml # Remove unavailable plugins %pom_remove_plugin org.codehaus.gmaven:gmaven-plugin %pom_remove_plugin -r de.thetaphi:forbiddenapis +%pom_remove_plugin -r :maven-enforcer-plugin %pom_xpath_inject "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId = 'maven-javadoc-plugin' ]" '