[surefire] 05/07: Added a workaround for JDK-8186647
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Sep 21 08:12:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository surefire.
commit fb857c79b0b17fc00553c2e3246ff24d55e7540e
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Sep 20 22:15:46 2017 +0200
Added a workaround for JDK-8186647
---
debian/changelog | 1 +
debian/patches/jdk-8186647-workaround.patch | 109 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 111 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 52b510e..3a3c12b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ surefire (2.20.1-1) UNRELEASED; urgency=medium
- Refreshed the patches
- Ignore the new test dependencies
- Set the source encoding toe UTF-8
+ - Added a workaround for JDK-8186647
-- Emmanuel Bourg <ebourg at apache.org> Wed, 20 Sep 2017 16:46:39 +0200
diff --git a/debian/patches/jdk-8186647-workaround.patch b/debian/patches/jdk-8186647-workaround.patch
new file mode 100644
index 0000000..f2d5be9
--- /dev/null
+++ b/debian/patches/jdk-8186647-workaround.patch
@@ -0,0 +1,109 @@
+Description: Workaround for a javac regression
+Author: Emmanuel Bourg <ebourg at apache.org>
+Bug: http://bugs.java.com/bugdatabase/view_bug.do?bug_id=JDK-8186647
+--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+@@ -2233,11 +2233,11 @@
+ * Generate the test classpath.
+ *
+ * @return List containing the classpath elements
+- * @throws InvalidVersionSpecificationException
++ * throws InvalidVersionSpecificationException
+ * when it happens
+- * @throws MojoFailureException when it happens
+- * @throws ArtifactNotFoundException when it happens
+- * @throws ArtifactResolutionException when it happens
++ * throws MojoFailureException when it happens
++ * throws ArtifactNotFoundException when it happens
++ * throws ArtifactResolutionException when it happens
+ */
+ private Classpath generateTestClasspath()
+ throws InvalidVersionSpecificationException, MojoFailureException, ArtifactResolutionException,
+--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
+@@ -136,7 +136,7 @@
+ * @param config The startup configuration
+ * @param threadNumber the thread number, to be the replacement in the argLine @return A commandline
+ * @return CommandLine able to flush entire command going to be sent to forked JVM
+- * @throws org.apache.maven.surefire.booter.SurefireBooterForkException
++ * throws org.apache.maven.surefire.booter.SurefireBooterForkException
+ * when unable to perform the fork
+ */
+ public OutputStreamFlushableCommandline createCommandLine( List<String> classPath, StartupConfiguration config,
+@@ -283,7 +283,7 @@
+ * @param classPath List<String> of all classpath elements.
+ * @param startClassName The classname to start (main-class)
+ * @return The file pointint to the jar
+- * @throws java.io.IOException When a file operation fails.
++ * throws java.io.IOException When a file operation fails.
+ */
+ private File createJar( List<String> classPath, String startClassName )
+ throws IOException
+--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
+@@ -52,7 +52,7 @@
+ * Possibly waiting for next command (see {@link #nextCommand()}) unless the stream is atomically
+ * closed (see {@link #isClosed()} returns {@code true}) before this method has returned.
+ *
+- * @throws IOException stream error while waiting for notification regarding next test required by forked jvm
++ * throws IOException stream error while waiting for notification regarding next test required by forked jvm
+ */
+ protected void beforeNextCommand()
+ throws IOException
+@@ -74,7 +74,7 @@
+ * Used by single thread in StreamFeeder class.
+ *
+ * @return {@inheritDoc}
+- * @throws IOException {@inheritDoc}
++ * throws IOException {@inheritDoc}
+ */
+ @SuppressWarnings( "checkstyle:magicnumber" )
+ @Override
+--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/FlushReceiver.java
++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/FlushReceiver.java
+@@ -31,7 +31,7 @@
+ /**
+ * Performs a flush, releasing any buffered resources.
+ *
+- * @throws IOException in case the flush operation failed
++ * throws IOException in case the flush operation failed
+ */
+ void flush()
+ throws IOException;
+--- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/providerapi/ServiceLoader.java
++++ b/maven-surefire-common/src/main/java/org/apache/maven/surefire/providerapi/ServiceLoader.java
+@@ -102,7 +102,7 @@
+ *
+ * @param urlEnumeration The urls from the resource
+ * @return The set of service provider names
+- * @throws IOException When reading the streams fails
++ * throws IOException When reading the streams fails
+ */
+ @Nonnull
+ @SuppressWarnings( "checkstyle:innerassignment" )
+--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
++++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
+@@ -36,11 +36,11 @@
+ /**
+ * TestNG configurator for 5.3+ versions. TestNG exposes a {@link org.testng.TestNG#configure(java.util.Map)} method.
+ * All supported TestNG options are passed in String format, except
+- * {@link org.testng.TestNGCommandLineArgs#LISTENER_COMMAND_OPT} which is {@link java.util.List List>Class<},
+- * {@link org.testng.TestNGCommandLineArgs#JUNIT_DEF_OPT} which is a {@link Boolean},
+- * {@link org.testng.TestNGCommandLineArgs#SKIP_FAILED_INVOCATION_COUNT_OPT} which is a {@link Boolean},
+- * {@link org.testng.TestNGCommandLineArgs#OBJECT_FACTORY_COMMAND_OPT} which is a {@link Class},
+- * {@link org.testng.TestNGCommandLineArgs#REPORTERS_LIST} which is a {@link java.util.List List>ReporterConfig<}.
++ * {@code org.testng.TestNGCommandLineArgs#LISTENER_COMMAND_OPT} which is {@link java.util.List List>Class<},
++ * {@code org.testng.TestNGCommandLineArgs#JUNIT_DEF_OPT} which is a {@link Boolean},
++ * {@code org.testng.TestNGCommandLineArgs#SKIP_FAILED_INVOCATION_COUNT_OPT} which is a {@link Boolean},
++ * {@code org.testng.TestNGCommandLineArgs#OBJECT_FACTORY_COMMAND_OPT} which is a {@link Class},
++ * {@code org.testng.TestNGCommandLineArgs#REPORTERS_LIST} which is a {@link java.util.List List>ReporterConfig<}.
+ * <br>
+ * Test classes and/or suite files are not passed along as options parameters, but configured separately.
+ *
+@@ -198,4 +198,4 @@
+ return val;
+ }
+ }
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
index 4d31a90..ea569e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ doxia-compatibility.patch
maven-compatibility.patch
maven-shared-utils-dependency.patch
jsr305-dependency.patch
+jdk-8186647-workaround.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/surefire.git
More information about the pkg-java-commits
mailing list