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

Add dependency convergence checks #700

Merged
merged 1 commit into from
Mar 22, 2019
Merged

Add dependency convergence checks #700

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
6 changes: 6 additions & 0 deletions framework/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
</plugins>
</build>

<dependencies>
Expand Down
90 changes: 74 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,17 @@

<tika.version>1.20</tika.version>
<jackson.version>2.9.8</jackson.version>
<log4j.version>2.11.1</log4j.version>
<slf4j.version>1.8.0-beta4</slf4j.version>
<log4j.version>2.11.2</log4j.version>
<jansi.version>1.17.1</jansi.version>
<jersey.version>2.27</jersey.version>
<jersey.version>2.28</jersey.version>

<!--
Because elasticsearch is not using transitive dependencies, we need to be explicit here
-->
<commons-logging.version>1.2</commons-logging.version>
<commons-codec.version>1.11</commons-codec.version>
<snakeyaml.version>1.23</snakeyaml.version>
<httpclient.version>4.5.7</httpclient.version>

<!-- Non Apache2 Compatible licenses -->
<levigo.version>2.0</levigo.version>
Expand Down Expand Up @@ -304,8 +311,20 @@
<requireJavaVersion>
<version>${java.compiler.version}</version>
</requireJavaVersion>
<dependencyConvergence/>
<requireMavenVersion>
<version>3.3</version>
</requireMavenVersion>
</rules>
</configuration>
<executions>
<execution>
<id>enforce</id>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -510,6 +529,19 @@
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<!--
Because elasticsearch is not using transitive dependencies, we need to be explicit here
-->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>

<dependency>
<groupId>org.apache.tika</groupId>
Expand All @@ -521,6 +553,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<!-- org.slf4j:slf4j-api:1.7.25 -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<!-- Not Apache2 License compatible -->
<exclusion>
<groupId>edu.ucar</groupId>
Expand Down Expand Up @@ -607,6 +644,16 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
</exclusion>
<!-- org.slf4j:slf4j-api:1.7.25 -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<!-- com.google.guava:guava:17.0 vs com.google.guava:guava:27.0.1-jre -->
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--Dependency for parsing remote ssh directory [http://www.jcraft.com/jsch/]-->
Expand Down Expand Up @@ -652,6 +699,12 @@
<version>${log4j.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
Expand Down Expand Up @@ -682,20 +735,13 @@
<version>${jansi.version}</version>
<optional>true</optional>
</dependency>
<!--
Because elasticsearch is not using transitive dependencies, we need to be explicit here
-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
</dependency>

<dependency>
Expand All @@ -704,6 +750,18 @@
<version>2.5</version>
</dependency>

<!-- Used by elasticsearch client and tika parsers -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.hamcrest</groupId>
Expand Down
9 changes: 9 additions & 0 deletions test-documents/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,13 @@
<artifactId>fscrawler-test-documents</artifactId>
<name>FSCrawler Test Documents</name>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>
2 changes: 1 addition & 1 deletion test-framework/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
</plugins>
</build>
Expand Down
6 changes: 6 additions & 0 deletions tika/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down