Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enforce DependencyConvergence in parent pom #385

Merged
merged 1 commit into from
Apr 7, 2016
Merged

Enforce DependencyConvergence in parent pom #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion languagetool-commandline/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 6 additions & 1 deletion languagetool-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
84 changes: 83 additions & 1 deletion languagetool-dev/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion languagetool-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion languagetool-standalone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: -->
Expand Down
1 change: 0 additions & 1 deletion languagetool-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
<dependency>
<groupId>org.encog</groupId>
Expand Down
47 changes: 47 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down