litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'sprint-search' into dev-search

Browse source 
# Conflicts:
#	home/src/main/resources/solr/README.txt
#	home/src/main/resources/solr/conf/admin-extra.html
#	home/src/main/resources/solr/conf/clustering/carrot2/kmeans-attributes.xml
#	home/src/main/resources/solr/conf/clustering/carrot2/lingo-attributes.xml
#	home/src/main/resources/solr/conf/clustering/carrot2/stc-attributes.xml
#	home/src/main/resources/solr/conf/currency.xml
#	home/src/main/resources/solr/conf/elevate.xml
#	home/src/main/resources/solr/conf/lang/contractions_it.txt
#	home/src/main/resources/solr/conf/lang/stoptags_ja.txt
#	home/src/main/resources/solr/conf/lang/stopwords_ar.txt
#	home/src/main/resources/solr/conf/lang/stopwords_ca.txt
#	home/src/main/resources/solr/conf/lang/stopwords_el.txt
#	home/src/main/resources/solr/conf/lang/stopwords_fi.txt
#	home/src/main/resources/solr/conf/lang/stopwords_hi.txt
#	home/src/main/resources/solr/conf/lang/stopwords_hu.txt
#	home/src/main/resources/solr/conf/lang/stopwords_lv.txt
#	home/src/main/resources/solr/conf/lang/stopwords_ro.txt
#	home/src/main/resources/solr/conf/mapping-FoldToASCII.txt
#	home/src/main/resources/solr/conf/schema-old.xml
#	home/src/main/resources/solr/conf/schema.xml
#	home/src/main/resources/solr/conf/solrconfig-old.xml
#	home/src/main/resources/solr/conf/solrconfig.xml
#	home/src/main/resources/solr/conf/stopwords-name.txt
#	home/src/main/resources/solr/conf/velocity/VM_global_library.vm
#	home/src/main/resources/solr/conf/velocity/jquery.autocomplete.css
#	home/src/main/resources/solr/conf/velocity/jquery.autocomplete.js
#	home/src/main/resources/solr/conf/velocity/main.css
#	home/src/main/resources/solr/conf/velocity/query_group.vm
#	home/src/main/resources/solr/conf/velocity/query_spatial.vm
#	home/src/main/resources/solr/conf/velocity/richtext_doc.vm
#	home/src/main/resources/solr/conf/xslt/example.xsl
#	home/src/main/resources/solr/conf/xslt/example_atom.xsl
#	home/src/main/resources/solr/conf/xslt/example_rss.xsl
#	home/src/main/resources/solr/conf/xslt/luke.xsl
#	home/src/main/resources/solr/conf/xslt/updateXml.xsl
#	home/src/main/resources/solr/solr.xml
#	home/src/main/resources/solr/solr_newversion.xml
This commit is contained in:
Ralph O'Flinn 2019-06-21 12:04:45 -05:00
commit d8649a60ad
128 changed files with 1516 additions and 63936 deletions
Download patch file Download diff file Expand all files Collapse all files

7
installer/pom.xml
View file

@ -105,18 +105,11 @@
<modules>
<module>home</module>
<module>solr</module>
<module>webapp</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vitro-solr</artifactId>
<version>${vitro-version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vitro-home</artifactId>