s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2367 from OpenRefine/issue-2365-maven-deps

Browse Source 
Migrate local dependencies to Maven Central.
This commit is contained in:
Antonin Delpeuch 2020-03-08 15:21:58 +00:00 committed by GitHub
commit 27f7cdc897
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 10 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
main/lib-local-src/arithcode-1.1-sources.jar
View File

Binary file not shown.

BIN
main/lib-local-src/butterfly-1.0.2-sources.jar
View File

Binary file not shown.

BIN
main/lib-local-src/opencsv-2.4-SNAPSHOT-sources.jar
View File

Binary file not shown.

43
main/lib-local-src/patches/json-20100208.patch
View File

@ -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;

BIN
main/lib-local-src/secondstring-20100303-sources.jar
View File

Binary file not shown.

BIN
main/lib-local-src/vicino-1.1-sources.jar
View File

Binary file not shown.

BIN
main/lib-local/arithcode-1.1.jar
View File

Binary file not shown.

BIN
main/lib-local/butterfly-1.0.2.jar
View File

Binary file not shown.

BIN
main/lib-local/marc4j-2.4.jar
View File

Binary file not shown.

BIN
main/lib-local/opencsv-2.4-SNAPSHOT.jar
View File

Binary file not shown.

BIN
main/lib-local/secondstring-20100303.jar
View File

Binary file not shown.

BIN
main/lib-local/vicino-1.1.jar
View File

Binary file not shown.

119
main/pom.xml
View File

@ -115,109 +115,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<executions>
<execution>
<id>install-marc4j</id>
<phase>process-resources</phase>
<configuration>
<file>${basedir}/lib-local/marc4j-2.4.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>marc4j</groupId>
<artifactId>marc4j</artifactId>
<version>2.4</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
<execution>
<id>install-opencsv</id>
<phase>process-resources</phase>
<configuration>
<file>${basedir}/lib-local/opencsv-2.4-SNAPSHOT.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>2.4-SNAPSHOT</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
<execution>
<id>install-butterfly</id>
<phase>process-resources</phase>
<configuration>
<file>${basedir}/lib-local/butterfly-1.0.2.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>edu.mit.simile</groupId>
<artifactId>butterfly</artifactId>
<version>1.0.2</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
<execution>
<id>install-vicino</id>
<phase>process-resources</phase>
<configuration>
<file>${basedir}/lib-local/vicino-1.1.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>edu.mit.simile</groupId>
<artifactId>vicino</artifactId>
<version>1.1</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
<execution>
<id>install-secondstring</id>
<phase>process-resources</phase>
<configuration>
<file>${basedir}/lib-local/secondstring-20100303.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>com.wcohen</groupId>
<artifactId>secondstring</artifactId>
<version>20100303</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
<execution>
<id>install-arithcode</id>
<phase>process-resources</phase>
<configuration>
<file>${basedir}/lib-local/arithcode-1.1.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>com.colloquial</groupId>
<artifactId>arithcode</artifactId>
<version>1.1</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
@ -269,7 +166,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>edu.mit.simile</groupId>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>butterfly</artifactId>
<version>1.0.2</version>
</dependency>
@ -334,7 +231,7 @@
<version>1.5</version>
</dependency>
<dependency>
<groupId>marc4j</groupId>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>marc4j</artifactId>
<version>2.4</version>
</dependency>
@ -349,9 +246,9 @@
<version>1.11.3</version>
</dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>2.4-SNAPSHOT</version>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>opencsv-multichar</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
@ -369,7 +266,7 @@
<version>0.9.0-RC1</version>
</dependency>
<dependency>
<groupId>edu.mit.simile</groupId>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>vicino</artifactId>
<version>1.1</version>
</dependency>
@ -434,12 +331,12 @@
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.wcohen</groupId>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>secondstring</artifactId>
<version>20100303</version>
</dependency>
<dependency>
<groupId>com.colloquial</groupId>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>arithcode</artifactId>
<version>1.1</version>
</dependency>

BIN
server/lib-local-src/jdatapath-alpha2-sources.jar
View File

Binary file not shown.

BIN
server/lib-local/jdatapath-alpha2.jar
View File

Binary file not shown.

27
server/pom.xml
View File

@ -89,29 +89,6 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<executions>
<execution>
<id>install-jdapath</id>
<phase>process-resources</phase>
<configuration>
<file>${basedir}/lib-local/jdatapath-alpha2.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>com.codeberry.jdatapath</groupId>
<artifactId>jdatapath</artifactId>
<version>alpha2</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
@ -191,12 +168,12 @@
<version>6.1.22</version>
</dependency>
<dependency>
<groupId>com.codeberry.jdatapath</groupId>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>jdatapath</artifactId>
<version>alpha2</version>
</dependency>
<dependency>
<groupId>edu.mit.simile</groupId>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>butterfly</artifactId>
<version>1.0.2</version>
</dependency>