Skip to content

Commit 1f9409a

Browse files
J38J38
authored
Merge pull request #1245 from stanfordnlp/dev
4.4.0 update
2 parents d147ba5 + a25947f commit 1f9409a

File tree

72 files changed

+5809
-629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+5809
-629
lines changed

‎.classpath‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,19 @@
1111
<classpathentry exported="true" kind="lib" path="lib/tomcat/jasper-el.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
1212
<classpathentry exported="true" kind="lib" path="lib/tomcat/jsp-api.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
1313
<classpathentry exported="true" kind="lib" path="lib/tomcat/tomcat-api.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
14-
<classpathentry exported="true" kind="lib" path="lib/commons-logging.jar" sourcepath="libsrc/commons-logging-1.1.1-sources.jar"/>
14+
<classpathentry exported="true" kind="lib" path="lib/commons-logging.jar" sourcepath="libsrc/commons-logging-1.2-src.zip"/>
1515
<classpathentry exported="true" kind="lib" path="lib/junit-4.13.1.jar" sourcepath="libsrc/junit-4.13.1-sources.jar"/>
1616
<classpathentry exported="true" kind="lib" path="lib/javax.servlet.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
1717
<classpathentry exported="true" kind="lib" path="lib/AppleJavaExtensions.jar"/>
1818
<classpathentry exported="true" kind="lib" path="lib/jflex-full-1.8.2.jar" sourcepath="libsrc/jflex-1.8.2.zip"/>
1919
<classpathentry exported="true" kind="lib" path="lib/xom-1.3.7.jar" sourcepath="libsrc/xom-1.3.7-sources.jar"/>
2020
<classpathentry exported="true" kind="lib" path="lib/joda-time.jar" sourcepath="libsrc/joda-time-2.10.5-sources.jar"/>
2121
<classpathentry exported="true" kind="lib" path="lib/jollyday-0.4.9.jar" sourcepath="libsrc/jollyday-0.4.9-sources.jar"/>
22-
<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.16.jar" sourcepath="libsrc/log4j-1.2.16-src.zip"/>
22+
<classpathentry exported="true" kind="lib" path="lib/log4j-core-2.15.0.jar" sourcepath="libsrc/apache-log4j-2.15.0-src.zip"/>
23+
<classpathentry exported="true" kind="lib" path="log4j-api-2.15.0.jar"/>
24+
<classpathentry exported="true" kind="lib" path="log4j-jcl-2.15.0.jar"/>
2325
<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.1.jar" sourcepath="libsrc/commons-lang3-3.1-sources.jar"/>
24-
<classpathentry exported="true" kind="lib" path="lib/protobuf-java-3.11.4.jar" sourcepath="libsrc/protobuf-java-3.11.4-sources.jar"/>
26+
<classpathentry exported="true" kind="lib" path="lib/protobuf-java-3.19.2.jar" sourcepath="libsrc/protobuf-java-3.19.2-sources.jar"/>
2527
<classpathentry exported="true" kind="lib" path="lib/javacc.jar"/>
2628
<classpathentry exported="true" kind="lib" path="lib/javax.json.jar" sourcepath="libsrc/javax.json-api-1.0-sources.jar"/>
2729
<classpathentry exported="true" kind="lib" path="lib/lucene-core-7.5.0.jar" sourcepath="libsrc/lucene-core-7.5.0-sources.jar"/>

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sourceCompatibility = 1.8
1111
targetCompatibility = 1.8
1212
compileJava.options.encoding = 'UTF-8'
1313

14-
version = '4.3.1'
14+
version = '4.4.0'
1515

1616
// Gradle application plugin
1717
mainClassName = "edu.stanford.nlp.pipeline.StanfordCoreNLP"

‎doc/corenlp/README.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ LICENSE
4141
CHANGES
4242
---------------------------------
4343

44+
2022-01-20 4.4.0 Fix issue with Italian depparse, tsurgeon CLI,
45+
fix security issues, bug fixes
46+
4447
2021-10-14 4.3.1 Minor bugfixes to German umlaut tokenization,
4548
CDC tokenizer offset, Hungarian model package
4649

‎doc/corenlp/pom-full.xml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>edu.stanford.nlp</groupId>
44
<artifactId>stanford-corenlp</artifactId>
5-
<version>4.3.1</version>
5+
<version>4.4.0</version>
66
<packaging>jar</packaging>
77
<name>Stanford CoreNLP</name>
88
<description>Stanford CoreNLP provides a set of natural language analysis tools which can take raw English language text input and give the base forms of words, their parts of speech, whether they are names of companies, people, etc., normalize dates, times, and numeric quantities, mark up the structure of sentences in terms of phrases and word dependencies, and indicate which noun phrases refer to the same entities. It provides the foundational building blocks for higher level text understanding applications.</description>
@@ -14,8 +14,8 @@
1414
</license>
1515
</licenses>
1616
<scm>
17-
<url>https://nlp.stanford.edu/software/stanford-corenlp-4.3.1.zip</url>
18-
<connection>https://nlp.stanford.edu/software/stanford-corenlp-4.3.1.zip</connection>
17+
<url>https://nlp.stanford.edu/software/stanford-corenlp-4.4.0.zip</url>
18+
<connection>https://nlp.stanford.edu/software/stanford-corenlp-4.4.0.zip</connection>
1919
</scm>
2020
<developers>
2121
<developer>
@@ -128,7 +128,7 @@
128128
<dependency>
129129
<groupId>com.google.protobuf</groupId>
130130
<artifactId>protobuf-java</artifactId>
131-
<version>3.11.4</version>
131+
<version>3.19.2</version>
132132
</dependency>
133133

134134
<dependency>
@@ -165,9 +165,9 @@
165165
</dependency>
166166

167167
<dependency>
168-
<groupId>com.sun.xml.bind</groupId>
169-
<artifactId>jaxb-core</artifactId>
170-
<version>2.3.0.1</version>
168+
<groupId>com.sun.istack</groupId>
169+
<artifactId>istack-commons-runtime</artifactId>
170+
<version>3.0.7</version>
171171
</dependency>
172172

173173
<dependency>
@@ -176,6 +176,13 @@
176176
<version>2.4.0-b180830.0438</version>
177177
</dependency>
178178

179+
<!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
180+
<dependency>
181+
<groupId>com.googlecode.json-simple</groupId>
182+
<artifactId>json-simple</artifactId>
183+
<version>1.1.1</version>
184+
</dependency>
185+
179186
</dependencies>
180187
<build>
181188
<sourceDirectory>src</sourceDirectory>
@@ -195,7 +202,7 @@
195202
<configuration>
196203
<artifacts>
197204
<artifact>
198-
<file>${project.basedir}/stanford-corenlp-4.3.1-models.jar</file>
205+
<file>${project.basedir}/stanford-corenlp-4.4.0-models.jar</file>
199206
<type>jar</type>
200207
<classifier>models</classifier>
201208
</artifact>

‎doc/corenlp/pom-light.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>edu.stanford.nlp</groupId>
44
<artifactId>stanford-corenlp</artifactId>
5-
<version>4.3.1</version>
5+
<version>4.4.0</version>
66
<packaging>jar</packaging>
77
<name>Stanford CoreNLP</name>
88
<description>Stanford CoreNLP provides a set of natural language analysis tools which can take raw English language text input and give the base forms of words, their parts of speech, whether they are names of companies, people, etc., normalize dates, times, and numeric quantities, mark up the structure of sentences in terms of phrases and word dependencies, and indicate which noun phrases refer to the same entities. It provides the foundational building blocks for higher level text understanding applications.</description>
@@ -14,8 +14,8 @@
1414
</license>
1515
</licenses>
1616
<scm>
17-
<url>https://nlp.stanford.edu/software/stanford-corenlp-4.3.1.zip</url>
18-
<connection>https://nlp.stanford.edu/software/stanford-corenlp-4.3.1.zip</connection>
17+
<url>https://nlp.stanford.edu/software/stanford-corenlp-4.4.0.zip</url>
18+
<connection>https://nlp.stanford.edu/software/stanford-corenlp-4.4.0.zip</connection>
1919
</scm>
2020
<developers>
2121
<developer>
@@ -56,7 +56,7 @@
5656
<configuration>
5757
<artifacts>
5858
<artifact>
59-
<file>${project.basedir}/stanford-corenlp-4.3.1-models.jar</file>
59+
<file>${project.basedir}/stanford-corenlp-4.4.0-models.jar</file>
6060
<type>jar</type>
6161
<classifier>models</classifier>
6262
</artifact>

‎itest/src/edu/stanford/nlp/coref/NeuralChineseCorefBenchmarkSlowITest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ public class NeuralChineseCorefBenchmarkSlowITest extends CorefBenchmark {
99

1010
@Override
1111
public void setUp() throws Exception, IOException {
12-
logger = Redwood.channels(NeuralEnglishCorefCoNLLBenchmarkSlowITest.class);
13-
EXPECTED_F1_SCORE = 53.80;
12+
logger = Redwood.channels(NeuralChineseCorefBenchmarkSlowITest.class);
13+
EXPECTED_F1_SCORE = 54.3;
1414
PROPERTIES_PATH = "edu/stanford/nlp/coref/properties/neural-chinese.properties";
1515
WORK_DIR_NAME = "NeuralChineseCorefBenchmarkTest";
1616
testName = "Neural Chinese Coref";
1717
super.setUp();
1818
}
1919

20-
}
20+
}

‎itest/src/edu/stanford/nlp/coref/NeuralEnglishCorefBenchmarkSlowITest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ public class NeuralEnglishCorefBenchmarkSlowITest extends CorefBenchmark {
1010
@Override
1111
public void setUp() throws Exception, IOException {
1212
logger = Redwood.channels(NeuralEnglishCorefCoNLLBenchmarkSlowITest.class);
13-
EXPECTED_F1_SCORE = 59.90;
13+
EXPECTED_F1_SCORE = 62.15;
1414
PROPERTIES_PATH = "edu/stanford/nlp/coref/properties/neural-english.properties";
1515
WORK_DIR_NAME = "NeuralEnglishCorefBenchmarkTest";
1616
testName = "Neural English Coref";
1717
super.setUp();
1818
}
1919

20-
}
20+
}

‎itest/src/edu/stanford/nlp/coref/NeuralEnglishCorefCoNLLBenchmarkSlowITest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class NeuralEnglishCorefCoNLLBenchmarkSlowITest extends CorefBenchmark {
99
@Override
1010
public void setUp() throws Exception, IOException {
1111
logger = Redwood.channels(NeuralEnglishCorefCoNLLBenchmarkSlowITest.class);
12-
EXPECTED_F1_SCORE = 65.56;
12+
EXPECTED_F1_SCORE = 65.51;
1313
PROPERTIES_PATH = "edu/stanford/nlp/coref/properties/neural-english-conll.properties";
1414
WORK_DIR_NAME = "NeuralEnglishCorefCoNLLBenchmarkTest";
1515
testName = "Neural English Coref (CoNLL)";

‎itest/src/edu/stanford/nlp/coref/StatisticalCorefCoNLLBenchmarkSlowITest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class StatisticalCorefCoNLLBenchmarkSlowITest extends CorefBenchmark {
1010
@Override
1111
public void setUp() throws Exception, IOException {
1212
logger = Redwood.channels(StatisticalCorefCoNLLBenchmarkSlowITest.class);
13-
EXPECTED_F1_SCORE = 63.29;
13+
EXPECTED_F1_SCORE = 63.27;
1414
PROPERTIES_PATH = "edu/stanford/nlp/coref/properties/statistical-english-conll.properties";
1515
WORK_DIR_NAME = "StatisticalCorefBenchmarkTest";
1616
testName = "Statistical English Coref (CoNLL)";

‎itest/src/edu/stanford/nlp/naturalli/QuestionToStatementTranslatorITest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,10 @@ public void parseWhatNounHas() {
280280
check(
281281
"what/WP awards/NNS has/VBZ louis/NNP sacher/NNP won/VB ?",
282282
"louis sacher has won awards");
283+
// below one doesn't yet work -- still gives "win". Fix this someday.
284+
// check(
285+
// "what/WP awards/NNS did/VBD Louis/NNP Sacher/NNP win/VB ?",
286+
// "Louis Sacher won awards");
283287
check(
284288
"what/WP movies/NNS has/VBZ taylor/NNP lautner/NNP been/VBD in/IN 2011/CD ?",
285289
"taylor lautner has been in movies in 2011");

0 commit comments

Comments
 (0)