diff --git a/main/lib-local-src/arithcode-1.1-sources.jar b/main/lib-local-src/arithcode-1.1-sources.jar deleted file mode 100644 index c4569b6e9..000000000 Binary files a/main/lib-local-src/arithcode-1.1-sources.jar and /dev/null differ diff --git a/main/lib-local-src/butterfly-1.0.2-sources.jar b/main/lib-local-src/butterfly-1.0.2-sources.jar deleted file mode 100644 index f7c3cfada..000000000 Binary files a/main/lib-local-src/butterfly-1.0.2-sources.jar and /dev/null differ diff --git a/main/lib-local-src/opencsv-2.4-SNAPSHOT-sources.jar b/main/lib-local-src/opencsv-2.4-SNAPSHOT-sources.jar deleted file mode 100644 index 06f70c846..000000000 Binary files a/main/lib-local-src/opencsv-2.4-SNAPSHOT-sources.jar and /dev/null differ diff --git a/main/lib-local-src/patches/json-20100208.patch b/main/lib-local-src/patches/json-20100208.patch deleted file mode 100644 index c13191c20..000000000 --- a/main/lib-local-src/patches/json-20100208.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -rupN org/json/JSONWriter.java json/src/org/json/JSONWriter.java ---- org/json/JSONWriter.java 2010-01-30 15:13:38.000000000 -0800 -+++ json/src/org/json/JSONWriter.java 2010-09-16 16:59:11.000000000 -0700 -@@ -57,7 +57,7 @@ SOFTWARE. - * @version 2008-09-22 - */ - public class JSONWriter { -- private static final int maxdepth = 20; -+ private static final int maxdepth = 100; - - /** - * The comma flag determines if a comma should be output before the next -@@ -91,12 +91,19 @@ public class JSONWriter { - protected Writer writer; - - /** -- * Make a fresh JSONWriter. It can be used to build one JSON text. -+ * Make a fresh JSONWriter at the default maximum depth. It can be used to build one JSON text. - */ - public JSONWriter(Writer w) { -+ this(w, maxdepth); -+ } -+ -+ /** -+ * Make a fresh JSONWriter at the given maximum depth. It can be used to build one JSON text. -+ */ -+ public JSONWriter(Writer w, int depth) { - this.comma = false; - this.mode = 'i'; -- this.stack = new JSONObject[maxdepth]; -+ this.stack = new JSONObject[depth]; - this.top = 0; - this.writer = w; - } -@@ -268,7 +275,7 @@ public class JSONWriter { - * @throws JSONException If nesting is too deep. - */ - private void push(JSONObject jo) throws JSONException { -- if (this.top >= maxdepth) { -+ if (this.top >= this.stack.length) { - throw new JSONException("Nesting too deep."); - } - this.stack[this.top] = jo; diff --git a/main/lib-local-src/secondstring-20100303-sources.jar b/main/lib-local-src/secondstring-20100303-sources.jar deleted file mode 100644 index 0fa453d45..000000000 Binary files a/main/lib-local-src/secondstring-20100303-sources.jar and /dev/null differ diff --git a/main/lib-local-src/vicino-1.1-sources.jar b/main/lib-local-src/vicino-1.1-sources.jar deleted file mode 100644 index 9960752e0..000000000 Binary files a/main/lib-local-src/vicino-1.1-sources.jar and /dev/null differ diff --git a/main/lib-local/arithcode-1.1.jar b/main/lib-local/arithcode-1.1.jar deleted file mode 100644 index 8ab9142db..000000000 Binary files a/main/lib-local/arithcode-1.1.jar and /dev/null differ diff --git a/main/lib-local/butterfly-1.0.2.jar b/main/lib-local/butterfly-1.0.2.jar deleted file mode 100644 index 0eb5479ec..000000000 Binary files a/main/lib-local/butterfly-1.0.2.jar and /dev/null differ diff --git a/main/lib-local/marc4j-2.4.jar b/main/lib-local/marc4j-2.4.jar deleted file mode 100644 index 28010ac1d..000000000 Binary files a/main/lib-local/marc4j-2.4.jar and /dev/null differ diff --git a/main/lib-local/opencsv-2.4-SNAPSHOT.jar b/main/lib-local/opencsv-2.4-SNAPSHOT.jar deleted file mode 100644 index 42d3c19b7..000000000 Binary files a/main/lib-local/opencsv-2.4-SNAPSHOT.jar and /dev/null differ diff --git a/main/lib-local/secondstring-20100303.jar b/main/lib-local/secondstring-20100303.jar deleted file mode 100644 index 427fcbbcc..000000000 Binary files a/main/lib-local/secondstring-20100303.jar and /dev/null differ diff --git a/main/lib-local/vicino-1.1.jar b/main/lib-local/vicino-1.1.jar deleted file mode 100644 index 7752a5df7..000000000 Binary files a/main/lib-local/vicino-1.1.jar and /dev/null differ diff --git a/main/pom.xml b/main/pom.xml index cc3a0c8d8..0e49e3de4 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -115,109 +115,6 @@ - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - install-marc4j - process-resources - - ${basedir}/lib-local/marc4j-2.4.jar - default - marc4j - marc4j - 2.4 - jar - true - - - install-file - - - - install-opencsv - process-resources - - ${basedir}/lib-local/opencsv-2.4-SNAPSHOT.jar - default - net.sf.opencsv - opencsv - 2.4-SNAPSHOT - jar - true - - - install-file - - - - install-butterfly - process-resources - - ${basedir}/lib-local/butterfly-1.0.2.jar - default - edu.mit.simile - butterfly - 1.0.2 - jar - true - - - install-file - - - - install-vicino - process-resources - - ${basedir}/lib-local/vicino-1.1.jar - default - edu.mit.simile - vicino - 1.1 - jar - true - - - install-file - - - - install-secondstring - process-resources - - ${basedir}/lib-local/secondstring-20100303.jar - default - com.wcohen - secondstring - 20100303 - jar - true - - - install-file - - - - install-arithcode - process-resources - - ${basedir}/lib-local/arithcode-1.1.jar - default - com.colloquial - arithcode - 1.1 - jar - true - - - install-file - - - - org.apache.maven.plugins maven-clean-plugin @@ -269,7 +166,7 @@ provided - edu.mit.simile + org.openrefine.dependencies butterfly 1.0.2 @@ -329,7 +226,7 @@ 1.5 - marc4j + org.openrefine.dependencies marc4j 2.4 @@ -344,9 +241,9 @@ 1.11.3 - net.sf.opencsv - opencsv - 2.4-SNAPSHOT + org.openrefine.dependencies + opencsv-multichar + 2.4 org.apache.poi @@ -364,7 +261,7 @@ 0.9.0-RC1 - edu.mit.simile + org.openrefine.dependencies vicino 1.1 @@ -429,12 +326,12 @@ 1.0 - com.wcohen + org.openrefine.dependencies secondstring 20100303 - com.colloquial + org.openrefine.dependencies arithcode 1.1 diff --git a/server/lib-local-src/jdatapath-alpha2-sources.jar b/server/lib-local-src/jdatapath-alpha2-sources.jar deleted file mode 100644 index d4264d843..000000000 Binary files a/server/lib-local-src/jdatapath-alpha2-sources.jar and /dev/null differ diff --git a/server/lib-local/jdatapath-alpha2.jar b/server/lib-local/jdatapath-alpha2.jar deleted file mode 100644 index 0dce7e2e6..000000000 Binary files a/server/lib-local/jdatapath-alpha2.jar and /dev/null differ diff --git a/server/pom.xml b/server/pom.xml index cf80b9855..17ce539a7 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -89,29 +89,6 @@ true - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - install-jdapath - process-resources - - ${basedir}/lib-local/jdatapath-alpha2.jar - default - com.codeberry.jdatapath - jdatapath - alpha2 - jar - true - - - install-file - - - - @@ -191,12 +168,12 @@ 6.1.22 - com.codeberry.jdatapath + org.openrefine.dependencies jdatapath alpha2 - edu.mit.simile + org.openrefine.dependencies butterfly 1.0.2