[scala] 06/15: Ignore the pax-exam dependencies used by the tests

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository scala.

commit c5fb6fda08ab27b615827d537f30a7a16ed5add8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 6 12:45:02 2015 +0100

    Ignore the pax-exam dependencies used by the tests
---
 .../0006-ignore-pax-exam-dependencies.patch        | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0006-ignore-pax-exam-dependencies.patch b/debian/patches/0006-ignore-pax-exam-dependencies.patch
new file mode 100644
index 0000000..b480047
--- /dev/null
+++ b/debian/patches/0006-ignore-pax-exam-dependencies.patch
@@ -0,0 +1,26 @@
+--- a/build.xml
++++ b/build.xml
+@@ -227,23 +227,6 @@
+         <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
+       </artifact:dependencies>
+ 
+-      <!-- Pax runner -->
+-      <property name="pax.exam.version" value="2.6.0"/>
+-      <artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset">
+-        <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}"/>
+-        <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-junit4" version="${pax.exam.version}"/>
+-        <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-link-assembly" version="${pax.exam.version}"/>
+-        <!-- upgraded to 1.6.0 to get fix for https://ops4j1.jira.com/browse/PAXURL-217
+-      https://ops4j1.jira.com/browse/PAXURL-138 is still unresolved... -->
+-        <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.6.0"/>
+-        <dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-framework" version="1.5.1"/>
+-        <dependency groupId="ch.qos.logback" artifactId="logback-core" version="0.9.20"/>
+-        <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="0.9.20"/>
+-        <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
+-        <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="3.2.2"/>
+-      </artifact:dependencies>
+-
+-
+       <artifact:dependencies pathId="partest.extras.classpath" filesetId="partest.extras.fileset" versionsId="partest.extras.versions">
+         <dependency groupId="com.googlecode.java-diff-utils" artifactId="diffutils" version="1.3.0"/>
+       </artifact:dependencies>
diff --git a/debian/patches/series b/debian/patches/series
index a2e8847..20c565d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ remove-non-ascii-ftbfs.patch
 0002-Use-system-ant-contrib.jar.patch
 0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
 0005-java7-compilation.patch
+0006-ignore-pax-exam-dependencies.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala.git