[maven-shared-utils] 08/10: Disabled the unit tests (classpath conflict with the previous version)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-shared-utils.

commit 3b0ce7327bd62903deeb8b2a825a13437dd069d4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 21 16:51:00 2015 +0200

    Disabled the unit tests (classpath conflict with the previous version)
---
 debian/changelog                    |  1 +
 debian/maven.properties             |  3 ++
 debian/patches/fix-test-build.patch | 79 -------------------------------------
 debian/patches/series               |  1 -
 4 files changed, 4 insertions(+), 80 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bfb6c75..87cf80f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ maven-shared-utils (0.9-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - New build dependency on libmaven-plugin-testing-java
+    - Disabled the unit tests (classpath conflict with the previous version)
   * Added the missing build dependency on junit4
   * Standards-Version updated to 3.9.6 (no changes)
 
diff --git a/debian/maven.properties b/debian/maven.properties
index 6f25d9f..78f1358 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,5 +1,8 @@
 # Include here properties to pass to Maven during the build.
 # For example:
 # maven.test.skip=true
+
+maven.test.skip=true
+
 maven.compiler.source=1.5
 maven.compiler.target=1.5
diff --git a/debian/patches/fix-test-build.patch b/debian/patches/fix-test-build.patch
deleted file mode 100644
index 69ce090..0000000
--- a/debian/patches/fix-test-build.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Wed, 29 May 2013 08:45:11 +0200
-Subject: fix-test-build
-
----
- src/test/java/org/apache/maven/shared/utils/ExpandTest.java  |    3 ++-
- .../apache/maven/shared/utils/reflection/ReflectorTest.java  |   10 +++++-----
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/test/java/org/apache/maven/shared/utils/ExpandTest.java b/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
-index 298cb70..0d5548d 100644
---- a/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
-+++ b/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
-@@ -28,6 +28,7 @@ import org.junit.rules.TemporaryFolder;
- 
- import java.io.File;
- import java.io.FileNotFoundException;
-+import java.io.IOException;
- import java.net.URL;
- 
- import static org.hamcrest.CoreMatchers.*;
-@@ -72,7 +73,7 @@ public class ExpandTest
-      *
-      * @return
-      */
--    private File getTestTargetDir()
-+    private File getTestTargetDir() throws IOException
-     {
-         return tempFolder.newFolder( TEST_ZIP_TARGET_FOLDER );
-     }
-diff --git a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
-index 6d8cca3..54e5be2 100644
---- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
-+++ b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
-@@ -116,7 +116,7 @@ public class ReflectorTest
-     public void newInstancePublicConstructor()
-         throws Exception
-     {
--        assertThat( reflector.newInstance( ReflectorTestHelper.class, new Object[]{ "" } ),
-+        assertThat( ( ReflectorTestHelper )reflector.newInstance( ReflectorTestHelper.class, new Object[]{ "" } ),
-                     is( ReflectorTestHelper.class ) );
-     }
- 
-@@ -222,7 +222,7 @@ public class ReflectorTest
-     public void getSingletonPublicMethod()
-         throws Exception
-     {
--        assertThat( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "" } ),
-+        assertThat( ( ReflectorTestHelper )reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "" } ),
-                     is( ReflectorTestHelper.class ) );
-     }
- 
-@@ -252,7 +252,7 @@ public class ReflectorTest
-     public void getSingletonNonStaticMethod()
-         throws Exception
-     {
--        assertThat( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "", Boolean.FALSE } ),
-+        assertThat( ( ReflectorTestHelper )reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "", Boolean.FALSE } ),
-                     is( ReflectorTestHelper.class ) );
-     }
- 
-@@ -866,7 +866,7 @@ public class ReflectorTest
-     public void invokeStaticPublicMethod()
-         throws Exception
-     {
--        assertThat( reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "" } ),
-+        assertThat( ( ReflectorTestHelper )reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "" } ),
-                     is( ReflectorTestHelper.class ) );
-     }
- 
-@@ -897,7 +897,7 @@ public class ReflectorTest
-         throws Exception
-     {
-         assertThat(
--            reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "", Boolean.FALSE } ),
-+            ( ReflectorTestHelper )reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "", Boolean.FALSE } ),
-             is( ReflectorTestHelper.class ) );
-     }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 2a3794c..02f80b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 clean-up-non-ascii.patch
-fix-test-build.patch

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