Skip to content

Commit

Permalink
If invoker.test contains only exclude pattern (expression starts with…
Browse files Browse the repository at this point in the history
… '!'), include pattern is added automatically
  • Loading branch information
bvfalcon committed Jul 26, 2022
1 parent 9168b6c commit 75e9fab
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 1 deletion.
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.invoker.its</groupId>
<artifactId>minvoker-138</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.1.1</version>
<executions>
<execution>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<AlwaysPass/>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion src/it/invocation-cmdline-exclude/test.properties
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

invoker.test = !minvoker-140
invoker.test = !*-ignorable
50 changes: 50 additions & 0 deletions src/it/invocation-cmdline-exclude/verify.bsh
@@ -0,0 +1,50 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import java.io.*;
import java.util.*;
import java.util.regex.*;

import org.codehaus.plexus.util.*;

try
{
File executableProjectReport = new File( basedir, "target/invoker-reports/BUILD-minvoker-140-executable.xml" );
System.out.println( "Checking for existence of minvoker-140-executable report file: " + executableProjectReport );
if ( !executableProjectReport.exists() )
{
System.out.println( "FAILED!" );
return false;
}

File ignorableProjectReport = new File( basedir, "target/invoker-reports/BUILD-minvoker-140-ignorable.xml" );
System.out.println( "Checking for non-existence of minvoker-140-ignorable report file: " + ignorableProjectReport );
if ( ignorableProjectReport.exists() )
{
System.out.println( "FAILED!" );
return false;
}
}
catch( Throwable t )
{
t.printStackTrace();
return false;
}

return true;
Expand Up @@ -2431,6 +2431,10 @@ private List<BuildJob> scanProjectsDirectory( List<String> includes, List<String
}
if ( excludes != null )
{
if ( ( includes == null || includes.isEmpty() ) && !excludes.isEmpty() )
{
scanner.setIncludes( new String[] { "*" } );
}
scanner.setExcludes( excludes.toArray( new String[0] ) );
}
scanner.addDefaultExcludes();
Expand Down

0 comments on commit 75e9fab

Please sign in to comment.