Skip to content

Commit

Permalink
[MINVOKER-299] fix filtering-extensions test
Browse files Browse the repository at this point in the history
  • Loading branch information
slawekjaranowski committed Apr 6, 2022
1 parent 8ee5229 commit 7fe0722
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 100 deletions.
2 changes: 1 addition & 1 deletion src/it/filtering-extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ under the License.
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<goals>
<goal>process-resources</goal>
<goal>validate</goal>
</goals>
</configuration>
<executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,14 @@ under the License.
-->
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extensions>
<!--
used only for checking filtering - we don't test extension executions
<extension>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
</extension>
-->
</extensions>
43 changes: 0 additions & 43 deletions src/it/filtering-extensions/src/it/project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,47 +25,4 @@ under the License.
<artifactId>pom-filtering</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- ${...} must be left unfiltered -->
<prop0>${project.version}</prop0>
<!-- these must be filtered -->
<prop1>@project.version@</prop1>
<prop2>@propertyFromPluginConfig@</prop2>
<prop3>@propertyFromPropertiesSection@</prop3>
<!-- this must not be resolved to project.version, i.e. the prefix matters -->
<prop4>@project-is-not-the-pom.version@</prop4>
<!-- POM values must precede other properties -->
<prop5>@project.name@</prop5>
<prop6>@pom.name@</prop6>
<!-- properties from the plugin config must precede values from the POM's <properties> section -->
<prop7>@itProperty@</prop7>
<!-- properties with prefix "project"/"pom" must fallback to plugin config if no matching POM value exists -->
<prop8>@project.nonExistingPomValue@</prop8>
<!-- built-in properties must not be overridden by properties from the plugin configuration -->
<prop9>@basedir@</prop9>
<prop10>@baseurl@</prop10>
<prop11>@localRepository@</prop11>
<prop12>@localRepositoryUrl@</prop12>
</properties>

<build>
<!-- using the Resources Plugin to create a backup of the executed POM for later inspection by the parent build -->
<resources>
<resource>
<directory>${basedir}</directory>
<filtering>false</filtering>
<includes>
<include>*.xml</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.2</version>
</plugin>
</plugins>
</build>
</project>
55 changes: 0 additions & 55 deletions src/it/filtering-extensions/src/it/settings.xml

This file was deleted.

0 comments on commit 7fe0722

Please sign in to comment.