This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push: new 71ceb17 Renormalize line endings (#117) 71ceb17 is described below commit 71ceb17bfda89c7f33b917ede4c245fb33d68e9a Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Tue Oct 5 13:40:31 2021 +0200 Renormalize line endings (#117) --- .../src/test/resources/it0146/project/pom.xml | 60 ++++---- .../test/resources/mng-4148/settings-template.xml | 46 +++--- .../src/test/resources/mng-5898/ear/pom.xml | 94 ++++++------ .../src/test/resources/mng-5898/ejbs/pom.xml | 74 +++++----- core-it-suite/src/test/resources/mng-5898/pom.xml | 164 ++++++++++----------- .../test/resources/mng-5898/primary-source/pom.xml | 72 ++++----- .../resources/mng-5898/projects/logging/pom.xml | 24 +-- .../src/test/resources/mng-5898/projects/pom.xml | 32 ++-- .../src/test/resources/mng-5898/servlets/pom.xml | 34 ++--- .../resources/mng-5898/servlets/servlet/pom.xml | 38 ++--- .../servlets/servlet/src/main/webapp/index.jsp | 10 +- 11 files changed, 324 insertions(+), 324 deletions(-) diff --git a/core-it-suite/src/test/resources/it0146/project/pom.xml b/core-it-suite/src/test/resources/it0146/project/pom.xml index d5144c8..32b5dab 100644 --- a/core-it-suite/src/test/resources/it0146/project/pom.xml +++ b/core-it-suite/src/test/resources/it0146/project/pom.xml @@ -1,30 +1,30 @@ -<?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> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.its.it0146</groupId> - <artifactId>dep</artifactId> - <version>0.1-SNAPSHOT</version> - <packaging>jar</packaging> - -</project> +<?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> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.it0146</groupId> + <artifactId>dep</artifactId> + <version>0.1-SNAPSHOT</version> + <packaging>jar</packaging> + +</project> diff --git a/core-it-suite/src/test/resources/mng-4148/settings-template.xml b/core-it-suite/src/test/resources/mng-4148/settings-template.xml index 258f7c3..f151c72 100644 --- a/core-it-suite/src/test/resources/mng-4148/settings-template.xml +++ b/core-it-suite/src/test/resources/mng-4148/settings-template.xml @@ -1,24 +1,24 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<settings 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/xsd/settings-1.0.0.xsd"> - <mirrors> - <mirror> - <id>test</id> - <mirrorOf>external:*</mirrorOf> - <url>@baseurl@/remote-repository</url> - </mirror> - </mirrors> - - <profiles> - <profile> - <id>inject</id> - <properties> - <depVersion>1.0.0</depVersion> - </properties> - </profile> - </profiles> - <activeProfiles> - <activeProfile>inject</activeProfile> - </activeProfiles> +<?xml version="1.0" encoding="ISO-8859-1"?> +<settings 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/xsd/settings-1.0.0.xsd"> + <mirrors> + <mirror> + <id>test</id> + <mirrorOf>external:*</mirrorOf> + <url>@baseurl@/remote-repository</url> + </mirror> + </mirrors> + + <profiles> + <profile> + <id>inject</id> + <properties> + <depVersion>1.0.0</depVersion> + </properties> + </profile> + </profiles> + <activeProfiles> + <activeProfile>inject</activeProfile> + </activeProfiles> </settings> \ No newline at end of file diff --git a/core-it-suite/src/test/resources/mng-5898/ear/pom.xml b/core-it-suite/src/test/resources/mng-5898/ear/pom.xml index fd0b19a..2eebe45 100644 --- a/core-it-suite/src/test/resources/mng-5898/ear/pom.xml +++ b/core-it-suite/src/test/resources/mng-5898/ear/pom.xml @@ -1,47 +1,47 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>root.project</groupId> - <artifactId>ear</artifactId> - <packaging>ear</packaging> - <version>1.0</version> - <name>ear assembly</name> - <parent> - <groupId>root</groupId> - <artifactId>project</artifactId> - <version>1.0</version> - </parent> - <dependencies> - <dependency> - <groupId>root.project</groupId> - <artifactId>ejbs</artifactId> - <type>ejb</type> - </dependency> - <dependency> - <groupId>root.project.servlets</groupId> - <artifactId>servlet</artifactId> - <type>war</type> - </dependency> - <dependency> - <groupId>root.project</groupId> - <artifactId>primary-source</artifactId> - </dependency> - <dependency> - <groupId>root.project.projects</groupId> - <artifactId>logging</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-ear-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - </build> -</project> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>root.project</groupId> + <artifactId>ear</artifactId> + <packaging>ear</packaging> + <version>1.0</version> + <name>ear assembly</name> + <parent> + <groupId>root</groupId> + <artifactId>project</artifactId> + <version>1.0</version> + </parent> + <dependencies> + <dependency> + <groupId>root.project</groupId> + <artifactId>ejbs</artifactId> + <type>ejb</type> + </dependency> + <dependency> + <groupId>root.project.servlets</groupId> + <artifactId>servlet</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>root.project</groupId> + <artifactId>primary-source</artifactId> + </dependency> + <dependency> + <groupId>root.project.projects</groupId> + <artifactId>logging</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/core-it-suite/src/test/resources/mng-5898/ejbs/pom.xml b/core-it-suite/src/test/resources/mng-5898/ejbs/pom.xml index d7823fe..3477dd7 100644 --- a/core-it-suite/src/test/resources/mng-5898/ejbs/pom.xml +++ b/core-it-suite/src/test/resources/mng-5898/ejbs/pom.xml @@ -1,37 +1,37 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>root.project</groupId> - <artifactId>ejbs</artifactId> - <packaging>ejb</packaging> - <version>1.0</version> - <name>enterprise java beans</name> - <parent> - <groupId>root</groupId> - <artifactId>project</artifactId> - <version>1.0</version> - </parent> - <dependencies> - <dependency> - <groupId>root.project</groupId> - <artifactId>primary-source</artifactId> - </dependency> - <dependency> - <groupId>root.project.projects</groupId> - <artifactId>logging</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-ejb-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - </build> -</project> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>root.project</groupId> + <artifactId>ejbs</artifactId> + <packaging>ejb</packaging> + <version>1.0</version> + <name>enterprise java beans</name> + <parent> + <groupId>root</groupId> + <artifactId>project</artifactId> + <version>1.0</version> + </parent> + <dependencies> + <dependency> + <groupId>root.project</groupId> + <artifactId>primary-source</artifactId> + </dependency> + <dependency> + <groupId>root.project.projects</groupId> + <artifactId>logging</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-ejb-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/core-it-suite/src/test/resources/mng-5898/pom.xml b/core-it-suite/src/test/resources/mng-5898/pom.xml index 1f9e736..c127681 100644 --- a/core-it-suite/src/test/resources/mng-5898/pom.xml +++ b/core-it-suite/src/test/resources/mng-5898/pom.xml @@ -1,82 +1,82 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>root</groupId> - <version>1.0</version> - <artifactId>project</artifactId> - <packaging>pom</packaging> - <name>project</name> - <modules> - <module>projects</module> - <module>primary-source</module> - <module>servlets</module> - <module>ejbs</module> - <module>ear</module> - </modules> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ejb-plugin</artifactId> - <version>2.5.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.7</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <version>2.8</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.6</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.12.4</version> - </plugin> - </plugins> - </pluginManagement> - </build> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>root.project.projects</groupId> - <artifactId>logging</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>root.project</groupId> - <artifactId>primary-source</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>root.project.servlets</groupId> - <artifactId>servlet</artifactId> - <version>1.0</version> - <type>war</type> - </dependency> - <dependency> - <groupId>root.project</groupId> - <artifactId>ejbs</artifactId> - <version>1.0</version> - <type>ejb</type> - </dependency> - </dependencies> - </dependencyManagement> -</project> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>root</groupId> + <version>1.0</version> + <artifactId>project</artifactId> + <packaging>pom</packaging> + <name>project</name> + <modules> + <module>projects</module> + <module>primary-source</module> + <module>servlets</module> + <module>ejbs</module> + <module>ear</module> + </modules> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ejb-plugin</artifactId> + <version>2.5.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.7</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <version>2.8</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.6</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.12.4</version> + </plugin> + </plugins> + </pluginManagement> + </build> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>root.project.projects</groupId> + <artifactId>logging</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>root.project</groupId> + <artifactId>primary-source</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>root.project.servlets</groupId> + <artifactId>servlet</artifactId> + <version>1.0</version> + <type>war</type> + </dependency> + <dependency> + <groupId>root.project</groupId> + <artifactId>ejbs</artifactId> + <version>1.0</version> + <type>ejb</type> + </dependency> + </dependencies> + </dependencyManagement> +</project> diff --git a/core-it-suite/src/test/resources/mng-5898/primary-source/pom.xml b/core-it-suite/src/test/resources/mng-5898/primary-source/pom.xml index 0c1b6f9..6537299 100644 --- a/core-it-suite/src/test/resources/mng-5898/primary-source/pom.xml +++ b/core-it-suite/src/test/resources/mng-5898/primary-source/pom.xml @@ -1,36 +1,36 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>root.project</groupId> - <artifactId>primary-source</artifactId> - <packaging>jar</packaging> - <name>core project classes</name> - <parent> - <groupId>root</groupId> - <artifactId>project</artifactId> - <version>1.0</version> - </parent> - <dependencies> - <dependency> - <groupId>root.project.projects</groupId> - <artifactId>logging</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <minmemory>128m</minmemory> - <maxmemory>512m</maxmemory> - </configuration> - </plugin> - </plugins> - </build> -</project> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>root.project</groupId> + <artifactId>primary-source</artifactId> + <packaging>jar</packaging> + <name>core project classes</name> + <parent> + <groupId>root</groupId> + <artifactId>project</artifactId> + <version>1.0</version> + </parent> + <dependencies> + <dependency> + <groupId>root.project.projects</groupId> + <artifactId>logging</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <encoding>iso-8859-1</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <minmemory>128m</minmemory> + <maxmemory>512m</maxmemory> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/core-it-suite/src/test/resources/mng-5898/projects/logging/pom.xml b/core-it-suite/src/test/resources/mng-5898/projects/logging/pom.xml index c9acab5..4c426ea 100644 --- a/core-it-suite/src/test/resources/mng-5898/projects/logging/pom.xml +++ b/core-it-suite/src/test/resources/mng-5898/projects/logging/pom.xml @@ -1,12 +1,12 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>root.project.projects</groupId> - <artifactId>logging</artifactId> - <packaging>jar</packaging> - <name>logging</name> - <parent> - <groupId>root.project</groupId> - <artifactId>projects</artifactId> - <version>1.0</version> - </parent> -</project> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>root.project.projects</groupId> + <artifactId>logging</artifactId> + <packaging>jar</packaging> + <name>logging</name> + <parent> + <groupId>root.project</groupId> + <artifactId>projects</artifactId> + <version>1.0</version> + </parent> +</project> diff --git a/core-it-suite/src/test/resources/mng-5898/projects/pom.xml b/core-it-suite/src/test/resources/mng-5898/projects/pom.xml index 425b41b..a7774b6 100644 --- a/core-it-suite/src/test/resources/mng-5898/projects/pom.xml +++ b/core-it-suite/src/test/resources/mng-5898/projects/pom.xml @@ -1,16 +1,16 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>root.project</groupId> - <version>1.0</version> - <artifactId>projects</artifactId> - <packaging>pom</packaging> - <name>sub projects</name> - <parent> - <groupId>root</groupId> - <artifactId>project</artifactId> - <version>1.0</version> - </parent> - <modules> - <module>logging</module> - </modules> -</project> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>root.project</groupId> + <version>1.0</version> + <artifactId>projects</artifactId> + <packaging>pom</packaging> + <name>sub projects</name> + <parent> + <groupId>root</groupId> + <artifactId>project</artifactId> + <version>1.0</version> + </parent> + <modules> + <module>logging</module> + </modules> +</project> diff --git a/core-it-suite/src/test/resources/mng-5898/servlets/pom.xml b/core-it-suite/src/test/resources/mng-5898/servlets/pom.xml index 26787f8..a7e6302 100644 --- a/core-it-suite/src/test/resources/mng-5898/servlets/pom.xml +++ b/core-it-suite/src/test/resources/mng-5898/servlets/pom.xml @@ -1,17 +1,17 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>root.project</groupId> - <artifactId>servlets</artifactId> - <packaging>pom</packaging> - <name>servlets</name> - <version>1.0</version> - <parent> - <groupId>root</groupId> - <artifactId>project</artifactId> - <version>1.0</version> - </parent> - <modules> - <module>servlet</module> - </modules> -</project> - +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>root.project</groupId> + <artifactId>servlets</artifactId> + <packaging>pom</packaging> + <name>servlets</name> + <version>1.0</version> + <parent> + <groupId>root</groupId> + <artifactId>project</artifactId> + <version>1.0</version> + </parent> + <modules> + <module>servlet</module> + </modules> +</project> + diff --git a/core-it-suite/src/test/resources/mng-5898/servlets/servlet/pom.xml b/core-it-suite/src/test/resources/mng-5898/servlets/servlet/pom.xml index 94cd643..b9ce63f 100644 --- a/core-it-suite/src/test/resources/mng-5898/servlets/servlet/pom.xml +++ b/core-it-suite/src/test/resources/mng-5898/servlets/servlet/pom.xml @@ -1,19 +1,19 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>root.project.servlets</groupId> - <artifactId>servlet</artifactId> - <packaging>war</packaging> - <name>servlet</name> - <parent> - <groupId>root.project</groupId> - <artifactId>servlets</artifactId> - <version>1.0</version> - </parent> - <dependencies> - <dependency> - <groupId>root.project</groupId> - <artifactId>primary-source</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> -</project> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>root.project.servlets</groupId> + <artifactId>servlet</artifactId> + <packaging>war</packaging> + <name>servlet</name> + <parent> + <groupId>root.project</groupId> + <artifactId>servlets</artifactId> + <version>1.0</version> + </parent> + <dependencies> + <dependency> + <groupId>root.project</groupId> + <artifactId>primary-source</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> +</project> diff --git a/core-it-suite/src/test/resources/mng-5898/servlets/servlet/src/main/webapp/index.jsp b/core-it-suite/src/test/resources/mng-5898/servlets/servlet/src/main/webapp/index.jsp index 6f07b72..c38169b 100644 --- a/core-it-suite/src/test/resources/mng-5898/servlets/servlet/src/main/webapp/index.jsp +++ b/core-it-suite/src/test/resources/mng-5898/servlets/servlet/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -<html> -<body> -<h2>Hello World!</h2> -</body> -</html> +<html> +<body> +<h2>Hello World!</h2> +</body> +</html>