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/04/05 20:43:09 UTC
[maven-invoker-plugin] 01/01: [MINVOKER-299] fix filtering-extensions test
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MINVOKER-299
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
commit 3b975c0a0d68b199a6a8e66bd3e287eac870cf0e
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Tue Apr 5 22:41:43 2022 +0200
[MINVOKER-299] fix filtering-extensions test
---
src/it/filtering-extensions/pom.xml | 2 +-
.../src/it/project/.mvn/extensions.xml | 6 ++-
src/it/filtering-extensions/src/it/project/pom.xml | 43 -----------------
src/it/filtering-extensions/src/it/settings.xml | 55 ----------------------
4 files changed, 6 insertions(+), 100 deletions(-)
diff --git a/src/it/filtering-extensions/pom.xml b/src/it/filtering-extensions/pom.xml
index 814bdd3..83159f0 100644
--- a/src/it/filtering-extensions/pom.xml
+++ b/src/it/filtering-extensions/pom.xml
@@ -47,7 +47,7 @@ under the License.
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<goals>
- <goal>process-resources</goal>
+ <goal>validate</goal>
</goals>
</configuration>
<executions>
diff --git a/src/it/filtering-extensions/src/it/project/.mvn/extensions.xml b/src/it/filtering-extensions/src/it/project/.mvn/extensions.xml
index 582c508..4da0e06 100644
--- a/src/it/filtering-extensions/src/it/project/.mvn/extensions.xml
+++ b/src/it/filtering-extensions/src/it/project/.mvn/extensions.xml
@@ -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>
diff --git a/src/it/filtering-extensions/src/it/project/pom.xml b/src/it/filtering-extensions/src/it/project/pom.xml
index 88e03db..db0a1dd 100644
--- a/src/it/filtering-extensions/src/it/project/pom.xml
+++ b/src/it/filtering-extensions/src/it/project/pom.xml
@@ -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>
diff --git a/src/it/filtering-extensions/src/it/settings.xml b/src/it/filtering-extensions/src/it/settings.xml
deleted file mode 100644
index 79c5dc1..0000000
--- a/src/it/filtering-extensions/src/it/settings.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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.
--->
-
-<settings>
- <profiles>
- <profile>
- <id>it-repo</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>local.central</id>
- <url>file://@localRepository@</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>local.central</id>
- <url>file://@localRepository@</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-</settings>