[maven-shared-utils] 09/10: Replaced clean-up-non-ascii.patch with a build property

[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 4e81146edd9fba66d71c32f5ded5973e30cb51bd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 21 16:56:16 2015 +0200

    Replaced clean-up-non-ascii.patch with a build property
---
 debian/changelog                        |  1 +
 debian/maven.properties                 |  2 ++
 debian/patches/clean-up-non-ascii.patch | 33 ---------------------------------
 debian/patches/series                   |  1 -
 4 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87cf80f..af15431 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ maven-shared-utils (0.9-1) UNRELEASED; urgency=medium
   * New upstream release
     - New build dependency on libmaven-plugin-testing-java
     - Disabled the unit tests (classpath conflict with the previous version)
+  * Replaced clean-up-non-ascii.patch with a build property
   * 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 78f1358..48ffadf 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -6,3 +6,5 @@ maven.test.skip=true
 
 maven.compiler.source=1.5
 maven.compiler.target=1.5
+
+project.build.sourceEncoding=UTF-8
diff --git a/debian/patches/clean-up-non-ascii.patch b/debian/patches/clean-up-non-ascii.patch
deleted file mode 100644
index 7d2374d..0000000
--- a/debian/patches/clean-up-non-ascii.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java
-+++ b/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java
-@@ -39,7 +39,7 @@
-  * Utility to create Readers from streams, with explicit encoding choice: platform default,
-  * XML, or specified.
-  *
-- * @author <a href="mailto:hboutemy at apache.org">Hervé Boutemy</a>
-+ * @author <a href="mailto:hboutemy at apache.org">Herve Boutemy</a>
-  * @see Charset
-  * @see <a href="http://docs.oracle.com/javase/1.5.0/docs/guide/intl/encoding.doc.html">Supported encodings</a>
-  * 
---- a/src/main/java/org/apache/maven/shared/utils/WriterFactory.java
-+++ b/src/main/java/org/apache/maven/shared/utils/WriterFactory.java
-@@ -38,7 +38,7 @@
-  * Utility to create Writers, with explicit encoding choice: platform default,
-  * XML, or specified.
-  *
-- * @author Hervé Boutemy
-+ * @author Herve Boutemy
-  * @see Charset
-  * @see <a href="http://docs.oracle.com/javase/1.5.0/docs/guide/intl/encoding.doc.html">Supported encodings</a>
-  * @version $Id: WriterFactory.java 1400677 2012-10-21 17:00:51Z rfscholte $
---- a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java
-+++ b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java
-@@ -84,7 +84,7 @@
-  *
-  * @author <a href="mailto:peter at apache.org">Peter Donald</a>
-  * @author <a href="mailto:jefft at apache.org">Jeff Turner</a>
-- * @version CVS $Revision: 1401872 $ $Date: 2012-10-24 22:45:04 +0200 (St, 24 říj 2012) $
-+ * @version CVS $Revision: 1401872 $ $Date: 2012-10-24 22:45:04 +0200 $
-  * 
-  */
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 02f80b8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-clean-up-non-ascii.patch

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