You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/12/15 10:46:42 UTC
[maven-common-artifact-filters] branch master updated:
[MSHARED-683] Use maven-resolver instead of (eclipse-)aether / Require Java
7
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-common-artifact-filters.git
The following commit(s) were added to refs/heads/master by this push:
new 1621380 [MSHARED-683] Use maven-resolver instead of (eclipse-)aether / Require Java 7
1621380 is described below
commit 1621380244af5b5884736b6c8007c18157fba3b6
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Dec 15 11:46:39 2018 +0100
[MSHARED-683] Use maven-resolver instead of (eclipse-)aether / Require Java 7
---
pom.xml | 19 ++++++++++---------
.../filter/resolve/transform/ArtifactIncludeNode.java | 2 +-
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 76746ae..2629ac3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
<parent>
<artifactId>maven-shared-components</artifactId>
<groupId>org.apache.maven.shared</groupId>
- <version>30</version>
- <relativePath>../../pom/maven/maven-shared-components/pom.xml</relativePath>
+ <version>33</version>
+ <relativePath/>
</parent>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<name>Apache Maven Common Artifact Filters</name>
<description>A collection of ready-made filters to control inclusion/exclusion of artifacts during dependency resolution.</description>
@@ -56,6 +56,7 @@
<properties>
<maven.version>3.0</maven.version>
+ <javaVersion>7</javaVersion>
</properties>
<dependencies>
@@ -99,15 +100,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>0.9.0.M2</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-api</artifactId>
+ <version>1.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>0.9.0.M2</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <version>1.3.1</version>
<scope>provided</scope>
</dependency>
diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeNode.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeNode.java
index aa2c5fc..b5e03d2 100644
--- a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeNode.java
+++ b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeNode.java
@@ -32,7 +32,7 @@ class ArtifactIncludeNode implements Node
{
private final Artifact artifact;
- public ArtifactIncludeNode( Artifact artifact )
+ ArtifactIncludeNode( Artifact artifact )
{
this.artifact = artifact;
}