[fr] updated dictionaries to dicollecte-6.4.1

.gitignore

@@ -23,3 +23,4 @@ languagetool-standalone/test_de.txt
 languagetool-standalone/test_en.txt
 /data/
 languagetool-language-modules/nl/src/main/resources/org/languagetool/rules/nl/grammar-test-1.xml
+.attach_pid*

hunspell-native-libs/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.languagetool</groupId>
         <artifactId>languagetool-parent</artifactId>
-        <version>4.7-SNAPSHOT</version>
+        <version>4.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

languagetool-commandline/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.languagetool</groupId>
         <artifactId>languagetool-parent</artifactId>
-        <version>4.7-SNAPSHOT</version>
+        <version>4.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -72,6 +72,11 @@
             <artifactId>language-all</artifactId>
             <version>${languagetool.version}</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.6</version>
+        </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -98,11 +103,6 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.6</version>
-        </dependency>
     </dependencies>
 
-</project>
+</project>

languagetool-core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.languagetool</groupId>
         <artifactId>languagetool-parent</artifactId>
-        <version>4.7-SNAPSHOT</version>
+        <version>4.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -89,13 +89,6 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>jcenter</id>
-            <url>https://jcenter.bintray.com/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -105,17 +98,17 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.7</version>
+            <version>1.8</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>21.0</version>
+            <version>28.1-jre</version>
         </dependency>
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
-            <version>4.4.0</version>
+            <version>4.5.2</version>
         </dependency>
         <dependency>
             <groupId>org.carrot2</groupId>
@@ -126,6 +119,12 @@
             <groupId>org.carrot2</groupId>
             <artifactId>morfologik-fsa-builders</artifactId>
             <version>${morfologik.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.carrotsearch</groupId>
+                    <artifactId>hppc</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.carrot2</groupId>
@@ -141,7 +140,7 @@
             <!-- needed for building the Morfologik dict at runtime (for ignore.txt) -->
             <groupId>com.carrotsearch</groupId>
             <artifactId>hppc</artifactId>
-            <version>0.7.2</version>
+            <version>0.8.1</version>
         </dependency>
         <dependency>
             <groupId>net.loomchild</groupId>
@@ -186,11 +185,6 @@
             <artifactId>lucene-backward-codecs</artifactId>
             <version>${lucene.version}</version>
         </dependency>
-        <dependency>
-            <groupId>edu.berkeley.nlp</groupId>
-            <artifactId>berkeleylm</artifactId>
-            <version>1.1.2</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -204,7 +198,7 @@
         <dependency>
             <groupId>tech.units</groupId>
             <artifactId>indriya</artifactId>
-            <version>1.2</version>
+            <version>1.3</version>
         </dependency>
 
         <dependency>
@@ -255,9 +249,9 @@
             <!--<version>1.4.2</version>-->
         <!--</dependency>-->
         <dependency>
-            <groupId>biz.k11i</groupId>
+            <groupId>ai.h2o</groupId>
             <artifactId>xgboost-predictor</artifactId>
-            <version>0.3.0</version>
+            <version>0.3.1</version>
         </dependency>
 
         <dependency>
@@ -275,19 +269,19 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
-            <version>1.6</version>
+            <version>1.7</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-            <version>2.6.1</version>
+            <version>2.7.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.23.0</version>
+            <version>2.28.2</version>
             <scope>test</scope>
         </dependency>
 

languagetool-core/src/main/java/org/languagetool/AnalyzedTokenReadings.java

@@ -129,7 +129,6 @@ public boolean hasPosTag(String posTag) {
   /**
    * Checks if there is at least one POS tag
    * @since 4.7
-   * @param posTag POS tag to look for
    */
   public boolean hasReading() {
     return anTokReadings != null && anTokReadings.length > 0;

languagetool-core/src/main/java/org/languagetool/JLanguageTool.java

@@ -68,7 +68,7 @@
 public class JLanguageTool {
 
   /** LanguageTool version as a string like {@code 2.3} or {@code 2.4-SNAPSHOT}. */
-  public static final String VERSION = "4.7-SNAPSHOT";
+  public static final String VERSION = "4.8-SNAPSHOT";
   /** LanguageTool build date and time like {@code 2013-10-17 16:10} or {@code null} if not run from JAR. */
   @Nullable public static final String BUILD_DATE = getBuildDate();
   /** 

languagetool-core/src/main/java/org/languagetool/rules/Categories.java

@@ -35,6 +35,10 @@ public final class Categories {
   /** General style issues not covered by other categories, like overly verbose wording. */
   public static final Categories STYLE = make("STYLE", "category_style");
 
+
+  /** Created to match PLAIN_ENGLISH XML category. */
+  public static final Categories PLAIN_ENGLISH = make("PLAIN_ENGLISH", "category_plain_english");
+
   public static final Categories GENDER_NEUTRALITY = make("GENDER_NEUTRALITY", "category_gender_neutrality");
 
   /** Logic, content, and consistency problems. */

languagetool-core/src/main/java/org/languagetool/rules/Rule.java

@@ -52,6 +52,7 @@ public abstract class Rule {
   private Category category;
   private URL url;
   private boolean defaultOff;
+  private boolean defaultTempOff;
   private boolean officeDefaultOn = false;
   private boolean officeDefaultOff = false;
 
@@ -306,13 +307,28 @@ public final boolean isDefaultOff() {
     return defaultOff;
   }
 
+  /**
+   * Checks whether the rule has been turned off using "default='temp_off'" by default by the rule author.
+   * This is a special case where the rule is off for users but active for nightly regression checks.
+   */
+  public final boolean isDefaultTempOff() {
+    return defaultTempOff;
+  }
+
   /**
    * Turns the rule off by default.
    */
   public final void setDefaultOff() {
     defaultOff = true;
   }
 
+  /**
+   * Turns the rule off by default, expect for internal regression tests.
+   */
+  public final void setDefaultTempOff() {
+    defaultTempOff = true;
+  }
+
   /**
    * Turns the rule on by default.
    */