Merge pull request #32 from projecthydra/fedora-4.1

Fedora 4.1 and Solr 4.10.3
samvera-deprecated · Feb 10, 2015 · 882585a · 882585a
2 parents fc0a62c + b9218a5
commit 882585a
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ This is a copy of jetty with the needed applications for running Hydra.  These i
 
 * jetty: 8.1.16
 * solr: 4.10.2
-* fedora: 4.0.0
+* fedora: 4.1.0
 
 ## Usage
 
@@ -61,12 +61,7 @@ example from Lucene does not include the start.ini file.
 
 ## Fedora Migration
 
-Fedora4 is currently available in the `fedora-4/master` branch and can be automatically downloaded and installed via Jettywrapper
-using this url:
-
-    https://github.com/projecthydra/hydra-jetty/archive/fedora-4/master.zip
-
-If you want to give migration a try, the `fedora-4/migration` branch has both Fedora3 and Fedora4 installed, along with Solr, and is available
+For tesing migration from Fedora version 3 to 4, the `fedora-4/migration` branch has both Fedora 3 and Fedora 4 installed, along with Solr, and is available
 via this url:
 
     https://github.com/projecthydra/hydra-jetty/archive/fedora-4/migrate.zip
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.1.1
+8.1.1
diff --git a/...cene-libs/lucene-analyzers-icu-4.10.2.jar → ...cene-libs/lucene-analyzers-icu-4.10.3.jar b/...cene-libs/lucene-analyzers-icu-4.10.2.jar → ...cene-libs/lucene-analyzers-icu-4.10.3.jar
diff --git a/...bs/lucene-analyzers-morfologik-4.10.2.jar → ...bs/lucene-analyzers-morfologik-4.10.3.jar b/...bs/lucene-analyzers-morfologik-4.10.2.jar → ...bs/lucene-analyzers-morfologik-4.10.3.jar
diff --git a/...-libs/lucene-analyzers-smartcn-4.10.2.jar → ...-libs/lucene-analyzers-smartcn-4.10.3.jar b/...-libs/lucene-analyzers-smartcn-4.10.2.jar → ...-libs/lucene-analyzers-smartcn-4.10.3.jar
diff --git a/...-libs/lucene-analyzers-stempel-4.10.2.jar → ...-libs/lucene-analyzers-stempel-4.10.3.jar b/...-libs/lucene-analyzers-stempel-4.10.2.jar → ...-libs/lucene-analyzers-stempel-4.10.3.jar
diff --git a/solr/lib/solr-analysis-extras-4.10.2.jar → solr/lib/solr-analysis-extras-4.10.3.jar b/solr/lib/solr-analysis-extras-4.10.2.jar → solr/lib/solr-analysis-extras-4.10.3.jar
diff --git a/webapps/fedora.war b/webapps/fedora.war
diff --git a/webapps/solr.war b/webapps/solr.war