[maven-doxia] branch master updated: Bump fop from 2.5 to 2.6
This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-doxia.git The following commit(s) were added to refs/heads/master by this push: new 7930502 Bump fop from 2.5 to 2.6 7930502 is described below commit 793050265a80bc42884d634535eef3a965116a36 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jan 21 04:02:03 2021 + Bump fop from 2.5 to 2.6 Bumps fop from 2.5 to 2.6. Signed-off-by: dependabot[bot] --- doxia-modules/doxia-module-fo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doxia-modules/doxia-module-fo/pom.xml b/doxia-modules/doxia-module-fo/pom.xml index 1791f6b..7d65eb2 100644 --- a/doxia-modules/doxia-module-fo/pom.xml +++ b/doxia-modules/doxia-module-fo/pom.xml @@ -85,7 +85,7 @@ under the License. org.apache.xmlgraphics fop - 2.5 + 2.6
[maven-surefire] branch master updated: fixed tests: dump files printed fake data due to the indexes of ByteBuffer are not shifted for reads after IOException
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 90d5665 fixed tests: dump files printed fake data due to the indexes
of ByteBuffer are not shifted for reads after IOException
90d5665 is described below
commit 90d5665eb01d53e361c90ec89a1711fda775b324
Author: tibordigana
AuthorDate: Thu Jan 21 23:09:16 2021 +0100
fixed tests: dump files printed fake data due to the indexes of ByteBuffer
are not shifted for reads after IOException
---
.../surefire/extensions/EventConsumerThread.java | 3 +-
.../apache/maven/surefire/stream/EventDecoder.java | 1 +
.../extensions/ForkedProcessEventNotifierTest.java | 122 +
.../surefire/api/stream/AbstractStreamDecoder.java | 47 +---
.../maven/surefire/booter/CommandReader.java | 3 +-
.../surefire/booter/stream/CommandDecoder.java | 1 +
6 files changed, 160 insertions(+), 17 deletions(-)
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThread.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThread.java
index 1371dbb..a2b1c02 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThread.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThread.java
@@ -30,6 +30,7 @@ import org.apache.maven.surefire.stream.EventDecoder;
import javax.annotation.Nonnull;
import java.io.EOFException;
import java.io.IOException;
+import java.nio.channels.ClosedChannelException;
import java.nio.channels.ReadableByteChannel;
/**
@@ -76,7 +77,7 @@ public class EventConsumerThread extends CloseableDaemonThread
}
while ( true );
}
-catch ( EOFException e )
+catch ( EOFException | ClosedChannelException e )
{
//
}
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java
b/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java
index 3698511..8170bac 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java
@@ -173,6 +173,7 @@ public class EventDecoder extends
AbstractStreamDecoder debug = new
ConcurrentLinkedQueue<>();
final ConcurrentLinkedQueue info = new
ConcurrentLinkedQueue<>();
+final ConcurrentLinkedQueue warning = new
ConcurrentLinkedQueue<>();
final ConcurrentLinkedQueue error = new
ConcurrentLinkedQueue<>();
final boolean isDebug;
final boolean isInfo;
@@ -1266,6 +1387,7 @@ public class ForkedProcessEventNotifierTest
@Override
public synchronized void warning( String message )
{
+warning.add( message );
called = true;
}
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java
b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java
index 862820c..ff69da8 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java
@@ -379,7 +379,7 @@ public abstract class AbstractStreamDecoder, ST extends E
{
printCorruptedStream( memento );
memento.getLine().printExistingLine();
-memento.getLine().setCount( 0 );
+memento.getLine().clear();
}
/**
@@ -456,26 +456,43 @@ public abstract class AbstractStreamDecoder, ST extends E
int mark = buffer.position();
buffer.position( buffer.limit() );
buffer.limit( min( buffer.position() + recommendedCount,
buffer.capacity() ) );
-boolean isEnd = false;
-while ( !isEnd && buffer.position() - mark < recommendedCount &&
buffer.position() < buffer.limit() )
+return read( buffer, mark, recommendedCount );
+}
+}
+
+private StreamReadStatus read( ByteBuffer buffer, int oldPosition, int
recommendedCount )
+throws IOException
+{
+StreamReadStatus readStatus = null;
+boolean isEnd = false;
+try
+{
+while ( !isEnd && buffer.position() - oldPosition <
recommendedCount && buffer.position() < buffer.limit() )
{
isEnd = channel.read( buffer ) == -1;
}
-
+}
+finally
+{
buffer.limit( buffer.position() );
-buffer.position( mark );
+buffer.position( oldPosition );
[maven-surefire] 01/01: fixed tests: dump files printed fake data due to the indexes of ByteBuffer are not shifted for reads after IOException
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch comm
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 5c910839c743515bc68f62a1954e7ff7b05b0f3c
Author: tibordigana
AuthorDate: Thu Jan 21 23:09:16 2021 +0100
fixed tests: dump files printed fake data due to the indexes of ByteBuffer
are not shifted for reads after IOException
---
.../surefire/extensions/EventConsumerThread.java | 3 +-
.../apache/maven/surefire/stream/EventDecoder.java | 1 +
.../extensions/ForkedProcessEventNotifierTest.java | 122 +
.../surefire/api/stream/AbstractStreamDecoder.java | 47 +---
.../maven/surefire/booter/CommandReader.java | 3 +-
.../surefire/booter/stream/CommandDecoder.java | 1 +
6 files changed, 160 insertions(+), 17 deletions(-)
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThread.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThread.java
index 1371dbb..a2b1c02 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThread.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThread.java
@@ -30,6 +30,7 @@ import org.apache.maven.surefire.stream.EventDecoder;
import javax.annotation.Nonnull;
import java.io.EOFException;
import java.io.IOException;
+import java.nio.channels.ClosedChannelException;
import java.nio.channels.ReadableByteChannel;
/**
@@ -76,7 +77,7 @@ public class EventConsumerThread extends CloseableDaemonThread
}
while ( true );
}
-catch ( EOFException e )
+catch ( EOFException | ClosedChannelException e )
{
//
}
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java
b/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java
index 3698511..8170bac 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java
@@ -173,6 +173,7 @@ public class EventDecoder extends
AbstractStreamDecoder debug = new
ConcurrentLinkedQueue<>();
final ConcurrentLinkedQueue info = new
ConcurrentLinkedQueue<>();
+final ConcurrentLinkedQueue warning = new
ConcurrentLinkedQueue<>();
final ConcurrentLinkedQueue error = new
ConcurrentLinkedQueue<>();
final boolean isDebug;
final boolean isInfo;
@@ -1266,6 +1387,7 @@ public class ForkedProcessEventNotifierTest
@Override
public synchronized void warning( String message )
{
+warning.add( message );
called = true;
}
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java
b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java
index 862820c..ff69da8 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java
@@ -379,7 +379,7 @@ public abstract class AbstractStreamDecoder, ST extends E
{
printCorruptedStream( memento );
memento.getLine().printExistingLine();
-memento.getLine().setCount( 0 );
+memento.getLine().clear();
}
/**
@@ -456,26 +456,43 @@ public abstract class AbstractStreamDecoder, ST extends E
int mark = buffer.position();
buffer.position( buffer.limit() );
buffer.limit( min( buffer.position() + recommendedCount,
buffer.capacity() ) );
-boolean isEnd = false;
-while ( !isEnd && buffer.position() - mark < recommendedCount &&
buffer.position() < buffer.limit() )
+return read( buffer, mark, recommendedCount );
+}
+}
+
+private StreamReadStatus read( ByteBuffer buffer, int oldPosition, int
recommendedCount )
+throws IOException
+{
+StreamReadStatus readStatus = null;
+boolean isEnd = false;
+try
+{
+while ( !isEnd && buffer.position() - oldPosition <
recommendedCount && buffer.position() < buffer.limit() )
{
isEnd = channel.read( buffer ) == -1;
}
-
+}
+finally
+{
buffer.limit( buffer.position() );
-buffer.position( mark );
+buffer.position( oldPosition );
int readBytes = buffer.remaining();
-
-if ( isEnd && readBytes < recommendedCount )
-{
-throw new EOFException();
-}
-else
+boolean readComplete = readBytes >=
[maven-surefire] branch comm updated (8f6cf48 -> 5c91083)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch comm
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
discard 8f6cf48 tests should not fail on concurrent access
discard 6819001 [jenkins] temporarily removed JDK 16EA, see INFRA-20981
discard bd04a9e [SUREFIRE-1847] Remove Base64 in the Encoder/Decoder and gain
the performance for the communication flow: Plugin to Fork
add d432cee SUREFIRE-1584: Update example documentation
add 52ec277 [SUREFIRE-1857] JUnit 5 report does not contain assertion
failure message
add 9ef0d6e [SUREFIRE-1840] Distinguish commands in docs
add 942d18b (doc) Grammar fixes for the sentence where it hints you to
fork JVMs.
add 1da3462 [SUREFIRE-1865] ChecksumCalculator getSha1 does not compute
checksums correctly
add 6c209e3 Refer to correct property in skipping-tests doc
add be236f7 Merge pull request #262 from qerub/skipping-tests-doc-fix
add 02d4381 ci: JDK 8, JDK 11, JDK 15
add c59ffee [SUREFIRE-1847] Remove Base64 in the Encoder/Decoder and gain
the performance for the communication flow: Plugin to Fork
add 10d7e33 [jenkins] temporarily removed JDK 16EA, see INFRA-20981
add 8f9745e tests should not fail on concurrent access of
src/test/java/.../*.ConsoleLoggerMock.java
new 5c91083 fixed tests: dump files printed fake data due to the indexes
of ByteBuffer are not shifted for reads after IOException
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8f6cf48)
\
N -- N -- N refs/heads/comm (5c91083)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/maven.yml| 5 +-
.../plugin/surefire/AbstractSurefireMojo.java | 4 +-
.../surefire/booterclient/ChecksumCalculator.java | 5 +-
.../surefire/extensions/EventConsumerThread.java | 3 +-
.../apache/maven/surefire/stream/EventDecoder.java | 1 +
.../booterclient/ChecksumCalculatorTest.java | 26 ++---
.../extensions/ForkedProcessEventNotifierTest.java | 122 +
.../org/apache/maven/surefire/JUnit4SuiteTest.java | 2 +
.../site/apt/examples/rerun-failing-tests.apt.vm | 2 +-
.../src/site/apt/examples/skipping-tests.apt.vm| 2 +-
maven-surefire-plugin/src/site/markdown/docker.md | 9 +-
.../surefire/api/stream/AbstractStreamDecoder.java | 47 +---
.../maven/surefire/booter/CommandReader.java | 3 +-
.../surefire/booter/stream/CommandDecoder.java | 1 +
.../maven/surefire/its/JUnitPlatformEnginesIT.java | 32 ++
.../pom.xml| 2 +-
.../jira1857/AssertionFailureMessageTest.java} | 8 +-
.../pom.xml| 2 +-
.../test/java/jira1857/ExceptionMessageTest.java} | 11 +-
.../surefire/junitplatform/RunListenerAdapter.java | 27 -
20 files changed, 256 insertions(+), 58 deletions(-)
copy
surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/SimpleTest.java
=>
maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculatorTest.java
(69%)
copy surefire-its/src/test/resources/{surefire-1727 =>
surefire-1857-assertion-message}/pom.xml (97%)
copy
surefire-its/src/test/resources/{surefire-1748-fail-no-parameters/src/test/java/jira1748/AssertionsFailNoParametersJupiterTest.java
=>
surefire-1857-assertion-message/src/test/java/jira1857/AssertionFailureMessageTest.java}
(89%)
copy surefire-its/src/test/resources/{surefire-1727 =>
surefire-1857-exception-message}/pom.xml (97%)
copy
surefire-its/src/test/resources/{surefire-1748-fail-no-parameters/src/test/java/jira1748/AssertionsFailNoParametersJupiterTest.java
=>
surefire-1857-exception-message/src/test/java/jira1857/ExceptionMessageTest.java}
(84%)
[maven-shared-utils] 01/01: Upgrade jansi to 2.2.0
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MSHARED-973 in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git commit 80d6342f6ac54228dfe46547ae8db924916b0df4 Author: Guillaume Nodet AuthorDate: Thu Jan 21 11:02:07 2021 +0100 Upgrade jansi to 2.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 87cee13..f548340 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ org.fusesource.jansi jansi - 2.0.1 + 2.2.0 true
[maven-shared-utils] branch MSHARED-973 created (now 80d6342)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MSHARED-973 in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git. at 80d6342 Upgrade jansi to 2.2.0 This branch includes the following new commits: new 80d6342 Upgrade jansi to 2.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-shared-utils] branch master updated: [MSHARED-973] Upgrade jansi to 2.2.0
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git The following commit(s) were added to refs/heads/master by this push: new c6ae143 [MSHARED-973]Upgrade jansi to 2.2.0 c6ae143 is described below commit c6ae1438bc08fe202fbd699af324ce1a81396dc9 Author: Guillaume Nodet AuthorDate: Thu Jan 21 20:54:43 2021 +0100 [MSHARED-973]Upgrade jansi to 2.2.0 Signed-off-by: rfscholte --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 87cee13..f548340 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ org.fusesource.jansi jansi - 2.0.1 + 2.2.0 true
