You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2022/02/21 21:20:10 UTC
[maven-surefire] branch event-consumer-isalive updated (f6f92a3 -> ce12613)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch event-consumer-isalive
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
discard f6f92a3 investigating UmlautDirIT
new ce12613 investigating UmlautDirIT
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 (f6f92a3)
\
N -- N -- N refs/heads/event-consumer-isalive (ce12613)
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:
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-surefire] 01/01: investigating UmlautDirIT
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch event-consumer-isalive
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit ce12613155c550658e2e74885c9f9c6858a51f7b
Author: tibor.digana <ti...@apache.org>
AuthorDate: Mon Feb 21 22:15:51 2022 +0100
investigating UmlautDirIT
---
Jenkinsfile | 8 ++++----
surefire-its/pom.xml | 6 +++---
.../test/java/org/apache/maven/surefire/its/UmlautDirIT.java | 2 +-
.../org/apache/maven/surefire/its/fixture/MavenLauncher.java | 12 +++++++-----
4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d5514e2..ff20118 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,12 +29,12 @@ properties(
disableConcurrentBuilds()
]
)
-final def oses = ['linux':'ubuntu', 'windows':'windows-he']
-final def mavens = env.BRANCH_NAME == 'master' ? ['3.6.x', '3.2.x'] : ['3.2.x']
+final def oses = ['linux':'ubuntu && H49']
+final def mavens = ['3.2.x']
// all non-EOL versions and the first EA
-final def jdks = [18, 17, 11, 8]
+final def jdks = [18]
-final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
+final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its', '-DskipTests']
final def goals = ['clean', 'install']
final def goalsDepl = ['clean', 'deploy']
final Map stages = [:]
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index e63e7da..88be804 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -202,14 +202,14 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
<configuration>
- <skipTests>${skipTests}</skipTests>
+ <skipTests>false</skipTests>
<runOrder>alphabetical</runOrder>
<threadCount>1</threadCount>
<perCoreThreadCount>false</perCoreThreadCount>
<forkMode>once</forkMode>
<argLine>-server -Xmx64m -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.awt.headless=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
<includes>
- <include>org/apache/**/*IT*.java</include>
+ <include>UmlautDirIT</include>
</includes>
<!-- Pass current surefire version to the main suite so that it -->
<!-- can forward to all integration test projects. SUREFIRE-513 -->
@@ -222,7 +222,7 @@
<verifier.forkMode>forked</verifier.forkMode>
<jacoco.agent>${jacoco-it.agent}</jacoco.agent>
</systemPropertyVariables>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
<shutdown>kill</shutdown>
</configuration>
<dependencies>
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
index 8bcdfd4..213de18 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
@@ -153,7 +153,7 @@ public class UmlautDirIT extends SurefireJUnit4IntegrationTestCase
SurefireLauncher unpack = unpack( "junit-pathWithUmlaut" );
MavenLauncher maven = unpack.maven();
- File dest = new File( maven.getUnpackedAt().getParentFile().getPath(), projectDirectory + postfix );
+ File dest = new File( maven.getUnpackedAt().getParentFile(), projectDirectory + postfix );
maven.moveUnpackTo( dest );
return unpack;
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index 8dc2465..1aeeb5d 100755
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -27,6 +27,7 @@ import org.apache.maven.shared.utils.io.FileUtils;
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -103,15 +104,16 @@ public final class MavenLauncher
public void moveUnpackTo( File dest ) throws IOException
{
+ String fileEncoding = System.getProperty( "file.encoding" );
+ String os = System.getProperty( "os.name" );
+ String version = System.getProperty( "os.version" );
+ String arch = System.getProperty( "os.arch" );
+ System.out.println( Charset.defaultCharset() + " " + fileEncoding + " " + os + " " + version + " " + arch );
+
FileUtils.deleteDirectory( dest );
- //noinspection ResultOfMethodCallIgnored
boolean moved = getUnpackedAt().renameTo( dest );
if ( !moved )
{
- String fileEncoding = System.getProperty( "file.encoding" );
- String os = System.getProperty( "os.name" );
- String version = System.getProperty( "os.version" );
- String arch = System.getProperty( "os.arch" );
throw new IOException( "Could not move " + getUnpackedAt() + " to " + dest
+ " (file.encoding=" + fileEncoding + ", " + os + " " + version + " " + arch + ")." );
}