This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch cstamas-ant-update
in repository https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git
The following commit(s) were added to refs/heads/cstamas-ant-update by this
push:
new 2d056f2 Make it all pass
2d056f2 is described below
commit 2d056f269af2dc24378bb345c62e4daeb6a60b26
Author: Tamas Cservenak <[email protected]>
AuthorDate: Sun Nov 14 22:50:03 2021 +0100
Make it all pass
---
.../org/apache/maven/resolver/internal/ant/AntSecDispatcher.java | 2 +-
.../java/org/apache/maven/resolver/internal/ant/AntBuildsTest.java | 2 ++
.../org/apache/maven/resolver/internal/ant/tasks/LayoutTest.java | 5 ++++-
.../org/apache/maven/resolver/internal/ant/types/DependencyTest.java | 5 ++++-
.../org/apache/maven/resolver/internal/ant/types/ExclusionTest.java | 4 ++++
.../java/org/apache/maven/resolver/internal/ant/types/PomTest.java | 4 ++++
6 files changed, 19 insertions(+), 3 deletions(-)
diff --git
a/src/main/java/org/apache/maven/resolver/internal/ant/AntSecDispatcher.java
b/src/main/java/org/apache/maven/resolver/internal/ant/AntSecDispatcher.java
index 29c621b..5ee044b 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/AntSecDispatcher.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntSecDispatcher.java
@@ -32,7 +32,7 @@ class AntSecDispatcher
AntSecDispatcher()
{
- super(new DefaultPlexusCipher(), Collections.emptyMap(),
"~/.m2/settings-security.xml");
+ super( new DefaultPlexusCipher(), Collections.emptyMap(),
"~/.m2/settings-security.xml" );
}
}
diff --git
a/src/test/java/org/apache/maven/resolver/internal/ant/AntBuildsTest.java
b/src/test/java/org/apache/maven/resolver/internal/ant/AntBuildsTest.java
index f3ca6c9..9b11a0a 100644
--- a/src/test/java/org/apache/maven/resolver/internal/ant/AntBuildsTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/AntBuildsTest.java
@@ -39,6 +39,8 @@ public abstract class AntBuildsTest
static
{
+ System.setProperty("aether.metadataResolver.threads", "1");
+ System.setProperty("aether.connector.basic.threads", "1");
BASE_DIR = new File( "" ).getAbsoluteFile();
BUILD_DIR = new File( BASE_DIR, "target/ant" );
}
diff --git
a/src/test/java/org/apache/maven/resolver/internal/ant/tasks/LayoutTest.java
b/src/test/java/org/apache/maven/resolver/internal/ant/tasks/LayoutTest.java
index f79729b..d9efbcb 100644
--- a/src/test/java/org/apache/maven/resolver/internal/ant/tasks/LayoutTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/tasks/LayoutTest.java
@@ -21,7 +21,7 @@ package org.apache.maven.resolver.internal.ant.tasks;
import static org.junit.Assert.assertEquals;
-import org.apache.maven.resolver.internal.ant.tasks.Layout;
+import junit.framework.JUnit4TestAdapter;
import org.apache.tools.ant.BuildException;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.junit.Test;
@@ -30,6 +30,9 @@ import org.junit.Test;
*/
public class LayoutTest
{
+ public static junit.framework.Test suite() {
+ return new JUnit4TestAdapter(LayoutTest.class);
+ }
@Test( expected = BuildException.class )
public void testUnknownVariable()
diff --git
a/src/test/java/org/apache/maven/resolver/internal/ant/types/DependencyTest.java
b/src/test/java/org/apache/maven/resolver/internal/ant/types/DependencyTest.java
index 10ca42b..1bcd731 100644
---
a/src/test/java/org/apache/maven/resolver/internal/ant/types/DependencyTest.java
+++
b/src/test/java/org/apache/maven/resolver/internal/ant/types/DependencyTest.java
@@ -21,13 +21,16 @@ package org.apache.maven.resolver.internal.ant.types;
import static org.junit.Assert.*;
-import org.apache.maven.resolver.internal.ant.types.Dependency;
+import junit.framework.JUnit4TestAdapter;
import org.junit.Test;
/**
*/
public class DependencyTest
{
+ public static junit.framework.Test suite() {
+ return new JUnit4TestAdapter(DependencyTest.class);
+ }
@Test
public void testSetCoordsGidAidVer()
diff --git
a/src/test/java/org/apache/maven/resolver/internal/ant/types/ExclusionTest.java
b/src/test/java/org/apache/maven/resolver/internal/ant/types/ExclusionTest.java
index 64d510f..7fe5550 100644
---
a/src/test/java/org/apache/maven/resolver/internal/ant/types/ExclusionTest.java
+++
b/src/test/java/org/apache/maven/resolver/internal/ant/types/ExclusionTest.java
@@ -21,6 +21,7 @@ package org.apache.maven.resolver.internal.ant.types;
import static org.junit.Assert.*;
+import junit.framework.JUnit4TestAdapter;
import org.apache.maven.resolver.internal.ant.types.Exclusion;
import org.junit.Test;
@@ -28,6 +29,9 @@ import org.junit.Test;
*/
public class ExclusionTest
{
+ public static junit.framework.Test suite() {
+ return new JUnit4TestAdapter(ExclusionTest.class);
+ }
@Test
public void testSetCoordsGid()
diff --git
a/src/test/java/org/apache/maven/resolver/internal/ant/types/PomTest.java
b/src/test/java/org/apache/maven/resolver/internal/ant/types/PomTest.java
index 35131b1..78e6d69 100644
--- a/src/test/java/org/apache/maven/resolver/internal/ant/types/PomTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/types/PomTest.java
@@ -21,6 +21,7 @@ package org.apache.maven.resolver.internal.ant.types;
import static org.junit.Assert.*;
+import junit.framework.JUnit4TestAdapter;
import org.apache.maven.resolver.internal.ant.types.Pom;
import org.junit.Test;
@@ -28,6 +29,9 @@ import org.junit.Test;
*/
public class PomTest
{
+ public static junit.framework.Test suite() {
+ return new JUnit4TestAdapter(PomTest.class);
+ }
@Test
public void testSetCoordsGid()