Merge pull request #2 from adjam/issue-1

Allow building via Maven
mlibrary · Mar 19, 2018 · 32b32a5 · 32b32a5
2 parents 7c09d87 + c543f05
commit 32b32a5
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,45 @@
 
     <groupId>groupId</groupId>
     <artifactId>umich_solr_library_filters</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
+
+    <properties>
+        <solr.version>7.2.1</solr.version>
+    </properties>
+
+
+    <dependencies>
+            <dependency>
+                <groupId>org.apache.solr</groupId>
+                <artifactId>solr-core</artifactId>
+                <version>${solr.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                    <version>4.12</version>
+                    <scope>test</scope>
+            </dependency>
+        </dependencies>
+
+        <build>
+            <finalName>lucene-umich-solr-filters-${solr.version}.${project.version}</finalName>
+            <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>
 
 
 </project>
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;