You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mt...@apache.org on 2021/11/29 10:09:52 UTC
[maven-integration-testing] branch MNG-7024 updated (3c41e85 -> 0735bad)
This is an automated email from the ASF dual-hosted git repository.
mthmulders pushed a change to branch MNG-7024
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.
discard 3c41e85 [MNG-7024] Update docs for test
discard 6429984 [MNG-7024] Declar module-b as 'jar' packaging
new e212531 [MNG-7024] Declare module-b as 'jar' packaging
new 0735bad [MNG-7024] Update docs for test
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 (3c41e85)
\
N -- N -- N refs/heads/MNG-7024 (0735bad)
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 2 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:
.../src/test/resources/mng-7024-subfolderexecution/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
[maven-integration-testing] 02/02: [MNG-7024] Update docs for test
Posted by mt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mthmulders pushed a commit to branch MNG-7024
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 0735bad2039d41913b213f49e5ebea8b6d01aad0
Author: Maarten Mulders <mt...@apache.org>
AuthorDate: Mon Nov 29 11:01:51 2021 +0100
[MNG-7024] Update docs for test
---
.../test/java/org/apache/maven/it/MavenITmng7024SubdirExecution.java | 4 ++--
core-it-suite/src/test/resources/mng-7024-subfolderexecution/pom.xml | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7024SubdirExecution.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7024SubdirExecution.java
index ea58104..ca0a31b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7024SubdirExecution.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7024SubdirExecution.java
@@ -34,7 +34,7 @@ public class MavenITmng7024SubdirExecution extends AbstractMavenIntegrationTestC
}
/**
- * Executing from a subdirectory, however this folder is NOT part of the rootreactor, hence should not try to bind
+ * Executing from a subdirectory, however this folder is NOT part of the root reactor, hence should not try to bind
*/
public void testShouldIgnoreModuleA() throws Exception
{
@@ -47,7 +47,7 @@ public class MavenITmng7024SubdirExecution extends AbstractMavenIntegrationTestC
verifier1.executeGoal( "install" );
verifier1.deleteDirectory( "target" );
- FileUtils.delete( new File( testDir, "module-a/target/module-a-1.0.jar" ) );
+ FileUtils.delete( new File( testDir, "module-a/target/module-a-1.0.jar" ) );
}
finally
{
diff --git a/core-it-suite/src/test/resources/mng-7024-subfolderexecution/pom.xml b/core-it-suite/src/test/resources/mng-7024-subfolderexecution/pom.xml
index 0e3af5a..600b6cf 100644
--- a/core-it-suite/src/test/resources/mng-7024-subfolderexecution/pom.xml
+++ b/core-it-suite/src/test/resources/mng-7024-subfolderexecution/pom.xml
@@ -32,8 +32,9 @@ under the License.
<name>Maven Integration Test :: MNG-7024</name>
<description>
- If executing 'mvn package :module-b' it should NOT try to pick up module-a from the multimodule project
- because module-b is not part of the rootreactor (it is a profile activated module)
+ When executing 'mvn package' from within the module-b directory, it should NOT try to pick up module-a from the
+ multi-module project. This is because module-b is not part of the root reactor, as it is a profile activated
+ module, and that profile was not activated.
</description>
<properties>
[maven-integration-testing] 01/02: [MNG-7024] Declare module-b as 'jar' packaging
Posted by mt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mthmulders pushed a commit to branch MNG-7024
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit e21253106e08c99f7c954200509d6873c1ea1e5d
Author: Maarten Mulders <mt...@apache.org>
AuthorDate: Mon Nov 29 11:01:16 2021 +0100
[MNG-7024] Declare module-b as 'jar' packaging
This prevents a warning from the maven-assembly-plugin
that module-b has no binary outputs.
---
.../src/test/resources/mng-7024-subfolderexecution/module-b/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core-it-suite/src/test/resources/mng-7024-subfolderexecution/module-b/pom.xml b/core-it-suite/src/test/resources/mng-7024-subfolderexecution/module-b/pom.xml
index 2807ae3..e040aa1 100644
--- a/core-it-suite/src/test/resources/mng-7024-subfolderexecution/module-b/pom.xml
+++ b/core-it-suite/src/test/resources/mng-7024-subfolderexecution/module-b/pom.xml
@@ -31,7 +31,7 @@ under the License.
<version>1.0</version>
</parent>
<artifactId>module-b</artifactId>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>