[sisu-ioc] 06/09: Removed the opposite patches testng_classifier.diff and pom_testng_classifier.patch

[Emmanuel Bourg]

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

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

commit 9d162a969dae62c14d4f8213ddffe647674e0def
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 21 11:04:38 2013 +0200

    Removed the opposite patches testng_classifier.diff and pom_testng_classifier.patch
---
 debian/changelog                           |    4 +--
 debian/patches/pom_testng_classifier.patch |   35 ------------------------
 debian/patches/series                      |    2 --
 debian/patches/testng_classifier.diff      |   41 ----------------------------
 4 files changed, 2 insertions(+), 80 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d8f45d..d98446a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,10 +8,10 @@ sisu-ioc (2.3.0-4) UNRELEASED; urgency=low
     - Updated Standards-Version to 3.9.4 (no changes)
   * debian/copyright: Merged the duplicate Copyright fields
   * Updated the override for the Lintian codeless-jar warning
+  * Removed the now unnecessary patch testng_classifier.diff
 
   [ Eugene Zhukov ]
-  * add patch to remove jdk15 classifier from testng dependency from pom.xml
-  * fix testng version handling in d/maven.rules 
+  * Fix testng version handling in d/maven.rules 
 
  -- Eugene Zhukov <jevgeni.zh at gmail.com>  Fri, 04 Oct 2013 07:52:09 +0000
 
diff --git a/debian/patches/pom_testng_classifier.patch b/debian/patches/pom_testng_classifier.patch
deleted file mode 100644
index c427cb7..0000000
--- a/debian/patches/pom_testng_classifier.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: removes jdk15 classifier from testng dependency
- * remove jdk15 classifier from testng dependency in pom.xml
-Author: Eugene Zhukov <jevgeni.zh at gmail.com>
-Last-Update: 2013-10-04
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -185,7 +185,6 @@
-         <groupId>org.testng</groupId>
-         <artifactId>testng</artifactId>
-         <version>6.2</version>
--	<classifier>jdk15</classifier>
-       </dependency>
- 
-     </dependencies>
---- a/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml
-+++ b/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml
-@@ -70,7 +70,6 @@
-       <groupId>org.testng</groupId>
-       <artifactId>testng</artifactId>
-       <optional>true</optional>
--      <classifier>jdk15</classifier>
-     </dependency>
-     <dependency>
-       <groupId>org.sonatype.sisu.inject</groupId>
---- a/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml
-+++ b/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml
-@@ -81,7 +81,6 @@
-       <groupId>org.testng</groupId>
-       <artifactId>testng</artifactId>
-       <optional>true</optional>
--      <classifier>jdk15</classifier>
-     </dependency>
-   </dependencies>
- 
diff --git a/debian/patches/series b/debian/patches/series
index 92bacb4..f89ca17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 fix_osgi43.diff
 version_plexus.diff
-testng_classifier.diff
 guice_classifier.diff
 modules.diff
 javac_apt_scanner.diff
-pom_testng_classifier.patch
diff --git a/debian/patches/testng_classifier.diff b/debian/patches/testng_classifier.diff
deleted file mode 100644
index 506bcd2..0000000
--- a/debian/patches/testng_classifier.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Add <classifier>jdk15</classifier> to testng
- dependency (default in Debian).
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: not-needed
-
-Index: b/pom.xml
-===================================================================
---- a/pom.xml
-+++ b/pom.xml
-@@ -185,6 +185,7 @@
-         <groupId>org.testng</groupId>
-         <artifactId>testng</artifactId>
-         <version>6.2</version>
-+	<classifier>jdk15</classifier>
-       </dependency>
- 
-     </dependencies>
-Index: b/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml
-===================================================================
---- a/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml
-+++ b/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml
-@@ -70,6 +70,7 @@
-       <groupId>org.testng</groupId>
-       <artifactId>testng</artifactId>
-       <optional>true</optional>
-+      <classifier>jdk15</classifier>
-     </dependency>
-     <dependency>
-       <groupId>org.sonatype.sisu.inject</groupId>
-Index: b/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml
-===================================================================
---- a/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml
-+++ b/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml
-@@ -77,6 +77,7 @@
-       <groupId>org.testng</groupId>
-       <artifactId>testng</artifactId>
-       <optional>true</optional>
-+      <classifier>jdk15</classifier>
-     </dependency>
-   </dependencies>
- 

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