Hi, All!
I'm using conf's to retrieve libraries into different subdirectories of
"lib" directory, for example, "common->runtime" or "build->common".
Currently, during resolution process, conf of dependency is replaced with
conf of dependee. In some cases, e.g. for servlet-api.jar, it is
undesirable to have servlet-api.jar retrieved into "common" or "runtime".
The idea is to add optional "keepDepConf" attribute for conf mapping having
"false" as default value to not affect existing ivy.xml files. When
"keepDepConf" is set to "true" then conf of dependency is preserved (not
changed).
Please find attached diff file against Ivy 2.4.0-rc1, which contains code
and documentation changes as well as unit test. I would ask contributors to
include these changes into Ivy codebase.
Best regards,
Eugene.
diff -urN apache-ivy-2.4.0-rc1/doc/ivy.xsd apache-ivy/doc/ivy.xsd
--- apache-ivy-2.4.0-rc1/doc/ivy.xsd 2014-09-19 20:40:20.172962400 +0300
+++ apache-ivy/doc/ivy.xsd 2014-09-20 00:10:43.553978500 +0300
@@ -167,11 +167,13 @@
<xs:element name="mapped" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:attribute name="name" type="xs:string"
use="required"/>
+
<xs:attribute name="keepDepConf" type="xs:boolean"
default="false"/>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="mapped" type="xs:string"/>
+
<xs:attribute name="keepDepConf" type="xs:boolean" default="false"/>
</xs:complexType>
</xs:element>
<xs:element name="artifact" minOccurs="0" maxOccurs="unbounded">
@@ -238,6 +240,7 @@
<xs:attribute
name="changing" type="xs:boolean" default="false"/>
<xs:attribute
name="transitive" type="xs:boolean" default="true"/>
<xs:attribute
name="conf" type="xs:string"/>
+ <xs:attribute
name="keepDepConf" type="xs:boolean" default="false"/>
<xs:anyAttribute
namespace="##other" processContents="lax" />
</xs:complexType>
</xs:element>
diff -urN apache-ivy-2.4.0-rc1/doc/ivyfile/dependency-conf.html
apache-ivy/doc/ivyfile/dependency-conf.html
--- apache-ivy-2.4.0-rc1/doc/ivyfile/dependency-conf.html 2014-09-19
20:40:20.829999900 +0300
+++ apache-ivy/doc/ivyfile/dependency-conf.html 2014-09-19 23:59:35.825786600
+0300
@@ -42,6 +42,8 @@
<tr><td>mapped</td><td>a comma separated list of dependency configurations
to which this
master configuration should be mapped</td>
<td>No, default to the same configuration as master one, unless nested
mapped elements are specified</td></tr>
+ <tr><td>keepDepConf</td><td>do not remap (do not change) original
configuration of dependency when '->' is used</td>
+ <td>No, defaults to false</td></tr>
</tbody>
</table>
<h1>Child elements</h1>
diff -urN apache-ivy-2.4.0-rc1/doc/ivyfile/dependency.html
apache-ivy/doc/ivyfile/dependency.html
--- apache-ivy-2.4.0-rc1/doc/ivyfile/dependency.html 2014-09-19
20:40:20.637989000 +0300
+++ apache-ivy/doc/ivyfile/dependency.html 2014-09-20 00:01:59.908027600
+0300
@@ -172,6 +172,8 @@
<td>No, defaults to true</td></tr>
<tr><td>changing</td><td>true if the dependency artifacts may change
without revision change, false otherwise (<span class="since">since
1.2</span>). See <a href="../concept.html#change">cache and change
management</a> for details.</td>
<td>No, defaults to false</td></tr>
+ <tr><td>keepDepConf</td><td>do not remap (do not change) original
configuration of dependency when '->' is used</td>
+ <td>No, defaults to false</td></tr>
</tbody>
</table>
<h1>Child elements</h1>
diff -urN apache-ivy-2.4.0-rc1/doc/ivyfile/mapped.html
apache-ivy/doc/ivyfile/mapped.html
--- apache-ivy-2.4.0-rc1/doc/ivyfile/mapped.html 2014-09-19
20:40:20.731994300 +0300
+++ apache-ivy/doc/ivyfile/mapped.html 2014-09-20 00:03:47.082157600 +0300
@@ -38,6 +38,8 @@
<tr><td>name</td><td>the name of the dependency configuration mapped.
'*' wildcard can be used to designate all configurations of this
module</td>
<td>Yes</td></tr>
+ <tr><td>keepDepConf</td><td>do not remap (do not change) original
configuration of dependency when '->' is used</td>
+ <td>No, defaults to false</td></tr>
</tbody>
</table>
diff -urN apache-ivy-2.4.0-rc1/RELEASE_NOTES apache-ivy/RELEASE_NOTES
--- apache-ivy-2.4.0-rc1/RELEASE_NOTES 2014-09-19 20:40:16.652761000 +0300
+++ apache-ivy/RELEASE_NOTES 2014-09-20 00:13:51.430724400 +0300
@@ -94,6 +94,7 @@
- IMPROVEMENT: useOrigin will do avoid copy with url resolvers configured with
a 'file:/' URL
- IMPROVEMENT: add support for source artifacts in buildobr task
- IMPROVEMENT: add possibility to configure the User-Agent http header by
setting a property http.agent (Thanks to Tony Likhite)
+- IMPROVEMENT: added ability to keep original conf of dependency when
configuration mapping is used through adding of new keepDepConf attribute
- FIX: In IvyDE, Ivy fails to parse ivy-settings.xml file if it contains <pgp>
element (thanks to Gregory Amerson) (IVY-1441)
- FIX: ParseException when "Bundle-Description" is present in OSGi MANIFEST.MF
(IVY-1438)
diff -urN apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/ant/IvyDependency.java
apache-ivy/src/java/org/apache/ivy/ant/IvyDependency.java
--- apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/ant/IvyDependency.java
2014-09-19 20:40:14.374630700 +0300
+++ apache-ivy/src/java/org/apache/ivy/ant/IvyDependency.java 2014-09-20
00:27:54.024918000 +0300
@@ -56,6 +56,8 @@
private boolean transitive = true;
+ private boolean keepDepConf = false;
+
public IvyDependencyConf createConf() {
IvyDependencyConf c = new IvyDependencyConf();
confs.add(c);
@@ -144,6 +146,14 @@
this.transitive = transitive;
}
+ public boolean isKeepDepConf() {
+ return keepDepConf;
+ }
+
+ public void setKeepDepConf(final boolean keepDepConf) {
+ this.keepDepConf = keepDepConf;
+ }
+
DependencyDescriptor asDependencyDescriptor(ModuleDescriptor md, String
masterConf,
IvySettings settings) {
if (org == null) {
@@ -154,7 +164,7 @@
}
ModuleRevisionId mrid = ModuleRevisionId.newInstance(org, name,
branch, rev);
DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(md,
mrid, force, changing,
- transitive);
+ transitive, keepDepConf);
if (conf != null) {
dd.addDependencyConfiguration(masterConf, conf);
} else {
diff -urN
apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
apache-ivy/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
---
apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
2014-09-19 20:40:16.581757000 +0300
+++
apache-ivy/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
2014-09-20 00:41:16.386810500 +0300
@@ -88,7 +88,8 @@
ModuleRevisionId transformDynamicMrid = t.transform(dd
.getDynamicConstraintDependencyRevisionId());
DefaultDependencyDescriptor newdd = new
DefaultDependencyDescriptor(null, transformMrid,
- transformDynamicMrid, dd.isForce(), dd.isChanging(),
dd.isTransitive());
+ transformDynamicMrid, dd.isForce(), dd.isChanging(),
dd.isTransitive(),
+ dd.isKeepDepConf());
newdd.parentId = transformParentId;
ModuleRevisionId sourceModule = dd.getSourceModule();
@@ -158,6 +159,8 @@
private boolean isTransitive = true;
+ private boolean keepDepConf = false;
+
/**
* This namespace should be used to check
*/
@@ -186,6 +189,7 @@
isForce = dd.isForce;
isChanging = dd.isChanging;
isTransitive = dd.isTransitive;
+ keepDepConf = dd.keepDepConf;
namespace = dd.namespace;
confs.putAll(dd.confs);
excludeRules = dd.excludeRules == null ? null : new
LinkedHashMap(dd.excludeRules);
@@ -200,6 +204,11 @@
this(md, mrid, mrid, force, changing, transitive);
}
+ public DefaultDependencyDescriptor(ModuleDescriptor md, ModuleRevisionId
mrid, boolean force,
+ boolean changing, boolean transitive,
boolean keepDepConf) {
+ this(md, mrid, mrid, force, changing, transitive, keepDepConf);
+ }
+
public DefaultDependencyDescriptor(ModuleRevisionId mrid, boolean force) {
this(mrid, force, false);
}
@@ -222,6 +231,22 @@
sourceModule = md == null ? null : md.getModuleRevisionId();
}
+ public DefaultDependencyDescriptor(ModuleDescriptor md, ModuleRevisionId
mrid,
+ ModuleRevisionId dynamicConstraint, boolean force, boolean
changing, boolean transitive,
+ boolean keepDepConf) {
+ Checks.checkNotNull(mrid, "mrid");
+ Checks.checkNotNull(dynamicConstraint, "dynamicConstraint");
+
+ this.md = md;
+ revId = mrid;
+ dynamicRevId = dynamicConstraint;
+ isForce = force;
+ isChanging = changing;
+ isTransitive = transitive;
+ this.keepDepConf = keepDepConf;
+ sourceModule = md == null ? null : md.getModuleRevisionId();
+ }
+
public ModuleId getDependencyId() {
return getDependencyRevisionId().getModuleId();
}
@@ -635,6 +660,14 @@
return isTransitive;
}
+ public boolean isKeepDepConf() {
+ return keepDepConf;
+ }
+
+ public void setKeepDepConf(boolean keepDepConf) {
+ this.keepDepConf = keepDepConf;
+ }
+
public Namespace getNamespace() {
return namespace;
}
diff -urN
apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
apache-ivy/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
---
apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
2014-09-19 20:40:16.503752500 +0300
+++
apache-ivy/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
2014-09-20 18:30:58.178994700 +0300
@@ -82,6 +82,25 @@
return moduleDescriptor;
}
+ public static DefaultModuleDescriptor newCallerInstance(ModuleRevisionId
mrid, String[] confs,
+ boolean transitive, boolean changing, boolean keepDepConf) {
+ DefaultModuleDescriptor moduleDescriptor = new DefaultModuleDescriptor(
+ ModuleRevisionId.newInstance(mrid.getOrganisation(),
mrid.getName() + "-caller",
+ "working"), "integration", null, true);
+ for (int i = 0; i < confs.length; i++) {
+ moduleDescriptor.addConfiguration(new Configuration(confs[i]));
+ }
+ moduleDescriptor.setLastModified(System.currentTimeMillis());
+ DefaultDependencyDescriptor dd = new
DefaultDependencyDescriptor(moduleDescriptor, mrid,
+ true, changing, transitive, keepDepConf);
+ for (int j = 0; j < confs.length; j++) {
+ dd.addDependencyConfiguration(confs[j], confs[j]);
+ }
+ moduleDescriptor.addDependency(dd);
+
+ return moduleDescriptor;
+ }
+
public static DefaultModuleDescriptor newCallerInstance(ModuleRevisionId[]
mrid,
boolean transitive, boolean changing) {
DefaultModuleDescriptor moduleDescriptor = new DefaultModuleDescriptor(
@@ -99,6 +118,23 @@
return moduleDescriptor;
}
+ public static DefaultModuleDescriptor newCallerInstance(ModuleRevisionId[]
mrid,
+ boolean transitive, boolean changing, boolean keepDepConf) {
+ DefaultModuleDescriptor moduleDescriptor = new DefaultModuleDescriptor(
+ ModuleRevisionId.newInstance("caller", "all-caller",
"working"), "integration",
+ null, true);
+ moduleDescriptor.addConfiguration(new
Configuration(DEFAULT_CONFIGURATION));
+ moduleDescriptor.setLastModified(System.currentTimeMillis());
+ for (int i = 0; i < mrid.length; i++) {
+ DefaultDependencyDescriptor dd = new
DefaultDependencyDescriptor(moduleDescriptor,
+ mrid[i], true, changing, transitive, keepDepConf);
+ dd.addDependencyConfiguration(DEFAULT_CONFIGURATION, "*");
+ moduleDescriptor.addDependency(dd);
+ }
+
+ return moduleDescriptor;
+ }
+
public static DefaultModuleDescriptor newDefaultInstance(ModuleRevisionId
mrid,
DependencyArtifactDescriptor[] artifacts) {
DefaultModuleDescriptor moduleDescriptor = new
DefaultModuleDescriptor(mrid, "release",
diff -urN
apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/core/module/descriptor/DependencyDescriptor.java
apache-ivy/src/java/org/apache/ivy/core/module/descriptor/DependencyDescriptor.java
---
apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/core/module/descriptor/DependencyDescriptor.java
2014-09-19 20:40:15.841714600 +0300
+++
apache-ivy/src/java/org/apache/ivy/core/module/descriptor/DependencyDescriptor.java
2014-09-20 18:32:51.440472900 +0300
@@ -64,6 +64,8 @@
boolean isTransitive();
+ boolean isKeepDepConf();
+
ModuleRevisionId getParentRevisionId();
/**
diff -urN
apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
apache-ivy/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
---
apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
2014-09-19 20:40:13.397574800 +0300
+++
apache-ivy/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
2014-09-20 18:38:31.235908100 +0300
@@ -165,6 +165,7 @@
}
}
} else if (ops.length == 2) {
+ final boolean keepDepConf = dd.isKeepDepConf();
String[] modConfs = ops[0].split(",");
String[] depConfs = ops[1].split(",");
for (int j = 0; j < modConfs.length; j++) {
@@ -172,7 +173,12 @@
String mappedDependency = evaluateConditions ?
evaluateCondition(
depConfs[k].trim(), dd) : depConfs[k].trim();
if (mappedDependency != null) {
-
dd.addDependencyConfiguration(modConfs[j].trim(), mappedDependency);
+ if (keepDepConf) {
+
dd.addDependencyConfiguration(mappedDependency, mappedDependency);
+ }
+ else {
+
dd.addDependencyConfiguration(modConfs[j].trim(), mappedDependency);
+ }
}
}
}
diff -urN
apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
apache-ivy/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
---
apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
2014-09-19 20:40:12.988551400 +0300
+++
apache-ivy/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
2014-09-20 19:05:12.017467600 +0300
@@ -88,7 +88,8 @@
*/
public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser {
static final String[] DEPENDENCY_REGULAR_ATTRIBUTES = new String[] {"org",
"name", "branch",
- "branchConstraint", "rev", "revConstraint", "force", "transitive",
"changing", "conf"};
+ "branchConstraint", "rev", "revConstraint", "force", "transitive",
"changing", "conf",
+ "keepDepConf"};
private static final XmlModuleDescriptorParser INSTANCE = new
XmlModuleDescriptorParser();
@@ -907,6 +908,10 @@
boolean transitive = (transitiveValue == null) ? true :
Boolean.valueOf(
attributes.getValue("transitive")).booleanValue();
+ String keepDepConfValue =
settings.substitute(attributes.getValue("keepDepConf"));
+ boolean keepDepConf = (keepDepConfValue == null) ? false :
Boolean.valueOf(
+ attributes.getValue("keepDepConf")).booleanValue();
+
String name = settings.substitute(attributes.getValue("name"));
String branch = settings.substitute(attributes.getValue("branch"));
String branchConstraint =
settings.substitute(attributes.getValue("branchConstraint"));
@@ -944,7 +949,7 @@
}
dd = new DefaultDependencyDescriptor(getMd(), revId, dynamicId,
force, changing,
- transitive);
+ transitive, keepDepConf);
getMd().addDependency(dd);
String confs = settings.substitute(attributes.getValue("conf"));
if (confs != null && confs.length() > 0) {
diff -urN
apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
apache-ivy/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
---
apache-ivy-2.4.0-rc1/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
2014-09-19 20:40:12.944548900 +0300
+++
apache-ivy/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
2014-09-20 19:08:41.880471000 +0300
@@ -160,6 +160,9 @@
}
}
out.print("\"");
+ if (dep.isKeepDepConf()) {
+ out.print(" keepDepConf=\"" + dep.isKeepDepConf() + "\"");
+ }
printExtraAttributes(dep, out, " ");
Files apache-ivy-2.4.0-rc1/test/jar-repos/jarrepo1.jar and
apache-ivy/test/jar-repos/jarrepo1.jar differ
Files apache-ivy-2.4.0-rc1/test/jar-repos/jarrepo1_subdir.jar and
apache-ivy/test/jar-repos/jarrepo1_subdir.jar differ
diff -urN
apache-ivy-2.4.0-rc1/test/java/org/apache/ivy/core/resolve/ResolveTest.java
apache-ivy/test/java/org/apache/ivy/core/resolve/ResolveTest.java
--- apache-ivy-2.4.0-rc1/test/java/org/apache/ivy/core/resolve/ResolveTest.java
2014-09-19 20:39:52.480378400 +0300
+++ apache-ivy/test/java/org/apache/ivy/core/resolve/ResolveTest.java
2014-09-20 21:20:45.240661300 +0300
@@ -5628,4 +5628,22 @@
assertEquals(new File(adr.getUnpackedLocalFile(),
"META-INF/MANIFEST.MF"),
jarContents[0].listFiles()[0]);
}
+
+ public void testKeepDepConf() throws Exception {
+ Ivy ivy = new Ivy();
+ ivy.configure(new
File("test/repositories/keepDepConf/ivysettings.xml"));
+ ResolveReport report = ivy.resolve(new
File("test/repositories/keepDepConf/module1/ivy.xml"),
+ getResolveOptions(new String[] {"*"}));
+ assertNotNull(report);
+ assertFalse(report.hasError());
+
+ ConfigurationResolveReport crr =
report.getConfigurationReport("common");
+ assertNotNull(crr);
+ assertEquals(0, crr.getArtifactsNumber());
+
+ crr = report.getConfigurationReport("runtime");
+ assertNotNull(crr);
+ assertEquals(1, crr.getArtifactsNumber());
+ }
+
}
diff -urN apache-ivy-2.4.0-rc1/test/repositories/checkmodified/ivy-1.0.xml
apache-ivy/test/repositories/checkmodified/ivy-1.0.xml
--- apache-ivy-2.4.0-rc1/test/repositories/checkmodified/ivy-1.0.xml
1970-01-01 02:00:00.000000000 +0200
+++ apache-ivy/test/repositories/checkmodified/ivy-1.0.xml 2005-05-01
11:00:00.000000000 +0300
@@ -0,0 +1,29 @@
+<!--
+ 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="1.0">
+ <info organisation="org1"
+ module="mod1.1"
+ revision="1.0"
+ status="integration"
+ publication="20050501110000"
+ />
+ <dependencies>
+ <dependency name="mod1.2" rev="2.1"/>
+ </dependencies>
+</ivy-module>
diff -urN apache-ivy-2.4.0-rc1/test/repositories/checkmodified/mod1.1-1.0.jar
apache-ivy/test/repositories/checkmodified/mod1.1-1.0.jar
--- apache-ivy-2.4.0-rc1/test/repositories/checkmodified/mod1.1-1.0.jar
1970-01-01 02:00:00.000000000 +0200
+++ apache-ivy/test/repositories/checkmodified/mod1.1-1.0.jar 2014-09-19
20:39:57.596000000 +0300
@@ -0,0 +1 @@
+after
\ No newline at end of file
diff -urN apache-ivy-2.4.0-rc1/test/repositories/keepDepConf/ivysettings.xml
apache-ivy/test/repositories/keepDepConf/ivysettings.xml
--- apache-ivy-2.4.0-rc1/test/repositories/keepDepConf/ivysettings.xml
1970-01-01 02:00:00.000000000 +0200
+++ apache-ivy/test/repositories/keepDepConf/ivysettings.xml 2014-09-20
20:53:17.117394100 +0300
@@ -0,0 +1,31 @@
+<!--
+ 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.
+-->
+<ivysettings>
+ <settings defaultResolver="myresolver" defaultConflictManager="all"/>
+ <version-matchers usedefaults="true"/>
+ <resolvers>
+ <url name="myresolver">
+ <ivy
pattern="${ivy.settings.dir.url}/[module]/ivy.xml"/>
+ <artifact
pattern="${ivy.settings.dir.url}/[module]/[artifact].[ext]"/>
+ </url>
+ </resolvers>
+ <modules>
+ <module organisation="myorg" name=".*"
conflict-manager="latest-revision"/>
+ </modules>
+</ivysettings>
diff -urN apache-ivy-2.4.0-rc1/test/repositories/keepDepConf/module1/ivy.xml
apache-ivy/test/repositories/keepDepConf/module1/ivy.xml
--- apache-ivy-2.4.0-rc1/test/repositories/keepDepConf/module1/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++ apache-ivy/test/repositories/keepDepConf/module1/ivy.xml 2014-09-20
21:01:40.581190500 +0300
@@ -0,0 +1,31 @@
+<!--
+ 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">
+ <info organisation="myorg" module="module1"/>
+ <configurations>
+ <conf name="common"/>
+ <conf name="runtime"/>
+ </configurations>
+ <publications>
+ <artifact name="module1" type="bin" ext="jar" conf="common"/>
+ </publications>
+ <dependencies>
+ <dependency org="myorg" name="module2" rev="1.0"
conf="common->runtime" keepDepConf="true"/>
+ </dependencies>
+</ivy-module>
Files apache-ivy-2.4.0-rc1/test/repositories/keepDepConf/module1/module1.jar
and apache-ivy/test/repositories/keepDepConf/module1/module1.jar differ
diff -urN apache-ivy-2.4.0-rc1/test/repositories/keepDepConf/module2/ivy.xml
apache-ivy/test/repositories/keepDepConf/module2/ivy.xml
--- apache-ivy-2.4.0-rc1/test/repositories/keepDepConf/module2/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++ apache-ivy/test/repositories/keepDepConf/module2/ivy.xml 2014-09-18
00:05:40.913057000 +0300
@@ -0,0 +1,28 @@
+<!--
+ 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">
+ <info organisation="myorg" module="module2" revision="1.0"/>
+ <configurations>
+ <conf name="common"/>
+ <conf name="runtime"/>
+ </configurations>
+ <publications>
+ <artifact name="module2" type="bin" ext="jar" conf="runtime"/>
+ </publications>
+</ivy-module>
Files apache-ivy-2.4.0-rc1/test/repositories/keepDepConf/module2/module2.jar
and apache-ivy/test/repositories/keepDepConf/module2/module2.jar differ
diff -urN apache-ivy-2.4.0-rc1/test/repositories/norevision/ivy-mod1.1.xml
apache-ivy/test/repositories/norevision/ivy-mod1.1.xml
--- apache-ivy-2.4.0-rc1/test/repositories/norevision/ivy-mod1.1.xml
1970-01-01 02:00:00.000000000 +0200
+++ apache-ivy/test/repositories/norevision/ivy-mod1.1.xml 2005-05-01
11:00:00.000000000 +0300
@@ -0,0 +1,29 @@
+<!--
+ 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="1.0">
+ <info organisation="org1"
+ module="mod1.1"
+ revision="1.1"
+ status="integration"
+ publication="20050501110000"
+ />
+ <dependencies>
+ <dependency name="mod1.2" rev="2.1"/>
+ </dependencies>
+</ivy-module>
diff -urN apache-ivy-2.4.0-rc1/test/repositories/norevision/mod1.1.jar
apache-ivy/test/repositories/norevision/mod1.1.jar
--- apache-ivy-2.4.0-rc1/test/repositories/norevision/mod1.1.jar
1970-01-01 02:00:00.000000000 +0200
+++ apache-ivy/test/repositories/norevision/mod1.1.jar 2014-09-19
20:40:05.645000000 +0300
@@ -0,0 +1 @@
+after
\ No newline at end of file
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.exporting.ambiguity_3.3.3.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.exporting.ambiguity_3.3.3.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.ambiguity_3.2.1.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.ambiguity_3.2.1.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.jrepackage_1.2.3.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.jrepackage_1.2.3.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.optional_3.2.1.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.optional_3.2.1.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.rangeversion_3.2.1.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.rangeversion_3.2.1.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.transitiveoptional_3.2.1.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.transitiveoptional_3.2.1.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.use_3.2.1.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.use_3.2.1.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.version_3.2.1.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing.version_3.2.1.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing_3.2.1.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.importing_3.2.1.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.require.ambiguity_1.1.1.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.require.ambiguity_1.1.1.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.require_1.1.1.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.require_1.1.1.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.requirejre_2.2.2.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.requirejre_2.2.2.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.use_2.2.2.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle.use_2.2.2.jar
differ
Files
apache-ivy-2.4.0-rc1/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle_1.2.3.jar
and
apache-ivy/test/test-repo/bundlerepo/org.apache.ivy.osgi.testbundle_1.2.3.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle/1.2.3/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle/1.2.3/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle/1.2.3/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle/1.2.3/ivy.xml
2014-09-20 21:21:42.605942400 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi" module="testbundle"
revision="1.2.3" />
+ <publications>
+ <artifact name="testbundle" type="jar" ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle/1.2.3/jars/testbundle-1.2.3.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle/1.2.3/jars/testbundle-1.2.3.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-exporting-ambiguity/3.3.3/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-exporting-ambiguity/3.3.3/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-exporting-ambiguity/3.3.3/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-exporting-ambiguity/3.3.3/ivy.xml
2014-09-20 21:21:42.251922200 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi"
module="testbundle-exporting-ambiguity" revision="3.3.3" />
+ <publications>
+ <artifact name="testbundle-exporting-ambiguity" type="jar" ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-exporting-ambiguity/3.3.3/jars/testbundle-exporting-ambiguity-3.3.3.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-exporting-ambiguity/3.3.3/jars/testbundle-exporting-ambiguity-3.3.3.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing/3.2.1/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing/3.2.1/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing/3.2.1/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing/3.2.1/ivy.xml
2014-09-20 21:21:42.474934900 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi" module="testbundle-importing"
revision="3.2.1" />
+ <publications>
+ <artifact name="testbundle-importing" type="jar" ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing/3.2.1/jars/testbundle-importing-3.2.1.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing/3.2.1/jars/testbundle-importing-3.2.1.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-ambiguity/3.2.1/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-ambiguity/3.2.1/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-ambiguity/3.2.1/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-ambiguity/3.2.1/ivy.xml
2014-09-20 21:21:42.277923700 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi"
module="testbundle-importing-ambiguity" revision="3.2.1" />
+ <publications>
+ <artifact name="testbundle-importing-ambiguity" type="jar" ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-ambiguity/3.2.1/jars/testbundle-importing-ambiguity-3.2.1.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-ambiguity/3.2.1/jars/testbundle-importing-ambiguity-3.2.1.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-jrepackage/1.2.3/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-jrepackage/1.2.3/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-jrepackage/1.2.3/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-jrepackage/1.2.3/ivy.xml
2014-09-20 21:21:42.303925100 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi"
module="testbundle-importing-jrepackage" revision="1.2.3" />
+ <publications>
+ <artifact name="testbundle-importing-jrepackage" type="jar" ext="jar"
/>
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-jrepackage/1.2.3/jars/testbundle-importing-jrepackage-1.2.3.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-jrepackage/1.2.3/jars/testbundle-importing-jrepackage-1.2.3.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-optional/3.2.1/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-optional/3.2.1/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-optional/3.2.1/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-optional/3.2.1/ivy.xml
2014-09-20 21:21:42.329926600 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi"
module="testbundle-importing-optional" revision="3.2.1" />
+ <publications>
+ <artifact name="testbundle-importing-optional" type="jar" ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-optional/3.2.1/jars/testbundle-importing-optional-3.2.1.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-optional/3.2.1/jars/testbundle-importing-optional-3.2.1.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-rangeversion/3.2.1/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-rangeversion/3.2.1/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-rangeversion/3.2.1/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-rangeversion/3.2.1/ivy.xml
2014-09-20 21:21:42.354928100 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi"
module="testbundle-importing-rangeversion" revision="3.2.1" />
+ <publications>
+ <artifact name="testbundle-importing-rangeversion" type="jar"
ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-rangeversion/3.2.1/jars/testbundle-importing-rangeversion-3.2.1.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-rangeversion/3.2.1/jars/testbundle-importing-rangeversion-3.2.1.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-transitiveoptional/3.2.1/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-transitiveoptional/3.2.1/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-transitiveoptional/3.2.1/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-transitiveoptional/3.2.1/ivy.xml
2014-09-20 21:21:42.379929500 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi"
module="testbundle-importing-transitiveoptional" revision="3.2.1" />
+ <publications>
+ <artifact name="testbundle-importing-transitiveoptional" type="jar"
ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-transitiveoptional/3.2.1/jars/testbundle-importing-transitiveoptional-3.2.1.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-transitiveoptional/3.2.1/jars/testbundle-importing-transitiveoptional-3.2.1.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-use/3.2.1/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-use/3.2.1/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-use/3.2.1/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-use/3.2.1/ivy.xml
2014-09-20 21:21:42.419931800 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi" module="testbundle-importing-use"
revision="3.2.1" />
+ <publications>
+ <artifact name="testbundle-importing-use" type="jar" ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-use/3.2.1/jars/testbundle-importing-use-3.2.1.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-use/3.2.1/jars/testbundle-importing-use-3.2.1.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-version/3.2.1/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-version/3.2.1/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-version/3.2.1/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-version/3.2.1/ivy.xml
2014-09-20 21:21:42.444933200 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi"
module="testbundle-importing-version" revision="3.2.1" />
+ <publications>
+ <artifact name="testbundle-importing-version" type="jar" ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-version/3.2.1/jars/testbundle-importing-version-3.2.1.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-importing-version/3.2.1/jars/testbundle-importing-version-3.2.1.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-require/1.1.1/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-require/1.1.1/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-require/1.1.1/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-require/1.1.1/ivy.xml
2014-09-20 21:21:42.526937900 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi" module="testbundle-require"
revision="1.1.1" />
+ <publications>
+ <artifact name="testbundle-require" type="jar" ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-require/1.1.1/jars/testbundle-require-1.1.1.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-require/1.1.1/jars/testbundle-require-1.1.1.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-require-ambiguity/1.1.1/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-require-ambiguity/1.1.1/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-require-ambiguity/1.1.1/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-require-ambiguity/1.1.1/ivy.xml
2014-09-20 21:21:42.500936400 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi"
module="testbundle-require-ambiguity" revision="1.1.1" />
+ <publications>
+ <artifact name="testbundle-require-ambiguity" type="jar" ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-require-ambiguity/1.1.1/jars/testbundle-require-ambiguity-1.1.1.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-require-ambiguity/1.1.1/jars/testbundle-require-ambiguity-1.1.1.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-requirejre/2.2.2/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-requirejre/2.2.2/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-requirejre/2.2.2/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-requirejre/2.2.2/ivy.xml
2014-09-20 21:21:42.553939400 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi" module="testbundle-requirejre"
revision="2.2.2" />
+ <publications>
+ <artifact name="testbundle-requirejre" type="jar" ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-requirejre/2.2.2/jars/testbundle-requirejre-2.2.2.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-requirejre/2.2.2/jars/testbundle-requirejre-2.2.2.jar
differ
diff -urN
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-use/2.2.2/ivy.xml
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-use/2.2.2/ivy.xml
---
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-use/2.2.2/ivy.xml
1970-01-01 02:00:00.000000000 +0200
+++
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-use/2.2.2/ivy.xml
2014-09-20 21:21:42.579940900 +0300
@@ -0,0 +1,25 @@
+<?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="1.0">
+ <info organisation="org.apache.ivy.osgi" module="testbundle-use"
revision="2.2.2" />
+ <publications>
+ <artifact name="testbundle-use" type="jar" ext="jar" />
+ </publications>
+</ivy-module>
Files
apache-ivy-2.4.0-rc1/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-use/2.2.2/jars/testbundle-use-2.2.2.jar
and
apache-ivy/test/test-repo/ivyrepo/org.apache.ivy.osgi/testbundle-use/2.2.2/jars/testbundle-use-2.2.2.jar
differ
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org
