You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2018/10/24 19:37:21 UTC
[maven-surefire] branch master updated: renewed old settings.xml
for ITs
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 03cd23b renewed old settings.xml for ITs
03cd23b is described below
commit 03cd23b0f60319f2d3107e7f2eac3cf1f451d7c2
Author: Tibor17 <ti...@apache.org>
AuthorDate: Wed Oct 24 21:37:07 2018 +0200
renewed old settings.xml for ITs
---
surefire-its/pom.xml | 18 +++++++++++++++--
surefire-its/src/test/resources/settings.xml | 29 ----------------------------
2 files changed, 16 insertions(+), 31 deletions(-)
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index 870e23d..04f009d 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -87,7 +87,6 @@
<directory>src/test/resources</directory>
<targetPath>${project.build.outputDirectory}</targetPath>
<excludes>
- <exclude>settings.xml</exclude>
<exclude>toolchains.xml</exclude>
</excludes>
</resource>
@@ -96,7 +95,6 @@
<filtering>true</filtering>
<targetPath>${project.build.directory}/private</targetPath>
<includes>
- <include>settings.xml</include>
<include>toolchains.xml</include>
</includes>
</resource>
@@ -128,6 +126,22 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-help-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>settings.xml</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>effective-settings</goal>
+ </goals>
+ <configuration>
+ <output>${project.build.directory}/private/settings.xml</output>
+ <showPasswords>false</showPasswords>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
diff --git a/surefire-its/src/test/resources/settings.xml b/surefire-its/src/test/resources/settings.xml
deleted file mode 100644
index 69a1c2a..0000000
--- a/surefire-its/src/test/resources/settings.xml
+++ /dev/null
@@ -1,29 +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 xmlns="http://maven.apache.org/SETTINGS/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
- <localRepository>${maven.repo.local}</localRepository>
- <interactiveMode>false</interactiveMode>
- <pluginGroups>
- <pluginGroup>org.apache.maven.plugins</pluginGroup>
- <pluginGroup>org.codehaus.mojo</pluginGroup>
- </pluginGroups>
-</settings>