Skip to content

Commit

Permalink
[MINVOKER-306] - Fixed bug if only exclude-patterns specified
Browse files Browse the repository at this point in the history
  • Loading branch information
bvfalcon authored and slawekjaranowski committed Jul 29, 2022
1 parent c4ea51c commit c07ca87
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 2 deletions.
@@ -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>3.1.0</version>
<executions>
<execution>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<AlwaysPass/>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Expand Up @@ -35,7 +35,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.1.1</version>
<version>3.1.0</version>
<executions>
<execution>
<goals>
Expand Down
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
21 changes: 21 additions & 0 deletions src/it/invocation-cmdline-exclude/verify.groovy
@@ -0,0 +1,21 @@
/*
* 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.
*/
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()

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 c07ca87

Please sign in to comment.