Merge branch 'languagetool-org:master' into master

Author: Porthoos

.circleci/config.yml

@@ -43,20 +43,20 @@ jobs:
       MAVEN_OPTS: -Xmx3200m
     steps:
       - custom-checkout
+      - install-project
       - run:
           name: test full
           command: |
-            cd $CIRCLE_WORKING_DIRECTORY && mvn -pl '!languagetool-rpm-package' test -fae
+            cd $CIRCLE_WORKING_DIRECTORY && mvn test -fae
       - save-test-results
       - run:
           name: deploy full
           command: |
-            cd $CIRCLE_WORKING_DIRECTORY && mvn -s .circleci.settings.xml -pl '!languagetool-rpm-package' -DskipTests deploy
+            cd $CIRCLE_WORKING_DIRECTORY && mvn -s .circleci.settings.xml -DskipTests deploy
       - save_cache:
           paths:
             - ~/.m2
           key: v1-dependencies-{{ checksum "/home/circleci/project/~/project/pom.xml" }}
-      - trigger-premium-pipeline
   test-and-deploy-partial:
     resource_class: medium
     executor: 
@@ -66,6 +66,7 @@ jobs:
     steps:
       - custom-checkout
       - get-diffs
+      - install-project
       - run:
           name: test modules
           command: |
@@ -79,6 +80,7 @@ jobs:
           paths:
             - ~/.m2
           key: v1-dependencies-{{ checksum "/home/circleci/project/~/project/pom.xml" }}
+      - trigger-premium-pipeline
 commands:
   custom-checkout:
     description: My custom checkout
@@ -104,7 +106,7 @@ commands:
   install-project:
     description: Run maven install
     steps:
-      - run: cd $CIRCLE_WORKING_DIRECTORY && mvn -pl '!languagetool-rpm-package' clean install -DskipTests
+      - run: cd $CIRCLE_WORKING_DIRECTORY && mvn clean install -DskipTests
       - run: cd $CIRCLE_WORKING_DIRECTORY && mvn dependency:go-offline
   save-test-results:
     steps:
@@ -121,11 +123,7 @@ commands:
       - run:
           name: Kick off new premium pipeline
           command: |
-            curl --request POST \
-            --url https://circleci.com/api/v2/project/gh/languagetooler-gmbh/languagetool-premium/pipeline \
-            --header "Circle-Token: ${API_TOKEN}" \
-            --header "Content-Type: application/json" \
-            --data '{"branch":"master","parameters":{"run_on_pull":false, "os-sha": "${CIRCLE_SHA1}"}}'
+            cd $CIRCLE_WORKING_DIRECTORY && .circleci/kick_off_premium.sh
 executors:
   docker-openjdk11:
     docker:

.circleci/kick_off_premium.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+#
+# LanguageTool, a natural language style checker
+# Copyright (C) 2021 Stefan Viol (https://stevio.de)
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+# USA
+#
+
+# Exit script if you try to use an uninitialized variable.
+set -o nounset
+# Exit script if a statement returns a non-true return value.
+set -o errexit
+# Use the error status of the first failure, rather than that of the last item in a pipeline.
+set -o pipefail
+#
+# LanguageTool, a natural language style checker
+# Copyright (C) 2021 Stefan Viol (https://stevio.de)
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+# USA
+#
+
+PROJECTS=""
+BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+if [[ "$BRANCH" != "master" ]]; then
+  echo "No premium tests for $BRANCH."
+  exit 0
+fi
+if grep -q -e "languagetool-core/.*" /home/circleci/git_diffs.txt; then
+  PROJECTS="languagetool-core/"
+else
+  if grep -q -e "languagetool-dev/.*" /home/circleci/git_diffs.txt; then PROJECTS="languagetool-dev/ $PROJECTS"; fi
+  if grep -q -e "languagetool-language-modules/de/.*" /home/circleci/git_diffs.txt; then PROJECTS="languagetool-language-modules/de/ $PROJECTS"; fi
+  if grep -q -e "languagetool-language-modules/en/.*" /home/circleci/git_diffs.txt; then PROJECTS="languagetool-language-modules/en/ $PROJECTS"; fi
+  if grep -q -e "languagetool-language-modules/es/.*" /home/circleci/git_diffs.txt; then PROJECTS="languagetool-language-modules/es/ $PROJECTS"; fi
+  if grep -q -e "languagetool-language-modules/fr/.*" /home/circleci/git_diffs.txt; then PROJECTS="languagetool-language-modules/fr/ $PROJECTS"; fi
+  if grep -q -e "languagetool-language-modules/nl/.*" /home/circleci/git_diffs.txt; then PROJECTS="languagetool-language-modules/nl/ $PROJECTS"; fi
+  if grep -q -e "languagetool-server/.*" /home/circleci/git_diffs.txt; then PROJECTS="languagetool-server/ $PROJECTS"; fi
+fi
+if [ -z "$PROJECTS" ]; then
+  echo "No changes in any module detected"
+  exit 0
+else
+  PROJECTS=${PROJECTS::-1}
+fi
+curl --request POST \
+  --url https://circleci.com/api/v2/project/gh/languagetooler-gmbh/languagetool-premium-modules/pipeline \
+  --header "Circle-Token: ${API_TOKEN}" \
+  --header "Content-Type: application/json" \
+  --data "{\"branch\":\"master\",\"parameters\":{\"run_on_pull\":false, \"os-sha\": \"'${CIRCLE_SHA1}'\", \"os-changes\":\"$PROJECTS\"}}"

.github/workflows/dependency-check-ok.yml

@@ -0,0 +1,12 @@
+name: 'Dependency Review'
+on:
+  pull_request:
+    paths-ignore: 
+      - '**pom.xml'
+permissions:
+  contents: read
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - run: 'echo "No review required" '

.github/workflows/dependency-check.yml

@@ -0,0 +1,15 @@
+name: 'Dependency Review'
+on:
+  pull_request:
+    paths:
+      - '**pom.xml'
+permissions:
+  contents: read
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v1

build-zip.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 # fast way to build the ZIP for testing an deployment
 
-mvn -pl '!languagetool-http-client,!languagetool-wikipedia,!languagetool-office-extension,!languagetool-dev,!languagetool-rpm-package' clean package -DskipTests
+mvn -pl '!languagetool-http-client,!languagetool-wikipedia,!languagetool-office-extension,!languagetool-dev' clean package -DskipTests

create_release.sh renamed to deploy_release.sh

@@ -41,17 +41,17 @@ TEST=$2
 
 case "$TEST" in
   "fae" | "fn")
-    COMMAND="mvn -Drevision=$VERSION clean package -$TEST"
+    COMMAND="mvn -Drevision=$VERSION clean deploy -$TEST"
     echo "$COMMAND"
     $COMMAND
     ;;
   "none")
-    COMMAND="mvn -Drevision=$VERSION clean package -DskipTests"
+    COMMAND="mvn -Drevision=$VERSION clean deploy -DskipTests"
     echo "$COMMAND"
     $COMMAND  
     ;;
   "full")
-    COMMAND="mvn -Drevision=$VERSION clean package"
+    COMMAND="mvn -Drevision=$VERSION clean deploy"
     echo "$COMMAND"
     $COMMAND
     ;;

languagetool-commandline/src/main/java/org/languagetool/commandline/CommandLineTools.java

@@ -184,6 +184,7 @@ public static void printMatches(List<RuleMatch> ruleMatches,
           output += "[" + pRule.getSubId() + "]";
         }
       }
+      output += " premium: " + Premium.get().isPremiumRule(match.getRule());
       int priorityForId = lang.getRulePriority(match.getRule());
       if (priorityForId != 0) {
         output += " prio=" + priorityForId;

languagetool-commandline/src/test/java/org/languagetool/commandline/MainTest.java

@@ -313,7 +313,7 @@ public void testEnglishStdInJsonOutput() throws Exception {
     assertTrue("Got: " + output, output.contains("\"sentence\":\"This is an test.\""));
     assertTrue("Doesn't display Time", !output.contains("Time: "));
     assertTrue("Json start check", output.contains("{\"software\":{\"name\":\"LanguageTool\",\"version\":"));
-    assertTrue("Json end check", output.endsWith("}]}"));
+    assertTrue("Json end check", output.endsWith("[]}"));
   }
 
   //test line mode vs. para mode

languagetool-core/pom.xml

@@ -328,6 +328,19 @@
             <groupId>com.vdurmont</groupId>
             <artifactId>emoji-java</artifactId>
             <version>${com.vdurmont.emoji-java.version}</version>
+            <exclusions>
+                <!-- The package `JSON-java` before 20180130 is vulnerable to Denial of service. -->
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- The package `JSON-java` before 20180130 is vulnerable to Denial of service. -->
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20200518</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -379,9 +392,11 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>${protobuf-maven-plugin.version}</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}
+                    </protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}
+                    </pluginArtifact>
                     <!-- output into src/main/java, but don't ever clear it (would delete all regular source files) -->
                     <outputDirectory>${project.build.sourceDirectory}/</outputDirectory>
                     <clearOutputDirectory>false</clearOutputDirectory>

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

@@ -18,8 +18,10 @@
  */
 package org.languagetool;
 
+import org.jetbrains.annotations.NotNull;
 import org.languagetool.rules.RuleMatch;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -30,6 +32,7 @@ public class CheckResults {
 
   private List<RuleMatch> ruleMatches;
   private List<Range> ignoredRanges;
+  private final List<SentenceRange> sentenceRanges = new ArrayList<>();
 
   public CheckResults(List<RuleMatch> ruleMatches, List<Range> ignoredRanges) {
     this.ruleMatches = Objects.requireNonNull(ruleMatches);
@@ -44,12 +47,19 @@ public List<RuleMatch> getRuleMatches() {
     return ruleMatches;
   }
 
+  @NotNull
+  public List<SentenceRange> getSentenceRanges() {
+    return sentenceRanges;
+  }
+  public void addSentenceRanges(List<SentenceRange> sentenceRanges) {
+    this.sentenceRanges.addAll(sentenceRanges);
+  }
+  
   public void setIgnoredRanges(List<Range> ignoredRanges) {
     this.ignoredRanges = Objects.requireNonNull(ignoredRanges);
   }
 
   public void setRuleMatches(List<RuleMatch> ruleMatches) {
     this.ruleMatches = Objects.requireNonNull(ruleMatches);
   }
-
 }