From 40817694500dffd09866fbfc5742316b5029a6c4 Mon Sep 17 00:00:00 2001
From: Alden Quimby <aldenquimby@gmail.com>
Date: Thu, 7 Apr 2016 16:24:21 -0400
Subject: [PATCH] Enforce DependencyConvergence in parent pom (#385)

---
 languagetool-commandline/pom.xml |  2 +-
 languagetool-core/pom.xml        |  7 ++-
 languagetool-dev/pom.xml         | 84 +++++++++++++++++++++++++++++++-
 languagetool-server/pom.xml      |  2 +-
 languagetool-standalone/pom.xml  |  2 +-
 languagetool-tools/pom.xml       |  1 -
 pom.xml                          | 47 ++++++++++++++++++
 7 files changed, 139 insertions(+), 6 deletions(-)

diff --git a/languagetool-commandline/pom.xml b/languagetool-commandline/pom.xml
index 2aa594ecdd2c..5b6b86340d22 100644
--- a/languagetool-commandline/pom.xml
+++ b/languagetool-commandline/pom.xml
@@ -77,7 +77,7 @@
                  see http://www.slf4j.org/codes.html#StaticLoggerBinder -->
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-nop</artifactId>
-            <version>1.7.9</version>
+            <version>${slf4j.version}</version>
         </dependency>
 
         <dependency>
diff --git a/languagetool-core/pom.xml b/languagetool-core/pom.xml
index 50cc70781736..d95b26b0dc68 100644
--- a/languagetool-core/pom.xml
+++ b/languagetool-core/pom.xml
@@ -89,7 +89,6 @@
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
         </dependency>
         <dependency>
             <groupId>net.java.dev.jna</groupId>
@@ -110,6 +109,12 @@
             <groupId>org.carrot2</groupId>
             <artifactId>morfologik-speller</artifactId>
             <version>${morfologik.version}</version>
+            <exclusions>
+                <exclusion><!-- see https://github.com/morfologik/morfologik-stemming/pull/78 -->
+                    <groupId>org.carrot2</groupId>
+                    <artifactId>morfologik-polish</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.carrot2</groupId>
diff --git a/languagetool-dev/pom.xml b/languagetool-dev/pom.xml
index 4fc9b4fbef24..125dd5d882f2 100644
--- a/languagetool-dev/pom.xml
+++ b/languagetool-dev/pom.xml
@@ -35,6 +35,83 @@
         </developer>
     </developers>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <!-- resolve convergence issue within org.apache.hadoop:hadoop-common -->
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>2.5</version>
+            </dependency>
+            <dependency>
+                <!-- resolve convergence issue within org.apache.hadoop:hadoop-common -->
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>1.7.5</version>
+            </dependency>
+            <dependency>
+                <!-- resolve convergence issue within org.apache.hadoop:hadoop-common -->
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-core-asl</artifactId>
+                <version>1.9.13</version>
+            </dependency>
+            <dependency>
+                <!-- resolve convergence between languagetool-wikipedia and hadoop-mapreduce-client-core -->
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.4</version>
+            </dependency>
+            <dependency>
+                <!-- resolve convergence between languagetool-wikipedia and hadoop-xz -->
+                <groupId>org.tukaani</groupId>
+                <artifactId>xz</artifactId>
+                <version>1.5</version>
+            </dependency>
+            <dependency>
+                <!-- resolve convergence between encog-core and hadoop-common -->
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-math3</artifactId>
+                <version>3.1.1</version>
+            </dependency>
+            <dependency>
+                <!-- resolve convergence between hadoop-common and hadoop-mapreduce-client-core -->
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-mapper-asl</artifactId>
+                <version>1.9.13</version>
+            </dependency>
+            <dependency>
+                <!-- resolve convergence between hadoop-common and rome-fetcher -->
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.1.3</version>
+            </dependency>
+            <dependency>
+                <!-- resolve convergence between hadoop-common and rome-fetcher -->
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.4</version>
+            </dependency>
+            <dependency>
+                <!-- resolve convergence between hadoop-common and rome-fetcher -->
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>3.1</version>
+            </dependency>
+            <dependency>
+                <!-- resolve convergence between slf4j-nop and hadoop-common -->
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <!-- resolve convergence between hadoop-common and hadoop-mapreduce-client-core -->
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.17</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.languagetool</groupId>
@@ -49,7 +126,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>18.0</version>
         </dependency>
         <dependency>
             <groupId>net.java.dev.rome</groupId>
@@ -98,6 +174,12 @@
             <groupId>io.sensesecure</groupId>
             <artifactId>hadoop-xz</artifactId>
             <version>1.4</version>
+            <exclusions>
+                <exclusion><!-- we add this ourselves -->
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/languagetool-server/pom.xml b/languagetool-server/pom.xml
index 3a6bedb73648..181c39ac2a16 100644
--- a/languagetool-server/pom.xml
+++ b/languagetool-server/pom.xml
@@ -80,7 +80,7 @@
                  see http://www.slf4j.org/codes.html#StaticLoggerBinder -->
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-nop</artifactId>
-            <version>1.7.9</version>
+            <version>${slf4j.version}</version>
         </dependency>
 
         <dependency>
diff --git a/languagetool-standalone/pom.xml b/languagetool-standalone/pom.xml
index ef2e5c8a4378..00c22db91882 100644
--- a/languagetool-standalone/pom.xml
+++ b/languagetool-standalone/pom.xml
@@ -133,7 +133,7 @@
                  see http://www.slf4j.org/codes.html#StaticLoggerBinder -->
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-nop</artifactId>
-            <version>1.7.9</version>
+            <version>${slf4j.version}</version>
         </dependency>
 
         <!-- Some tests are used at runtime for rule developers, thus no 'test' scope here: -->
diff --git a/languagetool-tools/pom.xml b/languagetool-tools/pom.xml
index c5fddb52d78a..00817031f000 100644
--- a/languagetool-tools/pom.xml
+++ b/languagetool-tools/pom.xml
@@ -77,7 +77,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>18.0</version>
         </dependency>
         <dependency>
             <groupId>org.encog</groupId>
diff --git a/pom.xml b/pom.xml
index 885ef2374f3d..02aacb62ce4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,9 +29,13 @@
       <maven.compiler.target>1.8</maven.compiler.target>
       <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
       <maven.jar.plugin>2.6</maven.jar.plugin>
+      <commons.cli.version>1.2</commons.cli.version>
+      <commons.lang.version>2.6</commons.lang.version>
+      <guava.version>18.0</guava.version>
       <junit.version>4.12</junit.version>
       <morfologik.version>2.1.0</morfologik.version>
       <languagetool.version>3.4-SNAPSHOT</languagetool.version>
+      <slf4j.version>1.7.6</slf4j.version><!-- lines up with com.optimaize.languagedetector:language-detector -->
   </properties>
   
   <build>
@@ -79,8 +83,51 @@
               
           </plugins>
       </pluginManagement>
+
+      <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-enforcer-plugin</artifactId>
+              <version>1.4.1</version>
+              <configuration>
+                  <rules>
+                      <DependencyConvergence/>
+                  </rules>
+              </configuration>
+              <executions>
+                  <execution>
+                      <id>enforce-dependency-convergence</id>
+                      <goals>
+                          <goal>enforce</goal>
+                      </goals>
+                  </execution>
+              </executions>
+          </plugin>
+      </plugins>
+
   </build>
 
+  <dependencyManagement>
+      <dependencies>
+          <dependency>
+              <groupId>commons-lang</groupId>
+              <artifactId>commons-lang</artifactId>
+              <version>${commons.lang.version}</version>
+          </dependency>
+          <dependency>
+              <groupId>com.google.guava</groupId>
+              <artifactId>guava</artifactId>
+              <version>${guava.version}</version>
+          </dependency>
+          <dependency>
+              <groupId>junit</groupId>
+              <artifactId>junit</artifactId>
+              <version>${junit.version}</version>
+              <scope>test</scope>
+          </dependency>
+      </dependencies>
+  </dependencyManagement>
+
   <distributionManagement>
     <repository>
       <id>community-release</id>