You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/09/18 13:27:24 UTC
[maven-invoker-plugin] branch MINVOKER-311 created (now 304d2d5)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MINVOKER-311
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
at 304d2d5 [MINVOKER-311] Override reports directory in IT test
This branch includes the following new commits:
new 304d2d5 [MINVOKER-311] Override reports directory in IT test
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-invoker-plugin] 01/01: [MINVOKER-311] Override reports directory in IT test
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MINVOKER-311
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
commit 304d2d5c5ee1b22542aa0ed44ef04bc0613fd226
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sun Sep 18 15:27:09 2022 +0200
[MINVOKER-311] Override reports directory in IT test
---
pom.xml | 2 ++
src/it/MINVOKER-196_junit_report_file/verify.groovy | 2 +-
src/it/MINVOKER-288-failed-setup-run/verify.groovy | 2 +-
src/it/MINVOKER-288-failed-setup-verify/verify.groovy | 2 +-
src/it/invocation-cmdline-exclude/verify.groovy | 4 ++--
src/it/project-setup/verify.bsh | 2 +-
src/it/selector-scripts/setup.groovy | 2 +-
src/it/selector-scripts/verify.bsh | 10 +++++-----
8 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index d9f0640..114770d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,6 +359,8 @@ under the License.
<properties>
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+ <!-- in order to stop Jenkins to recognized reports from test as project report -->
+ <invoker.reportsDirectory>target/invoker-reports-test</invoker.reportsDirectory>
</properties>
<scriptVariables>
<projectVersion>${project.version}</projectVersion>
diff --git a/src/it/MINVOKER-196_junit_report_file/verify.groovy b/src/it/MINVOKER-196_junit_report_file/verify.groovy
index df3402f..34fb6f1 100644
--- a/src/it/MINVOKER-196_junit_report_file/verify.groovy
+++ b/src/it/MINVOKER-196_junit_report_file/verify.groovy
@@ -19,7 +19,7 @@
File buildLog = new File( basedir, 'build.log' )
assert buildLog.text.contains( '[INFO] run post-build script verify.groovy' )
-File invokerReports = new File( new File(basedir, "target"), 'invoker-reports' )
+File invokerReports = new File( new File(basedir, "target"), 'invoker-reports-test' )
assert invokerReports.exists()
// test on first project
diff --git a/src/it/MINVOKER-288-failed-setup-run/verify.groovy b/src/it/MINVOKER-288-failed-setup-run/verify.groovy
index 92bed15..5aac8b5 100644
--- a/src/it/MINVOKER-288-failed-setup-run/verify.groovy
+++ b/src/it/MINVOKER-288-failed-setup-run/verify.groovy
@@ -18,7 +18,7 @@
*/
-File invokerReports = new File( new File(basedir, 'target'), 'invoker-reports' )
+File invokerReports = new File( new File(basedir, 'target'), 'invoker-reports-test' )
assert invokerReports.exists()
def build1 = new XmlSlurper().parse( new File( invokerReports, 'BUILD-project1.xml' ) )
diff --git a/src/it/MINVOKER-288-failed-setup-verify/verify.groovy b/src/it/MINVOKER-288-failed-setup-verify/verify.groovy
index 450fd57..991388b 100644
--- a/src/it/MINVOKER-288-failed-setup-verify/verify.groovy
+++ b/src/it/MINVOKER-288-failed-setup-verify/verify.groovy
@@ -18,7 +18,7 @@
*/
-File invokerReports = new File( new File(basedir, "target"), 'invoker-reports' )
+File invokerReports = new File( new File(basedir, "target"), 'invoker-reports-test' )
assert invokerReports.exists()
def build1 = new XmlSlurper().parse( new File( invokerReports, "BUILD-project1.xml" ) )
diff --git a/src/it/invocation-cmdline-exclude/verify.groovy b/src/it/invocation-cmdline-exclude/verify.groovy
index aab48ab..ee8a8f9 100644
--- a/src/it/invocation-cmdline-exclude/verify.groovy
+++ b/src/it/invocation-cmdline-exclude/verify.groovy
@@ -16,6 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-assert new File(basedir, 'target/invoker-reports/BUILD-minvoker-140-executable.xml').exists()
-assert !new File(basedir, 'target/invoker-reports/BUILD-minvoker-140-ignorable.xml').exists()
+assert new File(basedir, 'target/invoker-reports-test/BUILD-minvoker-140-executable.xml').exists()
+assert !new File(basedir, 'target/invoker-reports-test/BUILD-minvoker-140-ignorable.xml').exists()
diff --git a/src/it/project-setup/verify.bsh b/src/it/project-setup/verify.bsh
index 59a985d..d6d8643 100644
--- a/src/it/project-setup/verify.bsh
+++ b/src/it/project-setup/verify.bsh
@@ -59,7 +59,7 @@ try
return false;
}
- File reportFile = new File( basedir, "target/invoker-reports/BUILD-project1.xml" );
+ File reportFile = new File( basedir, "target/invoker-reports-test/BUILD-project1.xml" );
if ( !reportFile.exists() )
{
System.out.println( "reportFile not exists FAILED!" );
diff --git a/src/it/selector-scripts/setup.groovy b/src/it/selector-scripts/setup.groovy
index ac78115..054111a 100644
--- a/src/it/selector-scripts/setup.groovy
+++ b/src/it/selector-scripts/setup.groovy
@@ -21,7 +21,7 @@ import org.apache.commons.io.FileUtils
// Previous potential target 'content' has impact on IT execution
// (Some new file should be created by verify.sh)
-FileUtils.deleteQuietly( new File( basedir, "target/invoker-reports" ) );
+FileUtils.deleteQuietly( new File( basedir, "target/invoker-reports-test" ) );
FileUtils.deleteQuietly( new File( basedir, "src/it/script-ret-quiet/target" ) );
FileUtils.deleteQuietly( new File( basedir, "src/it/script-ret-true/target" ) );
return true;
diff --git a/src/it/selector-scripts/verify.bsh b/src/it/selector-scripts/verify.bsh
index 422b5d9..6202104 100644
--- a/src/it/selector-scripts/verify.bsh
+++ b/src/it/selector-scripts/verify.bsh
@@ -57,8 +57,8 @@ try
}
String[] success = {
- "target/invoker-reports/BUILD-script-ret-true.xml",
- "target/invoker-reports/BUILD-script-ret-quiet.xml",
+ "target/invoker-reports-test/BUILD-script-ret-true.xml",
+ "target/invoker-reports-test/BUILD-script-ret-quiet.xml",
};
for ( String file : success )
{
@@ -73,8 +73,8 @@ try
}
String[] skipped = {
- "target/invoker-reports/BUILD-script-ret-false.xml",
- "target/invoker-reports/BUILD-script-ret-other.xml",
+ "target/invoker-reports-test/BUILD-script-ret-false.xml",
+ "target/invoker-reports-test/BUILD-script-ret-other.xml",
};
for ( String file : skipped )
{
@@ -90,7 +90,7 @@ try
String[] inerror = {
- "target/invoker-reports/BUILD-script-throw.xml",
+ "target/invoker-reports-test/BUILD-script-throw.xml",
};
for ( String file : inerror )
{