Update API calls for Solr 7

mlibrary · Mar 5, 2018 · c543f05 · c543f05
1 parent e57c181
commit c543f05
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,10 +6,10 @@
 
     <groupId>groupId</groupId>
     <artifactId>umich_solr_library_filters</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
 
     <properties>
-        <solr.version>5.3.0</solr.version>
+        <solr.version>7.2.1</solr.version>
     </properties>
 
 
@@ -31,7 +31,19 @@
 
         <build>
             <finalName>lucene-umich-solr-filters-${solr.version}.${project.version}</finalName>
-               <sourceDirectory>src/java</sourceDirectory>
+            <sourceDirectory>src/java</sourceDirectory>
+
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.5.1</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
+            </plugins>
         </build>
 
 

diff --git a/src/java/edu/umich/lib/solr_filters/LCCallNoFilter.java b/src/java/edu/umich/lib/solr_filters/LCCallNoFilter.java
@@ -2,12 +2,11 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package edu.umich.lib.solr.analysis;
+package edu.umich.lib.solr_filters;
 
 import edu.umich.lib.normalizers.LCCallNumberNormalizer;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.analysis.TokenFilter;
-import org.apache.lucene.analysis.Token;
 import org.apache.lucene.analysis.TokenStream;
 import java.io.IOException;
 

diff --git a/src/java/edu/umich/lib/solr_filters/LCCallNumberNormalizerFilterFactory.java b/src/java/edu/umich/lib/solr_filters/LCCallNumberNormalizerFilterFactory.java
@@ -3,7 +3,7 @@
  * and open the template in the editor.
  */
 
-package edu.umich.lib.solr.analysis;
+package edu.umich.lib.solr_filters;
 import java.util.Map;
 import org.apache.lucene.analysis.util.TokenFilterFactory;
 import org.apache.lucene.analysis.TokenStream;

diff --git a/src/java/org/solrmarc/callnum/LCCallNumber.java b/src/java/org/solrmarc/callnum/LCCallNumber.java
@@ -246,7 +246,6 @@ protected void init() {
     /**
      * This parse can be used in conjunction with the empty constructor
      */
-    @Override
     public void parse(String call) {
         init();
         this.rawCallNum = call;