[maven-osgi] 02/04: Use jar bundled with upstream for testing, remove unnecessary dependancies

[Christopher Hoskin]

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

grinorcole-guest pushed a commit to branch master
in repository maven-osgi.

commit c8213d960b54d48487cb027d55b6b60e73110e42
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Sun Mar 6 16:52:50 2016 +0000

    Use jar bundled with upstream for testing, remove unnecessary dependancies
---
 debian/changelog          |  1 +
 debian/control            |  5 ++---
 debian/patches/series     |  1 -
 debian/patches/test.patch | 41 -----------------------------------------
 4 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef4461d..d5d2d6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ maven-osgi (0.2.0-2) UNRELEASED; urgency=medium
 
   * Update Standards-Version, fix Vcs-Git URL, remove unused variable from rules
   * Remove java-doc package 
+  * Use jar bundled with upstream for testing, remove unnecessary dependancies 
 
  -- Christopher Hoskin <christopher.hoskin at gmail.com>  Sat, 05 Mar 2016 16:58:24 +0000
 
diff --git a/debian/control b/debian/control
index 38ab10e..f6c89db 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,9 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Christopher Hoskin <christopher.hoskin at gmail.com>
-Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: debhelper (>= 9), default-jdk-headless, maven-debian-helper (>= 1.5)
 Build-Depends-Indep: libplexus-maven-plugin-java, bnd (>= 2.4.1), libmaven2-core-java, libmaven-plugin-testing-java,  
- default-jdk-doc, libmaven2-core-java-doc, libmaven-javadoc-plugin-java, javahelper,
- libcommons-logging-java 
+ javahelper 
 Standards-Version: 3.9.7
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-osgi.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-osgi.git
diff --git a/debian/patches/series b/debian/patches/series
index 16f72f1..9946417 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-test.patch
 bnd.patch
diff --git a/debian/patches/test.patch b/debian/patches/test.patch
deleted file mode 100644
index 0b96cab..0000000
--- a/debian/patches/test.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Diable tests which don't work with
- /usr/share/java/commons-logging-1.2.jar
-Author: Christopher Hoskin <christopher.hoskin at gmail.com>
-Forwarded: not-needed
-Last-Update: 2016-02-27
-
---- a/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
-+++ b/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
-@@ -40,7 +40,7 @@
-         ArtifactStub artifact = getTestArtifact();
-         String s;
-         s = maven2Osgi.getBundleSymbolicName( artifact );
--        assertEquals( "org.apache.commons.logging", s );
-+        //assertEquals( "org.apache.commons.logging", s );
- 
-         artifact.setGroupId( "org.apache.commons" );
-         s = maven2Osgi.getBundleSymbolicName( artifact );
-@@ -86,7 +86,7 @@
-         ArtifactStub artifact = getTestArtifact();
-         String s;
-         s = maven2Osgi.getBundleFileName( artifact );
--        assertEquals( "org.apache.commons.logging_1.1.0.jar", s );
-+        //assertEquals( "org.apache.commons.logging_1.1.0.jar", s );
- 
-         artifact.setGroupId( "org.aopalliance" );
-         artifact.setArtifactId( "aopalliance" );
-@@ -157,12 +157,12 @@
-         a.setGroupId( "commons-logging" );
-         a.setArtifactId( "commons-logging" );
-         a.setVersion( "1.1" );
--        a.setFile( getTestFile( "commons-logging-1.1.jar" ) );
-+        a.setFile( getTestFile( "commons-logging-1.2.jar" ) );
-         return a;
-     }
- 
-     public static File getTestFile( String fileName )
-     {
--        return PlexusTestCase.getTestFile( "src/test/resources/" + fileName );
-+        return PlexusTestCase.getTestFile( "/usr/share/java/" + fileName );
-     }
- }

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