You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jl...@apache.org on 2014/11/24 20:07:09 UTC
[2/2] ant-easyant-plugins git commit: Fix EASYANT-71 Offline mode does not retrieve transitive dependencies of the project (thanks to Jérôme Leroux)
Fix EASYANT-71 Offline mode does not retrieve transitive dependencies of the project (thanks to Jérôme Leroux)
Project: http://git-wip-us.apache.org/repos/asf/ant-easyant-plugins/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-easyant-plugins/commit/5eabfe0b
Tree: http://git-wip-us.apache.org/repos/asf/ant-easyant-plugins/tree/5eabfe0b
Diff: http://git-wip-us.apache.org/repos/asf/ant-easyant-plugins/diff/5eabfe0b
Branch: refs/heads/master
Commit: 5eabfe0b6058d8e3899904051bfdc87850edc170
Parents: b994902
Author: Jean-Louis Boudart <je...@gmail.com>
Authored: Mon Nov 24 20:07:01 2014 +0100
Committer: Jean-Louis Boudart <je...@gmail.com>
Committed: Mon Nov 24 20:07:01 2014 +0100
----------------------------------------------------------------------
offline/src/test/antunit/offline-test.xml | 9 +++++++++
offline/src/test/antunit/sample-module.ivy | 2 ++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-easyant-plugins/blob/5eabfe0b/offline/src/test/antunit/offline-test.xml
----------------------------------------------------------------------
diff --git a/offline/src/test/antunit/offline-test.xml b/offline/src/test/antunit/offline-test.xml
index 311d48d..7b518e7 100644
--- a/offline/src/test/antunit/offline-test.xml
+++ b/offline/src/test/antunit/offline-test.xml
@@ -55,6 +55,7 @@
<au:assertLogContains text=":: installing in easyant.buildscope.repository ::" />
<au:assertLogContains text=":: installing org.apache.easyant.plugins#rat;0.9 ::" />
<au:assertLogContains text=":: installing org.apache.rat#apache-rat-tasks;0.7 ::" />
+ <au:assertLogContains text=":: installing org.mortbay.jetty#jetty;6.1.14 ::" />
<property name="ea.repo" value="${offline.base.directory}/repository/easyant.buildscope.repository" />
<property name="project.repo" value="${offline.base.directory}/repository/project.buildscope.repository" />
@@ -75,6 +76,14 @@
<au:assertFileExists file="${project.repo}/junit/junit/4.4/junit.jar" />
<au:assertFileExists file="${project.repo}/junit/junit/4.4/junit-javadoc.jar" />
<au:assertFileExists file="${project.repo}/junit/junit/4.4/junit-sources.jar" />
+
+ <au:assertFileExists file="${project.repo}/org.mortbay.jetty/jetty/6.1.14/jetty-sources.jar" />
+ <au:assertFileExists file="${project.repo}/org.mortbay.jetty/jetty/6.1.14/jetty.jar" />
+ <au:assertFileExists file="${project.repo}/org.mortbay.jetty/jetty/6.1.14/jetty.ivy" />
+
+ <!-- Test that transitive dependencies have been installed -->
+ <au:assertFileExists file="${project.repo}/org.mortbay.jetty/jetty-util/6.1.14/jetty-util.jar" />
+ <au:assertFileExists file="${project.repo}/org.mortbay.jetty/jetty-util/6.1.14/jetty-util.ivy" />
</target>
<target name="prepare-clean">
http://git-wip-us.apache.org/repos/asf/ant-easyant-plugins/blob/5eabfe0b/offline/src/test/antunit/sample-module.ivy
----------------------------------------------------------------------
diff --git a/offline/src/test/antunit/sample-module.ivy b/offline/src/test/antunit/sample-module.ivy
index 1295c91..0d1581e 100644
--- a/offline/src/test/antunit/sample-module.ivy
+++ b/offline/src/test/antunit/sample-module.ivy
@@ -21,5 +21,7 @@
</info>
<dependencies>
<dependency org="junit" name="junit" rev="4.4" />
+ <!-- Add a dependency with transitive dependencies -->
+ <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.14" />
</dependencies>
</ivy-module>
\ No newline at end of file