You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2014/10/28 22:37:20 UTC
[17/35] git commit: junit test fix: the order of the extra-info
elements has changed from undefined (from Map) to predictable (from List)
junit test fix: the order of the extra-info elements has changed from undefined (from Map) to predictable (from List)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1596972 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/f1d68f9c
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/f1d68f9c
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/f1d68f9c
Branch: refs/heads/2.4.x
Commit: f1d68f9c0a577e665b89cf88a7a8771084ca3f34
Parents: 3e5c9e3
Author: Maarten Coene <ma...@apache.org>
Authored: Thu May 22 21:29:06 2014 +0000
Committer: Maarten Coene <ma...@apache.org>
Committed: Thu May 22 21:29:06 2014 +0000
----------------------------------------------------------------------
.../xml/test-write-extrainfo-from-maven.xml | 110 +++++++++----------
1 file changed, 55 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/f1d68f9c/test/java/org/apache/ivy/plugins/parser/xml/test-write-extrainfo-from-maven.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/test-write-extrainfo-from-maven.xml b/test/java/org/apache/ivy/plugins/parser/xml/test-write-extrainfo-from-maven.xml
index 1c18cd4..40c5fb2 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/test-write-extrainfo-from-maven.xml
+++ b/test/java/org/apache/ivy/plugins/parser/xml/test-write-extrainfo-from-maven.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
- <info organisation="org.apache"
- module="test-depMgt"
- revision="1.0"
- status="release"
- publication="20140429153143"
- >
- <description homepage="http://ivy.jayasoft.org/" />
- <m:properties__commons.logging.version>1.0.4</m:properties__commons.logging.version>
- <m:properties__commons.collections.version>1.0.5</m:properties__commons.collections.version>
- <m:dependency.management__commons-logging__commons-logging__version>1.0.4</m:dependency.management__commons-logging__commons-logging__version>
- <m:dependency.management__commons-collections__commons-collections__version>1.0.5</m:dependency.management__commons-collections__commons-collections__version>
- <m:dependency.management__commons-collections__commons-collections__exclusion_0>javax.mail__mail</m:dependency.management__commons-collections__commons-collections__exclusion_0>
- <m:dependency.management__commons-collections__commons-collections__exclusion_1>javax.jms__jms</m:dependency.management__commons-collections__commons-collections__exclusion_1>
- </info>
- <configurations>
- <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
- <conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
- <conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
- <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
- <conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
- <conf name="test" visibility="private" description="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." extends="runtime"/>
- <conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
- <conf name="sources" visibility="public" description="this configuration contains the source artifact of this module, if any."/>
- <conf name="javadoc" visibility="public" description="this configuration contains the javadoc artifact of this module, if any."/>
- <conf name="optional" visibility="public" description="contains all optional dependencies"/>
- </configurations>
- <publications>
- <artifact name="test-depMgt" type="jar" ext="jar" conf="master"/>
- </publications>
- <dependencies>
- <dependency org="commons-logging" name="commons-logging" rev="1.0.4" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <override org="commons-logging" module="commons-logging" matcher="exact" rev="1.0.4"/>
- <override org="commons-collections" module="commons-collections" matcher="exact" rev="1.0.5"/>
- </dependencies>
-</ivy-module>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
+ <info organisation="org.apache"
+ module="test-depMgt"
+ revision="1.0"
+ status="release"
+ publication="20140429153143"
+ >
+ <description homepage="http://ivy.jayasoft.org/" />
+ <m:properties__commons.collections.version>1.0.5</m:properties__commons.collections.version>
+ <m:properties__commons.logging.version>1.0.4</m:properties__commons.logging.version>
+ <m:dependency.management__commons-logging__commons-logging__version>1.0.4</m:dependency.management__commons-logging__commons-logging__version>
+ <m:dependency.management__commons-collections__commons-collections__version>1.0.5</m:dependency.management__commons-collections__commons-collections__version>
+ <m:dependency.management__commons-collections__commons-collections__exclusion_0>javax.mail__mail</m:dependency.management__commons-collections__commons-collections__exclusion_0>
+ <m:dependency.management__commons-collections__commons-collections__exclusion_1>javax.jms__jms</m:dependency.management__commons-collections__commons-collections__exclusion_1>
+ </info>
+ <configurations>
+ <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
+ <conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
+ <conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
+ <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
+ <conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
+ <conf name="test" visibility="private" description="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." extends="runtime"/>
+ <conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
+ <conf name="sources" visibility="public" description="this configuration contains the source artifact of this module, if any."/>
+ <conf name="javadoc" visibility="public" description="this configuration contains the javadoc artifact of this module, if any."/>
+ <conf name="optional" visibility="public" description="contains all optional dependencies"/>
+ </configurations>
+ <publications>
+ <artifact name="test-depMgt" type="jar" ext="jar" conf="master"/>
+ </publications>
+ <dependencies>
+ <dependency org="commons-logging" name="commons-logging" rev="1.0.4" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <override org="commons-logging" module="commons-logging" matcher="exact" rev="1.0.4"/>
+ <override org="commons-collections" module="commons-collections" matcher="exact" rev="1.0.5"/>
+ </dependencies>
+</ivy-module>