You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/05/09 19:20:27 UTC
[maven] branch MNG-6873 created (now 5397fb6)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6873
in repository https://gitbox.apache.org/repos/asf/maven.git.
at 5397fb6 [MNG-6873] Align JUnit version to 4.13
This branch includes the following new commits:
new 5397fb6 [MNG-6873] Align JUnit version to 4.13
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] 01/01: [MNG-6873] Align JUnit version to 4.13
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6873
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 5397fb66e7ea45dd756cd48c18f7dc476e2a06a6
Author: huangkaifeng <ca...@gmail.com>
AuthorDate: Mon Mar 2 22:10:50 2020 +0800
[MNG-6873] Align JUnit version to 4.13
Closes #331
---
.../src/test/java/org/apache/maven/project/PomConstructionTest.java | 2 +-
.../test/projects/lifecycle-executor/project-with-inheritance/pom.xml | 2 +-
.../src/test/projects/plugin-manager/project-with-inheritance/pom.xml | 2 +-
.../src/test/resources-project-builder/dependency-inheritance/pom.xml | 2 +-
.../test/resources-project-builder/dependency-inheritance/sub/pom.xml | 2 +-
maven-core/src/test/resources-project-builder/micromailer/pom.xml | 2 +-
maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml | 2 +-
maven-embedder/src/examples/simple-project/pom.xml | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index 103d399..ccc03d0 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -973,7 +973,7 @@ public class PomConstructionTest
{
PomTestWrapper pom = buildPom( "dependency-inheritance/sub" );
assertEquals( 1, ( (List<?>) pom.getValue( "dependencies" ) ).size() );
- assertEquals( "4.4", pom.getValue( "dependencies[1]/version" ) );
+ assertEquals( "4.13", pom.getValue( "dependencies[1]/version" ) );
}
/** MNG-4034 */
diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
index c19061a..c9a894d 100644
--- a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
+++ b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
@@ -53,7 +53,7 @@ under the License.
-->
<doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
- <junitVersion>3.8.1</junitVersion>
+ <junitVersion>4.13</junitVersion>
<plexusVersion>1.0-beta-3.0.7</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
diff --git a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml
index c19061a..c9a894d 100644
--- a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml
+++ b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml
@@ -53,7 +53,7 @@ under the License.
-->
<doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
- <junitVersion>3.8.1</junitVersion>
+ <junitVersion>4.13</junitVersion>
<plexusVersion>1.0-beta-3.0.7</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
diff --git a/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml
index 7f9e4ff..88e99a9 100644
--- a/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml
+++ b/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml
@@ -33,7 +33,7 @@ under the License.
<packaging>pom</packaging>
<properties>
- <junitVersion>3.8.1</junitVersion>
+ <junitVersion>4.13</junitVersion>
</properties>
<!--start-->
<dependencies>
diff --git a/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml
index d5d80d8..70b9f00 100644
--- a/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml
@@ -25,7 +25,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-core/src/test/resources-project-builder/micromailer/pom.xml b/maven-core/src/test/resources-project-builder/micromailer/pom.xml
index de01fd0..ba6d880 100644
--- a/maven-core/src/test/resources-project-builder/micromailer/pom.xml
+++ b/maven-core/src/test/resources-project-builder/micromailer/pom.xml
@@ -97,7 +97,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.13</version>
<type>jar</type>
<scope>test</scope>
</dependency>
diff --git a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
index cd0a3d8..531e551 100644
--- a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
+++ b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
@@ -53,7 +53,7 @@ under the License.
-->
<doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
- <junitVersion>3.8.1</junitVersion>
+ <junitVersion>4.13</junitVersion>
<plexusVersion>1.0-beta-3.0.7-SNAPSHOT</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
diff --git a/maven-embedder/src/examples/simple-project/pom.xml b/maven-embedder/src/examples/simple-project/pom.xml
index 62de37a..843b38e 100644
--- a/maven-embedder/src/examples/simple-project/pom.xml
+++ b/maven-embedder/src/examples/simple-project/pom.xml
@@ -29,7 +29,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
</dependencies>