You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2016/11/30 23:15:27 UTC
ant-ivy git commit: Made the maven 'test' configuration public so we
can use the test-jar as dependency (IVY-1444)
Repository: ant-ivy
Updated Branches:
refs/heads/master 7217b9d27 -> ac266c0e4
Made the maven 'test' configuration public so we can use the test-jar as dependency (IVY-1444)
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/ac266c0e
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/ac266c0e
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/ac266c0e
Branch: refs/heads/master
Commit: ac266c0e40b5d09f9f9f1e300f358ee1532f7aa5
Parents: 7217b9d
Author: Maarten Coene <ma...@apache.org>
Authored: Thu Dec 1 00:13:23 2016 +0100
Committer: Maarten Coene <ma...@apache.org>
Committed: Thu Dec 1 00:13:23 2016 +0100
----------------------------------------------------------------------
doc/release-notes.html | 1 +
.../parser/m2/PomModuleDescriptorBuilder.java | 31 ++++----------------
2 files changed, 6 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ac266c0e/doc/release-notes.html
----------------------------------------------------------------------
diff --git a/doc/release-notes.html b/doc/release-notes.html
index bb8d3e8..085e494 100644
--- a/doc/release-notes.html
+++ b/doc/release-notes.html
@@ -58,6 +58,7 @@ http://issues.apache.org/jira/browse/ivy
List of changes since Ivy 2.4.0:
+- FIX: Made the maven 'test' configuration public so we can use the test-jar as dependency (IVY-1444)
- FIX: NullPointerException in dependencytree with no dependencies (IVY-1539)
- FIX: checkIfChanged is not settable attribute for checkdepsupdate ant task (IVY-1549)
- FIX: ArrayIndexOutOfBoundsException when using a p2 repository for dependencies (IVY-1504)
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ac266c0e/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
index 4d13efc..b1463d9 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
@@ -17,34 +17,10 @@
*/
package org.apache.ivy.plugins.parser.m2;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.core.cache.ArtifactOrigin;
-import org.apache.ivy.core.module.descriptor.Artifact;
-import org.apache.ivy.core.module.descriptor.Configuration;
+import org.apache.ivy.core.module.descriptor.*;
import org.apache.ivy.core.module.descriptor.Configuration.Visibility;
-import org.apache.ivy.core.module.descriptor.DefaultArtifact;
-import org.apache.ivy.core.module.descriptor.DefaultDependencyArtifactDescriptor;
-import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
-import org.apache.ivy.core.module.descriptor.DefaultExcludeRule;
-import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
-import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
-import org.apache.ivy.core.module.descriptor.ExtraInfoHolder;
-import org.apache.ivy.core.module.descriptor.License;
-import org.apache.ivy.core.module.descriptor.MDArtifact;
-import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
-import org.apache.ivy.core.module.descriptor.OverrideDependencyDescriptorMediator;
import org.apache.ivy.core.module.id.ArtifactId;
import org.apache.ivy.core.module.id.ModuleId;
import org.apache.ivy.core.module.id.ModuleRevisionId;
@@ -57,6 +33,9 @@ import org.apache.ivy.plugins.repository.Resource;
import org.apache.ivy.plugins.resolver.DependencyResolver;
import org.apache.ivy.util.Message;
+import java.util.*;
+import java.util.Map.Entry;
+
/**
* Build a module descriptor. This class handle the complexity of the structure of an ivy
* ModuleDescriptor and isolate the PomModuleDescriptorParser from it.
@@ -90,7 +69,7 @@ public class PomModuleDescriptorBuilder {
null),
new Configuration(
"test",
- Visibility.PRIVATE,
+ Visibility.PUBLIC,
"this scope indicates that the dependency is not required for normal use of "
+ "the application, and is only available for the test compilation and "
+ "execution phases.", new String[] {"runtime"}, true, null),