[Git][java-team/surefire][master] 5 commits: Fixed the compatibility with maven-shared-utils 3.2.1 (Closes: #906411)
Emmanuel Bourg
gitlab at salsa.debian.org
Wed Sep 5 10:32:30 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / surefire
Commits:
024ca2c5 by Emmanuel Bourg at 2018-09-05T09:25:11Z
Fixed the compatibility with maven-shared-utils 3.2.1 (Closes: #906411)
- - - - -
9998082c by Emmanuel Bourg at 2018-09-05T09:27:33Z
Standards-Version updated to 4.2.1
- - - - -
2975f618 by Emmanuel Bourg at 2018-09-05T09:28:19Z
Wrap and sort
- - - - -
cc843ec5 by Emmanuel Bourg at 2018-09-05T09:29:16Z
Switch to debhelper level 11
- - - - -
773386c4 by Emmanuel Bourg at 2018-09-05T09:29:28Z
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/compat
- debian/control
- + debian/patches/maven-shared-utils-compatibility.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+surefire (2.21.0-2) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the compatibility with maven-shared-utils 3.2.1 (Closes: #906411)
+ * Standards-Version updated to 4.2.1
+ * Switch to debhelper level 11
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 05 Sep 2018 11:29:22 +0200
+
surefire (2.21.0-1) unstable; urgency=medium
* Team upload.
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
@@ -3,40 +3,42 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 10), default-jdk
-Build-Depends-Indep: javacc,
- junit,
- junit4,
- libbuild-helper-maven-plugin-java,
- libcommons-io-java,
- libcommons-lang3-java (>= 3.7),
- libfest-assert-java,
- libjavacc-maven-plugin-java,
- libjcip-annotations-java,
- libjmock-java,
- libjsr305-java,
- libmaven-common-artifact-filters-java,
- libmaven-dependency-plugin-java,
- libmaven-plugin-testing-java,
- libmaven-plugin-tools-java (>= 3.2),
- libmaven-reporting-api-java,
- libmaven-resources-plugin-java,
- libmaven-shade-plugin-java,
- libmaven-shared-utils-java,
- libmockito-java,
- libplexus-languages-java,
- libplexus-velocity-java,
- maven-debian-helper (>= 2.0),
- testng,
- velocity
-Standards-Version: 4.1.4
+Build-Depends:
+ debhelper (>= 11~),
+ default-jdk,
+ javacc,
+ junit,
+ junit4,
+ libbuild-helper-maven-plugin-java,
+ libcommons-io-java,
+ libcommons-lang3-java (>= 3.7),
+ libfest-assert-java,
+ libjavacc-maven-plugin-java,
+ libjcip-annotations-java,
+ libjmock-java,
+ libjsr305-java,
+ libmaven-common-artifact-filters-java,
+ libmaven-dependency-plugin-java,
+ libmaven-plugin-testing-java,
+ libmaven-plugin-tools-java (>= 3.2),
+ libmaven-reporting-api-java,
+ libmaven-resources-plugin-java,
+ libmaven-shade-plugin-java,
+ libmaven-shared-utils-java,
+ libmockito-java,
+ libplexus-languages-java,
+ libplexus-velocity-java,
+ maven-debian-helper (>= 2.0),
+ testng,
+ velocity
+Standards-Version: 4.2.1
Vcs-Git: https://salsa.debian.org/java-team/surefire.git
Vcs-Browser: https://salsa.debian.org/java-team/surefire
Homepage: http://maven.apache.org/surefire/
Package: libsurefire-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}, procps
+Depends: procps, ${maven:Depends}, ${misc:Depends}
Suggests: ${maven:OptionalDepends}
Description: Surefire test framework for Java
Maven is a software project management and comprehension tool. Based on the
=====================================
debian/patches/maven-shared-utils-compatibility.patch
=====================================
@@ -0,0 +1,70 @@
+Description: Fixes the compatibility with the version of maven-shared-utils in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+@@ -237,6 +237,10 @@
+ }
+ ppw.endElement(); // TestSuite
+ }
++ catch ( IOException e )
++ {
++ throw new RuntimeException( e );
++ }
+ finally
+ {
+ closeQuietly( fw );
+@@ -323,7 +327,7 @@
+ }
+
+ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, String reportNameSuffix,
+- String timeAsString )
++ String timeAsString ) throws IOException
+ {
+ ppw.startElement( "testcase" );
+ ppw.addAttribute( "name", report.getReportName() );
+@@ -346,7 +350,7 @@
+ }
+
+ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats,
+- String timeAsString )
++ String timeAsString ) throws IOException
+ {
+ ppw.startElement( "testsuite" );
+
+@@ -373,7 +377,7 @@
+
+ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLWriter ppw,
+ WrappedReportEntry report, boolean trimStackTrace, OutputStream fw,
+- String testErrorType, boolean createOutErrElementsInside )
++ String testErrorType, boolean createOutErrElementsInside ) throws IOException
+ {
+ ppw.startElement( testErrorType );
+
+@@ -418,7 +422,7 @@
+
+ // Create system-out and system-err elements
+ private static void createOutErrElements( OutputStreamWriter outputStreamWriter, XMLWriter ppw,
+- WrappedReportEntry report, OutputStream fw )
++ WrappedReportEntry report, OutputStream fw ) throws IOException
+ {
+ EncodingOutputStream eos = new EncodingOutputStream( fw );
+ addOutputStreamElement( outputStreamWriter, eos, ppw, report.getStdout(), "system-out" );
+@@ -428,7 +432,7 @@
+ private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter,
+ EncodingOutputStream eos, XMLWriter xmlWriter,
+ Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream,
+- String name )
++ String name ) throws IOException
+ {
+ if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 )
+ {
+@@ -458,7 +462,7 @@
+ *
+ * @param xmlWriter The test suite to report to
+ */
+- private static void showProperties( XMLWriter xmlWriter, Map<String, String> systemProperties )
++ private static void showProperties( XMLWriter xmlWriter, Map<String, String> systemProperties ) throws IOException
+ {
+ xmlWriter.startElement( "properties" );
+ for ( final Entry<String, String> entry : systemProperties.entrySet() )
=====================================
debian/patches/series
=====================================
@@ -7,3 +7,4 @@ maven-compatibility.patch
maven-shared-utils-dependency.patch
jsr305-dependency.patch
jdk-8186647-workaround.patch
+maven-shared-utils-compatibility.patch
View it on GitLab: https://salsa.debian.org/java-team/surefire/compare/f2c519214866b632ed7e7d4189e024a2c3893c67...773386c473fad6bd1f3e32ad8704ed3bd13555f8
--
View it on GitLab: https://salsa.debian.org/java-team/surefire/compare/f2c519214866b632ed7e7d4189e024a2c3893c67...773386c473fad6bd1f3e32ad8704ed3bd13555f8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180905/1d6e4dd7/attachment.html>
More information about the pkg-java-commits
mailing list