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

Maven version to 3.6.1 #802

Merged
merged 12 commits into from Jul 31, 2019
Merged

Maven version to 3.6.1 #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5d682f8
Maven version 3.6.1
suztomo Jul 24, 2019
a304f9b
Check maven version
suztomo Jul 24, 2019
46ed30b
useSystemClassLoader?
suztomo Jul 24, 2019
da0a77f
Exclude old plexus-utils dependency
suztomo Jul 24, 2019
ef5c4af
Exclusion for plexus-util
suztomo Jul 24, 2019
8a3a7bf
Using maven BOM to control plexus-util version
suztomo Jul 24, 2019
6bf73a6
Added comment
suztomo Jul 24, 2019
a925840
Merge remote-tracking branch 'origin/master' into maven_version
suztomo Jul 29, 2019
6e8da00
Merge remote-tracking branch 'origin/master' into maven_version
suztomo Jul 29, 2019
e152b86
Merge branch 'master' into maven_version
suztomo Jul 29, 2019
0a5d36b
Merge branch 'master' into maven_version
suztomo Jul 30, 2019
02c6a0e
Merge branch 'master' into maven_version
suztomo Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions enforcer-rules/pom.xml
View file
Open in desktop
Expand Up @@ -53,6 +53,19 @@
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<dependencyManagement>
<dependencies>
<!-- To avoid plexus-util version conflict (#803) -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>${maven.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<guava.version>28.0-jre</guava.version>
<resolver.version>1.4.0</resolver.version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this PR would downgrade our resolver version to 1.3.3. If so, I'm not sure we want to do that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see maven-resolver-api 1.4.0 in its dependency tree https://gist.github.com/suztomo/f3a99fa9c285c00552c751911e342b59.

Both this pom's parent (dependency-parent) and org.apache.maven:maven:3.6.1 try to set maven-resolver-api version. Seems the former wins.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just created #810 to clarify maven-related dependencies should have provided scope, because these dependencies are already there when Maven runs an enforcer rule.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #813

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

813 merged.

<maven.version>3.6.0</maven.version>
<maven.version>3.6.1</maven.version>
<truth.version>1.0</truth.version>
</properties>

Expand Down