-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7593 from ppalaga/i7505.1
Enforce dependencyConvergence in quarkus-bootstrap-core
- Loading branch information
Showing
1 changed file
with
69 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,7 +27,8 @@ | |
| <eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version> | ||
| <jboss-logging.version>3.3.2.Final</jboss-logging.version> | ||
| <junit.version>5.5.2</junit.version> | ||
| <maven-core.version>3.6.3</maven-core.version> | ||
| <maven-core.version>3.6.3</maven-core.version><!-- Keep in sync with sisu.version --> | ||
| <sisu.version>0.3.4</sisu.version><!-- Keep in sync with maven-core.version --> | ||
| <maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version> | ||
| <maven-resolver.version>1.4.1</maven-resolver.version> | ||
| <maven-wagon.version>3.3.4</maven-wagon.version> | ||
|
|
@@ -109,6 +110,10 @@ | |
| <groupId>javax.inject</groupId> | ||
| <artifactId>javax.inject</artifactId> | ||
| </exclusion> | ||
| <exclusion> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
|
|
@@ -167,6 +172,10 @@ | |
| <groupId>javax.inject</groupId> | ||
| <artifactId>javax.inject</artifactId> | ||
| </exclusion> | ||
| <exclusion> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
|
|
@@ -178,6 +187,10 @@ | |
| <groupId>javax.inject</groupId> | ||
| <artifactId>javax.inject</artifactId> | ||
| </exclusion> | ||
| <exclusion> | ||
| <groupId>org.codehaus.plexus</groupId> | ||
| <artifactId>plexus-utils</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
|
|
@@ -195,21 +208,72 @@ | |
| <groupId>org.apache.maven.resolver</groupId> | ||
| <artifactId>maven-resolver-connector-basic</artifactId> | ||
| <version>${maven-resolver.version}</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.maven.resolver</groupId> | ||
| <artifactId>maven-resolver-transport-wagon</artifactId> | ||
| <version>${maven-resolver.version}</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.maven.wagon</groupId> | ||
| <artifactId>wagon-file</artifactId> | ||
| <version>${maven-wagon.version}</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>org.codehaus.plexus</groupId> | ||
| <artifactId>plexus-utils</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.maven.wagon</groupId> | ||
| <artifactId>wagon-http</artifactId> | ||
| <version>${maven-wagon.version}</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| </exclusion> | ||
| <exclusion> | ||
| <groupId>org.codehaus.plexus</groupId> | ||
| <artifactId>plexus-utils</artifactId> | ||
| </exclusion> | ||
| <exclusion> | ||
| <groupId>commons-io</groupId> | ||
| <artifactId>commons-io</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.sisu</groupId> | ||
| <artifactId>org.eclipse.sisu.plexus</artifactId> | ||
| <version>${sisu.version}</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>org.codehaus.plexus</groupId> | ||
| <artifactId>plexus-component-annotations</artifactId> | ||
| </exclusion> | ||
| <exclusion> | ||
| <groupId>org.codehaus.plexus</groupId> | ||
| <artifactId>plexus-utils</artifactId> | ||
| </exclusion> | ||
| <exclusion> | ||
| <groupId>org.codehaus.plexus</groupId> | ||
| <artifactId>plexus-classworlds</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jboss.logging</groupId> | ||
|
|
@@ -235,7 +299,7 @@ | |
| <scope>import</scope> | ||
| <type>pom</type> | ||
| </dependency> | ||
|
|
||
| </dependencies> | ||
| </dependencyManagement> | ||
| <build> | ||
|
|
@@ -256,6 +320,7 @@ | |
| <id>enforce</id> | ||
| <configuration> | ||
| <rules> | ||
| <dependencyConvergence/> | ||
| <bannedDependencies> | ||
| <excludes> | ||
| <!-- Use Jakarta artifacts instead of JBoss specific ones --> | ||
|
|
@@ -415,11 +480,11 @@ | |
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <!-- ## IMPORTANT ## In your ~/.m2/settings.xml you | ||
| <!-- ## IMPORTANT ## In your ~/.m2/settings.xml you | ||
| need to add and edit the following profile: | ||
| <profile> | ||
| <id>release</id> | ||
| <properties> | ||
| <properties> | ||
| <gpg.useagent>false</gpg.useagent> | ||
| <gpg.executable>/usr/local/Cellar/[email protected]/1.4.23_1/bin/gpg1</gpg.executable> <- use gpg1 on Mac OS X | ||
| <gpg.homedir>~/.gnupg</gpg.homedir> <- Update to your own directory <gpg.passphrase>******</gpg.passphrase> <- Add your passphrase | ||
|
|
||