Repository: ant-ivy Updated Branches: refs/heads/master f367ed8bd -> 61ceab358
IVY-1594 Use a separate moduleid for the testcase to prevent other tests, reliant on the org1:mod1.1 module, from being impacted Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/61ceab35 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/61ceab35 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/61ceab35 Branch: refs/heads/master Commit: 61ceab358805dea81c0e554a4bccfd62fd30e8ae Parents: f367ed8 Author: Jaikiran Pai <[email protected]> Authored: Tue Oct 23 11:52:28 2018 +0530 Committer: Jaikiran Pai <[email protected]> Committed: Tue Oct 23 11:52:28 2018 +0530 ---------------------------------------------------------------------- .../apache/ivy/core/retrieve/RetrieveTest.java | 4 +-- .../repositories/1/org1/mod1.1/ivys/ivy-3.0.xml | 25 ------------------- .../1/org1/mod1.1/jars/zipped-artifact-3.0.zip | Bin 184 -> 0 bytes .../repositories/1/org1/mod1.7/ivys/ivy-3.0.xml | 25 +++++++++++++++++++ .../1/org1/mod1.7/jars/zipped-artifact-3.0.zip | Bin 0 -> 184 bytes 5 files changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/61ceab35/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java index 239cd36..fd84298 100644 --- a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java +++ b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java @@ -265,7 +265,7 @@ public class RetrieveTest { @Test public void testRetrieveZipArtifactWithSymlinks() throws Exception { // resolve (inline) with org1:mod1.1:3.0 as a dependency - final ResolveReport report = ivy.resolve(new ModuleRevisionId(new ModuleId("org1", "mod1.1"), "3.0"), + final ResolveReport report = ivy.resolve(new ModuleRevisionId(new ModuleId("org1", "mod1.7"), "3.0"), getResolveOptions(new String[]{"*"}), false); assertNotNull("Resolution report is null", report); final ModuleDescriptor md = report.getModuleDescriptor(); @@ -275,7 +275,7 @@ public class RetrieveTest { ivy.retrieve(md.getModuleRevisionId(), getRetrieveOptions().setMakeSymlinks(true).setDestArtifactPattern(retrievePattern)); - final String expectedRetrieveLocation = IvyPatternHelper.substitute(retrievePattern, "org1", "mod1.1", + final String expectedRetrieveLocation = IvyPatternHelper.substitute(retrievePattern, "org1", "mod1.7", "3.0", "zipped-artifact", null, null, "default"); // make sure it's retrieved as a symlink (on systems that support symlink) assertLinkOrExists(expectedRetrieveLocation); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/61ceab35/test/repositories/1/org1/mod1.1/ivys/ivy-3.0.xml ---------------------------------------------------------------------- diff --git a/test/repositories/1/org1/mod1.1/ivys/ivy-3.0.xml b/test/repositories/1/org1/mod1.1/ivys/ivy-3.0.xml deleted file mode 100644 index 373ca31..0000000 --- a/test/repositories/1/org1/mod1.1/ivys/ivy-3.0.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - ~ 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="3.0" - /> - <publications> - <artifact name="zipped-artifact" packaging="zip" ext="zip"/> - </publications> -</ivy-module> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/61ceab35/test/repositories/1/org1/mod1.1/jars/zipped-artifact-3.0.zip ---------------------------------------------------------------------- diff --git a/test/repositories/1/org1/mod1.1/jars/zipped-artifact-3.0.zip b/test/repositories/1/org1/mod1.1/jars/zipped-artifact-3.0.zip deleted file mode 100644 index df0b4ca..0000000 Binary files a/test/repositories/1/org1/mod1.1/jars/zipped-artifact-3.0.zip and /dev/null differ http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/61ceab35/test/repositories/1/org1/mod1.7/ivys/ivy-3.0.xml ---------------------------------------------------------------------- diff --git a/test/repositories/1/org1/mod1.7/ivys/ivy-3.0.xml b/test/repositories/1/org1/mod1.7/ivys/ivy-3.0.xml new file mode 100644 index 0000000..7d6eb74 --- /dev/null +++ b/test/repositories/1/org1/mod1.7/ivys/ivy-3.0.xml @@ -0,0 +1,25 @@ +<!-- + ~ 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.7" + revision="3.0" + /> + <publications> + <artifact name="zipped-artifact" packaging="zip" ext="zip"/> + </publications> +</ivy-module> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/61ceab35/test/repositories/1/org1/mod1.7/jars/zipped-artifact-3.0.zip ---------------------------------------------------------------------- diff --git a/test/repositories/1/org1/mod1.7/jars/zipped-artifact-3.0.zip b/test/repositories/1/org1/mod1.7/jars/zipped-artifact-3.0.zip new file mode 100644 index 0000000..df0b4ca Binary files /dev/null and b/test/repositories/1/org1/mod1.7/jars/zipped-artifact-3.0.zip differ
