Skip to content

Commit e484d9a

Browse files
mubaldinomubaldino
committed
JavaLint
Maven POM review Logger library versions updated Groovy and test libraries updated
1 parent 07ddd35 commit e484d9a

7 files changed

Lines changed: 114 additions & 123 deletions

File tree

‎Core/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.opensextant</groupId>
77
<artifactId>opensextant-xponents-core</artifactId>
8-
<version>3.5.8</version>
8+
<version>3.5.9</version>
99
<packaging>jar</packaging>
1010
<name>OpenSextant Xponents Core API</name>
1111
<description>An information extraction toolkit focused on geography and temporal entities</description>
@@ -35,7 +35,7 @@
3535
</developers>
3636
<properties>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38-
<slf4j.version>1.7.32</slf4j.version>
38+
<slf4j.version>1.7.36</slf4j.version>
3939
</properties>
4040
<!-- OSS Sonatype instructions: list repositories -->
4141
<distributionManagement>
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>commons-io</groupId>
5555
<artifactId>commons-io</artifactId>
56-
<version>2.8.0</version>
56+
<version>2.11.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.apache.commons</groupId>
@@ -86,7 +86,7 @@
8686
<dependency>
8787
<groupId>ch.qos.logback</groupId>
8888
<artifactId>logback-classic</artifactId>
89-
<version>1.2.10</version>
89+
<version>1.2.11</version>
9090
<scope>test</scope>
9191
</dependency>
9292
</dependencies>

‎Examples/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<name>Xponent Examples</name>
1111
<artifactId>opensextant-xponents-examples</artifactId>
1212
<properties>
13-
<slf4j.version>1.7.32</slf4j.version>
14-
<xponents.version>3.5.8</xponents.version>
15-
<xponents-core.version>3.5.8</xponents-core.version>
13+
<slf4j.version>1.7.36</slf4j.version>
14+
<xponents.version>3.5.9</xponents.version>
15+
<xponents-core.version>3.5.9</xponents-core.version>
1616
<xtext.version>3.5.4</xtext.version>
1717
</properties>
1818
<dependencies>
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>org.apache.groovy</groupId>
6868
<artifactId>groovy</artifactId>
69-
<version>4.0.0</version>
69+
<version>4.0.2</version>
7070
<scope>runtime</scope>
7171
</dependency>
7272
<dependency>
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>commons-io</groupId>
8080
<artifactId>commons-io</artifactId>
81-
<version>2.8.0</version>
81+
<version>2.11.0</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>commons-cli</groupId>
@@ -88,7 +88,7 @@
8888
<dependency>
8989
<groupId>ch.qos.logback</groupId>
9090
<artifactId>logback-classic</artifactId>
91-
<version>1.2.10</version>
91+
<version>1.2.11</version>
9292
<scope>runtime</scope>
9393
</dependency>
9494
<dependency>

‎build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Please copy this to "build.properties" which will provide settings for your workspace.
22
#
33
# JAR version number, include -SNAPSHOT or whatever:
4-
xponents.build.v=3.5.8
4+
xponents.build.v=3.5.9
55
# General version of SDK:
66
xponents.version=3.5
77

‎pom.xml‎

Lines changed: 95 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.opensextant</groupId>
77
<artifactId>opensextant-xponents</artifactId>
8-
<version>3.5.8</version>
8+
<version>3.5.9</version>
99
<packaging>jar</packaging>
1010
<name>OpenSextant Xponents</name>
1111
<description>An information extraction toolkit focused on geography and temporal entities</description>
@@ -50,9 +50,10 @@
5050
<properties>
5151
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5252
<solr.version>7.7.3</solr.version>
53-
<slf4j.version>1.7.32</slf4j.version>
54-
<log4j.version>2.17.1</log4j.version>
53+
<slf4j.version>1.7.36</slf4j.version>
54+
<log4j.version>2.17.2</log4j.version>
5555
<restlet.version>2.4.3</restlet.version>
56+
<xponents.version>3.5.9</xponents.version>
5657
</properties>
5758
<!-- OSS Sonatype instructions: list repositories -->
5859
<distributionManagement>
@@ -71,7 +72,7 @@
7172
<dependency>
7273
<groupId>commons-io</groupId>
7374
<artifactId>commons-io</artifactId>
74-
<version>2.8.0</version>
75+
<version>2.11.0</version>
7576
</dependency>
7677
<dependency>
7778
<groupId>org.apache.commons</groupId>
@@ -94,14 +95,18 @@
9495
<dependency>
9596
<groupId>ch.qos.logback</groupId>
9697
<artifactId>logback-classic</artifactId>
97-
<version>1.2.10</version>
98+
<version>1.2.11</version>
9899
<scope>test</scope>
99100
</dependency>
100101
</dependencies>
101102
</dependencyManagement>
102103
<dependencies>
103104
<!-- BASIC LIBS -->
104-
105+
<dependency>
106+
<groupId>org.opensextant</groupId>
107+
<artifactId>opensextant-xponents-core</artifactId>
108+
<version>${xponents.version}</version>
109+
</dependency>
105110
<dependency>
106111
<groupId>org.apache.commons</groupId>
107112
<artifactId>commons-lang3</artifactId>
@@ -121,14 +126,6 @@
121126
<artifactId>spatial4j</artifactId>
122127
<version>0.8</version>
123128
</dependency>
124-
<!-- JTS is unused. No change in performance or function without it.
125-
<dependency>
126-
<groupId>org.locationtech.jts</groupId>
127-
<artifactId>jts-core</artifactId>
128-
<version>1.18.3</version>
129-
<scope>runtime</scope>
130-
</dependency>
131-
-->
132129
<dependency>
133130
<groupId>org.apache.httpcomponents</groupId>
134131
<artifactId>fluent-hc</artifactId>
@@ -167,6 +164,90 @@
167164
<artifactId>super-csv</artifactId>
168165
<version>2.4.0</version>
169166
</dependency>
167+
<!-- UTILITY AND LOGGING -->
168+
<dependency>
169+
<groupId>org.apache.logging.log4j</groupId>
170+
<artifactId>log4j-1.2-api</artifactId>
171+
<version>${log4j.version}</version>
172+
<scope>runtime</scope>
173+
</dependency>
174+
<dependency>
175+
<groupId>org.apache.logging.log4j</groupId>
176+
<artifactId>log4j-api</artifactId>
177+
<version>${log4j.version}</version>
178+
<scope>runtime</scope>
179+
</dependency>
180+
<dependency>
181+
<groupId>org.apache.logging.log4j</groupId>
182+
<artifactId>log4j-core</artifactId>
183+
<version>${log4j.version}</version>
184+
<scope>runtime</scope>
185+
</dependency>
186+
<dependency>
187+
<groupId>org.slf4j</groupId>
188+
<artifactId>slf4j-api</artifactId>
189+
</dependency>
190+
<dependency>
191+
<groupId>ch.qos.logback</groupId>
192+
<artifactId>logback-classic</artifactId>
193+
</dependency>
194+
<dependency>
195+
<groupId>gnu.getopt</groupId>
196+
<artifactId>java-getopt</artifactId>
197+
<version>1.0.13</version>
198+
<scope>runtime</scope>
199+
<optional>true</optional>
200+
</dependency>
201+
<dependency>
202+
<groupId>junit</groupId>
203+
<artifactId>junit</artifactId>
204+
<scope>test</scope>
205+
</dependency>
206+
<dependency>
207+
<groupId>commons-cli</groupId>
208+
<artifactId>commons-cli</artifactId>
209+
<version>1.4</version>
210+
<scope>test</scope>
211+
</dependency>
212+
<!-- REST support -->
213+
<dependency>
214+
<groupId>org.restlet.jse</groupId>
215+
<artifactId>org.restlet</artifactId>
216+
<version>${restlet.version}</version>
217+
</dependency>
218+
<dependency>
219+
<groupId>org.restlet.jse</groupId>
220+
<artifactId>org.restlet.ext.simple</artifactId>
221+
<version>${restlet.version}</version>
222+
</dependency>
223+
<dependency>
224+
<groupId>org.restlet.jse</groupId>
225+
<artifactId>org.restlet.ext.json</artifactId>
226+
<version>${restlet.version}</version>
227+
</dependency>
228+
<dependency>
229+
<groupId>org.json</groupId>
230+
<artifactId>json</artifactId>
231+
<version>20190722</version>
232+
</dependency>
233+
234+
<!-- JSON serialization and metadata transforms -->
235+
<dependency>
236+
<groupId>org.jodd</groupId>
237+
<artifactId>jodd-json</artifactId>
238+
<version>5.1.5</version>
239+
</dependency>
240+
<dependency>
241+
<groupId>org.apache.lucene</groupId>
242+
<artifactId>lucene-analyzers-common</artifactId>
243+
<version>${solr.version}</version>
244+
</dependency>
245+
<dependency>
246+
<groupId>org.apache.lucene</groupId>
247+
<artifactId>lucene-core</artifactId>
248+
<version>${solr.version}</version>
249+
</dependency>
250+
170251
<!-- SOLR 7.x LIBS -->
171252
<dependency>
172253
<groupId>org.apache.solr</groupId>
@@ -313,94 +394,7 @@
313394
</exclusion>
314395
</exclusions>
315396
</dependency>
316-
<!-- UTILITY AND LOGGING -->
317-
<dependency>
318-
<groupId>org.apache.logging.log4j</groupId>
319-
<artifactId>log4j-1.2-api</artifactId>
320-
<version>${log4j.version}</version>
321-
<scope>runtime</scope>
322-
</dependency>
323-
<dependency>
324-
<groupId>org.apache.logging.log4j</groupId>
325-
<artifactId>log4j-api</artifactId>
326-
<version>${log4j.version}</version>
327-
<scope>runtime</scope>
328-
</dependency>
329-
<dependency>
330-
<groupId>org.apache.logging.log4j</groupId>
331-
<artifactId>log4j-core</artifactId>
332-
<version>${log4j.version}</version>
333-
<scope>runtime</scope>
334-
</dependency>
335-
<dependency>
336-
<groupId>org.slf4j</groupId>
337-
<artifactId>slf4j-api</artifactId>
338-
</dependency>
339-
<dependency>
340-
<groupId>ch.qos.logback</groupId>
341-
<artifactId>logback-classic</artifactId>
342-
</dependency>
343-
<dependency>
344-
<groupId>gnu.getopt</groupId>
345-
<artifactId>java-getopt</artifactId>
346-
<version>1.0.13</version>
347-
<scope>runtime</scope>
348-
<optional>true</optional>
349-
</dependency>
350-
<dependency>
351-
<groupId>junit</groupId>
352-
<artifactId>junit</artifactId>
353-
<scope>test</scope>
354-
</dependency>
355-
<dependency>
356-
<groupId>commons-cli</groupId>
357-
<artifactId>commons-cli</artifactId>
358-
<version>1.4</version>
359-
<scope>test</scope>
360-
</dependency>
361-
<!-- REST support -->
362-
<dependency>
363-
<groupId>org.restlet.jse</groupId>
364-
<artifactId>org.restlet</artifactId>
365-
<version>${restlet.version}</version>
366-
</dependency>
367-
<dependency>
368-
<groupId>org.restlet.jse</groupId>
369-
<artifactId>org.restlet.ext.simple</artifactId>
370-
<version>${restlet.version}</version>
371-
</dependency>
372-
<dependency>
373-
<groupId>org.restlet.jse</groupId>
374-
<artifactId>org.restlet.ext.json</artifactId>
375-
<version>${restlet.version}</version>
376-
</dependency>
377-
<dependency>
378-
<groupId>org.json</groupId>
379-
<artifactId>json</artifactId>
380-
<version>20190722</version>
381-
</dependency>
382397

383-
<!-- JSON serialization and metadata transforms -->
384-
<dependency>
385-
<groupId>org.jodd</groupId>
386-
<artifactId>jodd-json</artifactId>
387-
<version>5.1.5</version>
388-
</dependency>
389-
<dependency>
390-
<groupId>org.apache.lucene</groupId>
391-
<artifactId>lucene-analyzers-common</artifactId>
392-
<version>${solr.version}</version>
393-
</dependency>
394-
<dependency>
395-
<groupId>org.apache.lucene</groupId>
396-
<artifactId>lucene-core</artifactId>
397-
<version>${solr.version}</version>
398-
</dependency>
399-
<dependency>
400-
<groupId>org.opensextant</groupId>
401-
<artifactId>opensextant-xponents-core</artifactId>
402-
<version>3.5.8</version>
403-
</dependency>
404398
</dependencies>
405399
<build>
406400
<!-- <directory>target</directory> -->

‎solr/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<property name="xponents.jar" value="${basedir}/../target/opensextant-xponents-${xponents.v}.jar"/>
1616
<property name="resources.lib" value="${basedir}/../src/main/resources"/>
1717
<property name="xponents.lib" value="${basedir}/../lib"/>
18-
<property name="log4j.v" value="2.17.1"/>
18+
<property name="log4j.v" value="2.17.2"/>
1919

2020
<path id="runtime.classpath">
2121
<pathelement location="${xponents.jar}"/>

‎src/main/java/org/opensextant/xlayer/server/TaggerResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ protected Parameters fromRequest(JSONObject inputs) throws JSONException {
171171
job.tag_coordinates = false;
172172
job.tag_countries = true;
173173
job.tag_places = true;
174-
/** Coordinates are not reverse geocoded by default. */
174+
/* Coordinates are not reverse geocoded by default. */
175175
job.resolve_localities = false;
176176

177177
job.tag_taxons = true;

‎src/main/java/org/opensextant/xlayer/server/xgeo/XlayerServer.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
package org.opensextant.xlayer.server.xgeo;
22

3+
import java.util.HashMap;
4+
import java.util.Map;
5+
36
import org.restlet.Component;
47
import org.restlet.Context;
58
import org.restlet.data.Protocol;
69

7-
import java.util.HashMap;
8-
import java.util.Map;
9-
1010
/**
1111
* @author ubaldino
1212
*/
1313
public class XlayerServer extends Component {
1414

15-
public static String usage() {
16-
17-
return "Usage:\n\t\tXlayerServer <port>";
18-
}
15+
private static String USAGE = "Usage:\n\t\tXlayerServer <port>";
1916

2017
public XlayerServer() {
2118
this(8888);
@@ -48,13 +45,13 @@ public XlayerServer(int port) {
4845
*/
4946
public static void main(String[] args) {
5047
if (args.length < 1) {
51-
System.err.println(usage());
48+
System.err.println(USAGE);
5249
System.exit(-1);
5350
}
5451
try {
5552
new XlayerServer(Integer.parseInt(args[0])).start();
5653
} catch (Exception err) {
57-
System.err.println(usage());
54+
System.err.println(USAGE);
5855
System.err.printf("ERROR: %s%n", err.getMessage());
5956
System.exit(-1);
6057
}

0 commit comments

Comments
 (0)