This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNG-7056 in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit d27283a97cbcba909e07cc1ea768b05c8d46d685 Author: Michael Osipov <[email protected]> AuthorDate: Sun Jul 4 11:50:20 2021 +0200 More POMs --- .../its/mng4148/module/1.0.0/module-1.0.0.pom | 14 +- .../test/resources/mng-5207/prepare/delegate-1.pom | 44 +- .../src/test/resources/mng-5207/prepare/ejb-1.pom | 72 +-- .../test/resources/mng-5207/prepare/master-1.pom | 482 ++++++++++----------- .../test/resources/mng-5207/prepare/master-x.pom | 482 ++++++++++----------- 5 files changed, 547 insertions(+), 547 deletions(-) diff --git a/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom b/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom index a03fc9a..694241d 100644 --- a/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom +++ b/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom @@ -4,11 +4,11 @@ <groupId>org.apache.maven.its.mng4148</groupId> <artifactId>module</artifactId> <version>1.0.0</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.its.mng4148</groupId> - <artifactId>dep</artifactId> - <version>${depVersion}</version> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.maven.its.mng4148</groupId> + <artifactId>dep</artifactId> + <version>${depVersion}</version> + </dependency> + </dependencies> </project> diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom b/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom index 44429b2..6a0c0b1 100755 --- a/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom +++ b/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> <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";> - <parent> - <groupId>bugs.maven.issue</groupId> - <artifactId>master</artifactId> - <version>1</version> - </parent> + 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";> + <parent> + <groupId>bugs.maven.issue</groupId> + <artifactId>master</artifactId> + <version>1</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>delegate</artifactId> - <version>1</version> - <packaging>jar</packaging> - <name>Issue EJB Delegate</name> - <description><![CDATA[Demonstration of issue with EJB delegate.]]></description> + <modelVersion>4.0.0</modelVersion> + <artifactId>delegate</artifactId> + <version>1</version> + <packaging>jar</packaging> + <name>Issue EJB Delegate</name> + <description><![CDATA[Demonstration of issue with EJB delegate.]]></description> - <dependencies> - <dependency> - <groupId>bugs.maven.issue</groupId> - <artifactId>ejb</artifactId> - <classifier>client</classifier> - <type>ejb-client</type> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>bugs.maven.issue</groupId> + <artifactId>ejb</artifactId> + <classifier>client</classifier> + <type>ejb-client</type> + </dependency> + </dependencies> </project> diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom b/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom index 7c57035..51f520c 100755 --- a/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom +++ b/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom @@ -1,43 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> <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";> - <parent> - <groupId>bugs.maven.issue</groupId> - <artifactId>master</artifactId> - <version>1</version> - </parent> + 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";> + <parent> + <groupId>bugs.maven.issue</groupId> + <artifactId>master</artifactId> + <version>1</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>ejb</artifactId> - <version>1</version> - <packaging>ejb</packaging> - <name>Issue EJB</name> - <description><![CDATA[Demonstration of issue with EJB client.]]></description> + <modelVersion>4.0.0</modelVersion> + <artifactId>ejb</artifactId> + <version>1</version> + <packaging>ejb</packaging> + <name>Issue EJB</name> + <description><![CDATA[Demonstration of issue with EJB client.]]></description> - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-ejb-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-ejb-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + </dependencies> </project> diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom b/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom index 5de9921..3b0b082 100644 --- a/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom +++ b/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom @@ -1,256 +1,256 @@ <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> + <modelVersion>4.0.0</modelVersion> - <!-- Define group, artifact and project type --> - <groupId>bugs.maven.issue</groupId> - <artifactId>master</artifactId> - <packaging>pom</packaging> + <!-- Define group, artifact and project type --> + <groupId>bugs.maven.issue</groupId> + <artifactId>master</artifactId> + <packaging>pom</packaging> - <!-- Describe the project --> - <name>Master Project</name> - <version>1</version> - <description>Master project with global settings.</description> + <!-- Describe the project --> + <name>Master Project</name> + <version>1</version> + <description>Master project with global settings.</description> - <!-- Minimum versions to use this POM --> - <prerequisites> - <maven>2.2.1</maven> - </prerequisites> + <!-- Minimum versions to use this POM --> + <prerequisites> + <maven>2.2.1</maven> + </prerequisites> - <!-- Global build settings --> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${version.org.apache.maven.plugins.assembly}</version> - <extensions>true</extensions> - <configuration> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>${version.org.apache.maven.plugins.clean}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${version.org.apache.maven.plugins.compiler}</version> - <extensions>true</extensions> - <configuration> - <source>${java.version.source}</source> - <target>${java.version.target}</target> - <encoding>${project.build.sourceEncoding}</encoding> - <optimize>false</optimize> - <debug>true</debug> - <showDeprecation>true</showDeprecation> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>${version.org.apache.maven.plugins.dependency}</version> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>${version.org.apache.maven.plugins.deploy}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <version>${version.org.apache.maven.plugins.ear}</version> - <configuration> - <defaultJavaBundleDir>/</defaultJavaBundleDir> - <displayName>${project.name}</displayName> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ejb-plugin</artifactId> - <version>${version.org.apache.maven.plugins.ejb}</version> - <configuration> - <generateClient>true</generateClient> - <ejbVersion>${java.ejb.version}</ejbVersion> - <clientExcludes> - <clientExclude>META-INF/*.xml</clientExclude> - <clientExclude>**/ejb/*Bean.class</clientExclude> - </clientExcludes> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - <manifest> - <addClasspath>true</addClasspath> - <useUniqueVersions>false</useUniqueVersions> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>${version.org.apache.maven.plugins.install}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>${version.org.apache.maven.plugins.jar}</version> - <configuration> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>${version.org.apache.maven.plugins.resources}</version> - <configuration> - <!-- Workaround for bug reported with MRESOURCES-104 --> - <useDefaultDelimiters>false</useDefaultDelimiters> - <delimiters> - <delimiter>${*}</delimiter> - </delimiters> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>${version.org.apache.maven.plugins.source}</version> - <executions> - <execution> - <id>attach-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - <configuration> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${version.org.apache.maven.plugins.surefire}</version> - <extensions>true</extensions> - <!-- We set a forkMode --> - <configuration> - <forkMode>once</forkMode> - <argLine>-Xms64m -Xmx128m</argLine> - <workingDirectory>${basedir}</workingDirectory> - <childDelegation>false</childDelegation> - <runOrder>random</runOrder> - <useFile>false</useFile> - </configuration> - </plugin> + <!-- Global build settings --> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>${version.org.apache.maven.plugins.assembly}</version> + <extensions>true</extensions> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>${version.org.apache.maven.plugins.clean}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${version.org.apache.maven.plugins.compiler}</version> + <extensions>true</extensions> + <configuration> + <source>${java.version.source}</source> + <target>${java.version.target}</target> + <encoding>${project.build.sourceEncoding}</encoding> + <optimize>false</optimize> + <debug>true</debug> + <showDeprecation>true</showDeprecation> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>${version.org.apache.maven.plugins.dependency}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>${version.org.apache.maven.plugins.deploy}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <version>${version.org.apache.maven.plugins.ear}</version> + <configuration> + <defaultJavaBundleDir>/</defaultJavaBundleDir> + <displayName>${project.name}</displayName> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ejb-plugin</artifactId> + <version>${version.org.apache.maven.plugins.ejb}</version> + <configuration> + <generateClient>true</generateClient> + <ejbVersion>${java.ejb.version}</ejbVersion> + <clientExcludes> + <clientExclude>META-INF/*.xml</clientExclude> + <clientExclude>**/ejb/*Bean.class</clientExclude> + </clientExcludes> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addClasspath>true</addClasspath> + <useUniqueVersions>false</useUniqueVersions> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>${version.org.apache.maven.plugins.install}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${version.org.apache.maven.plugins.jar}</version> + <configuration> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>${version.org.apache.maven.plugins.resources}</version> + <configuration> + <!-- Workaround for bug reported with MRESOURCES-104 --> + <useDefaultDelimiters>false</useDefaultDelimiters> + <delimiters> + <delimiter>${*}</delimiter> + </delimiters> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>${version.org.apache.maven.plugins.source}</version> + <executions> + <execution> + <id>attach-sources</id> + <phase>package</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + <configuration> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${version.org.apache.maven.plugins.surefire}</version> + <extensions>true</extensions> + <!-- We set a forkMode --> + <configuration> + <forkMode>once</forkMode> + <argLine>-Xms64m -Xmx128m</argLine> + <workingDirectory>${basedir}</workingDirectory> + <childDelegation>false</childDelegation> + <runOrder>random</runOrder> + <useFile>false</useFile> + </configuration> + </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>${version.org.codehaus.mojo.build-helper-plugin}</version> - <extensions>true</extensions> - </plugin> - </plugins> - </pluginManagement> - </build> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>${version.org.codehaus.mojo.build-helper-plugin}</version> + <extensions>true</extensions> + </plugin> + </plugins> + </pluginManagement> + </build> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>bugs.maven.issue</groupId> - <artifactId>application</artifactId> - <version>${version.application}</version> - </dependency> - <dependency> - <groupId>bugs.maven.issue</groupId> - <artifactId>delegate</artifactId> - <version>${version.delegate}</version> - </dependency> - <!-- not required for example - <dependency> - <groupId>bugs.maven.issue</groupId> - <artifactId>ejb</artifactId> - <version>${version.ejb}</version> - <type>ejb</type> - <scope>runtime</scope> - </dependency> - --> - <dependency> - <groupId>bugs.maven.issue</groupId> - <artifactId>ejb</artifactId> - <version>${version.ejb}</version> - <classifier>client</classifier> - <type>ejb-client</type> - </dependency> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>bugs.maven.issue</groupId> + <artifactId>application</artifactId> + <version>${version.application}</version> + </dependency> + <dependency> + <groupId>bugs.maven.issue</groupId> + <artifactId>delegate</artifactId> + <version>${version.delegate}</version> + </dependency> + <!-- not required for example + <dependency> + <groupId>bugs.maven.issue</groupId> + <artifactId>ejb</artifactId> + <version>${version.ejb}</version> + <type>ejb</type> + <scope>runtime</scope> + </dependency> + --> + <dependency> + <groupId>bugs.maven.issue</groupId> + <artifactId>ejb</artifactId> + <version>${version.ejb}</version> + <classifier>client</classifier> + <type>ejb-client</type> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${version.commons-lang}</version> - </dependency> - </dependencies> - </dependencyManagement> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${version.commons-lang}</version> + </dependency> + </dependencies> + </dependencyManagement> - <!-- Define properties for better consistency --> - <properties> - <!-- ==== --> - <!-- Java --> - <!-- === =--> - <java.version.source>1.6</java.version.source> - <java.version.target>1.6</java.version.target> - <java.ejb.version>2.1</java.ejb.version> + <!-- Define properties for better consistency --> + <properties> + <!-- ==== --> + <!-- Java --> + <!-- === =--> + <java.version.source>1.6</java.version.source> + <java.version.target>1.6</java.version.target> + <java.ejb.version>2.1</java.ejb.version> - <!-- ======= --> - <!-- Plugins --> - <!-- ======= --> - <version.org.apache.maven.plugins.assembly>2.2.1</version.org.apache.maven.plugins.assembly> - <version.org.apache.maven.plugins.clean>2.4.1</version.org.apache.maven.plugins.clean> - <version.org.apache.maven.plugins.compiler>2.3.2</version.org.apache.maven.plugins.compiler> - <version.org.apache.maven.plugins.dependency>2.3</version.org.apache.maven.plugins.dependency> - <version.org.apache.maven.plugins.deploy>2.7</version.org.apache.maven.plugins.deploy> - <version.org.apache.maven.plugins.ear>2.6</version.org.apache.maven.plugins.ear> - <version.org.apache.maven.plugins.ejb>2.3</version.org.apache.maven.plugins.ejb> - <version.org.apache.maven.plugins.install>2.3.1</version.org.apache.maven.plugins.install> - <version.org.apache.maven.plugins.jar>2.3.2</version.org.apache.maven.plugins.jar> - <version.org.apache.maven.plugins.resources>2.5</version.org.apache.maven.plugins.resources> - <version.org.apache.maven.plugins.source>2.1.2</version.org.apache.maven.plugins.source> - <version.org.apache.maven.plugins.surefire>2.9</version.org.apache.maven.plugins.surefire> + <!-- ======= --> + <!-- Plugins --> + <!-- ======= --> + <version.org.apache.maven.plugins.assembly>2.2.1</version.org.apache.maven.plugins.assembly> + <version.org.apache.maven.plugins.clean>2.4.1</version.org.apache.maven.plugins.clean> + <version.org.apache.maven.plugins.compiler>2.3.2</version.org.apache.maven.plugins.compiler> + <version.org.apache.maven.plugins.dependency>2.3</version.org.apache.maven.plugins.dependency> + <version.org.apache.maven.plugins.deploy>2.7</version.org.apache.maven.plugins.deploy> + <version.org.apache.maven.plugins.ear>2.6</version.org.apache.maven.plugins.ear> + <version.org.apache.maven.plugins.ejb>2.3</version.org.apache.maven.plugins.ejb> + <version.org.apache.maven.plugins.install>2.3.1</version.org.apache.maven.plugins.install> + <version.org.apache.maven.plugins.jar>2.3.2</version.org.apache.maven.plugins.jar> + <version.org.apache.maven.plugins.resources>2.5</version.org.apache.maven.plugins.resources> + <version.org.apache.maven.plugins.source>2.1.2</version.org.apache.maven.plugins.source> + <version.org.apache.maven.plugins.surefire>2.9</version.org.apache.maven.plugins.surefire> - <version.org.codehaus.mojo.build-helper-plugin>1.7</version.org.codehaus.mojo.build-helper-plugin> + <version.org.codehaus.mojo.build-helper-plugin>1.7</version.org.codehaus.mojo.build-helper-plugin> - <!-- ============ --> - <!-- Dependencies --> - <!-- ============ --> - <version.application>1-SNAPSHOT</version.application> - <version.delegate>1</version.delegate> - <version.ejb>1</version.ejb> + <!-- ============ --> + <!-- Dependencies --> + <!-- ============ --> + <version.application>1-SNAPSHOT</version.application> + <version.delegate>1</version.delegate> + <version.ejb>1</version.ejb> - <version.commons-lang>2.4</version.commons-lang> + <version.commons-lang>2.4</version.commons-lang> - <project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding> - </properties> + <project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding> + </properties> </project> diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom b/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom index 0de53bc..5d5999f 100644 --- a/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom +++ b/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom @@ -1,256 +1,256 @@ <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> + <modelVersion>4.0.0</modelVersion> - <!-- Define group, artifact and project type --> - <groupId>bugs.maven.issue</groupId> - <artifactId>master</artifactId> - <packaging>pom</packaging> + <!-- Define group, artifact and project type --> + <groupId>bugs.maven.issue</groupId> + <artifactId>master</artifactId> + <packaging>pom</packaging> - <!-- Describe the project --> - <name>Master Project</name> - <version>x-SNAPSHOT</version> - <description>Master project with global settings.</description> + <!-- Describe the project --> + <name>Master Project</name> + <version>x-SNAPSHOT</version> + <description>Master project with global settings.</description> - <!-- Minimum versions to use this POM --> - <prerequisites> - <maven>2.2.1</maven> - </prerequisites> + <!-- Minimum versions to use this POM --> + <prerequisites> + <maven>2.2.1</maven> + </prerequisites> - <!-- Global build settings --> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${version.org.apache.maven.plugins.assembly}</version> - <extensions>true</extensions> - <configuration> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>${version.org.apache.maven.plugins.clean}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${version.org.apache.maven.plugins.compiler}</version> - <extensions>true</extensions> - <configuration> - <source>${java.version.source}</source> - <target>${java.version.target}</target> - <encoding>${project.build.sourceEncoding}</encoding> - <optimize>false</optimize> - <debug>true</debug> - <showDeprecation>true</showDeprecation> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>${version.org.apache.maven.plugins.dependency}</version> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>${version.org.apache.maven.plugins.deploy}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <version>${version.org.apache.maven.plugins.ear}</version> - <configuration> - <defaultJavaBundleDir>/</defaultJavaBundleDir> - <displayName>${project.name}</displayName> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ejb-plugin</artifactId> - <version>${version.org.apache.maven.plugins.ejb}</version> - <configuration> - <generateClient>true</generateClient> - <ejbVersion>${java.ejb.version}</ejbVersion> - <clientExcludes> - <clientExclude>META-INF/*.xml</clientExclude> - <clientExclude>**/ejb/*Bean.class</clientExclude> - </clientExcludes> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - <manifest> - <addClasspath>true</addClasspath> - <useUniqueVersions>false</useUniqueVersions> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>${version.org.apache.maven.plugins.install}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>${version.org.apache.maven.plugins.jar}</version> - <configuration> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>${version.org.apache.maven.plugins.resources}</version> - <configuration> - <!-- Workaround for bug reported with MRESOURCES-104 --> - <useDefaultDelimiters>false</useDefaultDelimiters> - <delimiters> - <delimiter>${*}</delimiter> - </delimiters> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>${version.org.apache.maven.plugins.source}</version> - <executions> - <execution> - <id>attach-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - <configuration> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${version.org.apache.maven.plugins.surefire}</version> - <extensions>true</extensions> - <!-- We set a forkMode --> - <configuration> - <forkMode>once</forkMode> - <argLine>-Xms64m -Xmx128m</argLine> - <workingDirectory>${basedir}</workingDirectory> - <childDelegation>false</childDelegation> - <runOrder>random</runOrder> - <useFile>false</useFile> - </configuration> - </plugin> + <!-- Global build settings --> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>${version.org.apache.maven.plugins.assembly}</version> + <extensions>true</extensions> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>${version.org.apache.maven.plugins.clean}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${version.org.apache.maven.plugins.compiler}</version> + <extensions>true</extensions> + <configuration> + <source>${java.version.source}</source> + <target>${java.version.target}</target> + <encoding>${project.build.sourceEncoding}</encoding> + <optimize>false</optimize> + <debug>true</debug> + <showDeprecation>true</showDeprecation> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>${version.org.apache.maven.plugins.dependency}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>${version.org.apache.maven.plugins.deploy}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <version>${version.org.apache.maven.plugins.ear}</version> + <configuration> + <defaultJavaBundleDir>/</defaultJavaBundleDir> + <displayName>${project.name}</displayName> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ejb-plugin</artifactId> + <version>${version.org.apache.maven.plugins.ejb}</version> + <configuration> + <generateClient>true</generateClient> + <ejbVersion>${java.ejb.version}</ejbVersion> + <clientExcludes> + <clientExclude>META-INF/*.xml</clientExclude> + <clientExclude>**/ejb/*Bean.class</clientExclude> + </clientExcludes> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addClasspath>true</addClasspath> + <useUniqueVersions>false</useUniqueVersions> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>${version.org.apache.maven.plugins.install}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${version.org.apache.maven.plugins.jar}</version> + <configuration> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>${version.org.apache.maven.plugins.resources}</version> + <configuration> + <!-- Workaround for bug reported with MRESOURCES-104 --> + <useDefaultDelimiters>false</useDefaultDelimiters> + <delimiters> + <delimiter>${*}</delimiter> + </delimiters> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>${version.org.apache.maven.plugins.source}</version> + <executions> + <execution> + <id>attach-sources</id> + <phase>package</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + <configuration> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${version.org.apache.maven.plugins.surefire}</version> + <extensions>true</extensions> + <!-- We set a forkMode --> + <configuration> + <forkMode>once</forkMode> + <argLine>-Xms64m -Xmx128m</argLine> + <workingDirectory>${basedir}</workingDirectory> + <childDelegation>false</childDelegation> + <runOrder>random</runOrder> + <useFile>false</useFile> + </configuration> + </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>${version.org.codehaus.mojo.build-helper-plugin}</version> - <extensions>true</extensions> - </plugin> - </plugins> - </pluginManagement> - </build> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>${version.org.codehaus.mojo.build-helper-plugin}</version> + <extensions>true</extensions> + </plugin> + </plugins> + </pluginManagement> + </build> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>bugs.maven.issue</groupId> - <artifactId>application</artifactId> - <version>${version.application}</version> - </dependency> - <dependency> - <groupId>bugs.maven.issue</groupId> - <artifactId>delegate</artifactId> - <version>${version.delegate}</version> - </dependency> - <!-- not required for example - <dependency> - <groupId>bugs.maven.issue</groupId> - <artifactId>ejb</artifactId> - <version>${version.ejb}</version> - <type>ejb</type> - <scope>runtime</scope> - </dependency> - --> - <dependency> - <groupId>bugs.maven.issue</groupId> - <artifactId>ejb</artifactId> - <version>${version.ejb}</version> - <classifier>client</classifier> - <type>ejb-client</type> - </dependency> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>bugs.maven.issue</groupId> + <artifactId>application</artifactId> + <version>${version.application}</version> + </dependency> + <dependency> + <groupId>bugs.maven.issue</groupId> + <artifactId>delegate</artifactId> + <version>${version.delegate}</version> + </dependency> + <!-- not required for example + <dependency> + <groupId>bugs.maven.issue</groupId> + <artifactId>ejb</artifactId> + <version>${version.ejb}</version> + <type>ejb</type> + <scope>runtime</scope> + </dependency> + --> + <dependency> + <groupId>bugs.maven.issue</groupId> + <artifactId>ejb</artifactId> + <version>${version.ejb}</version> + <classifier>client</classifier> + <type>ejb-client</type> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${version.commons-lang}</version> - </dependency> - </dependencies> - </dependencyManagement> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${version.commons-lang}</version> + </dependency> + </dependencies> + </dependencyManagement> - <!-- Define properties for better consistency --> - <properties> - <!-- ==== --> - <!-- Java --> - <!-- === =--> - <java.version.source>1.6</java.version.source> - <java.version.target>1.6</java.version.target> - <java.ejb.version>2.1</java.ejb.version> + <!-- Define properties for better consistency --> + <properties> + <!-- ==== --> + <!-- Java --> + <!-- === =--> + <java.version.source>1.6</java.version.source> + <java.version.target>1.6</java.version.target> + <java.ejb.version>2.1</java.ejb.version> - <!-- ======= --> - <!-- Plugins --> - <!-- ======= --> - <version.org.apache.maven.plugins.assembly>2.2.1</version.org.apache.maven.plugins.assembly> - <version.org.apache.maven.plugins.clean>2.4.1</version.org.apache.maven.plugins.clean> - <version.org.apache.maven.plugins.compiler>2.3.2</version.org.apache.maven.plugins.compiler> - <version.org.apache.maven.plugins.dependency>2.3</version.org.apache.maven.plugins.dependency> - <version.org.apache.maven.plugins.deploy>2.7</version.org.apache.maven.plugins.deploy> - <version.org.apache.maven.plugins.ear>2.6</version.org.apache.maven.plugins.ear> - <version.org.apache.maven.plugins.ejb>2.3</version.org.apache.maven.plugins.ejb> - <version.org.apache.maven.plugins.install>2.3.1</version.org.apache.maven.plugins.install> - <version.org.apache.maven.plugins.jar>2.3.2</version.org.apache.maven.plugins.jar> - <version.org.apache.maven.plugins.resources>2.5</version.org.apache.maven.plugins.resources> - <version.org.apache.maven.plugins.source>2.1.2</version.org.apache.maven.plugins.source> - <version.org.apache.maven.plugins.surefire>2.9</version.org.apache.maven.plugins.surefire> + <!-- ======= --> + <!-- Plugins --> + <!-- ======= --> + <version.org.apache.maven.plugins.assembly>2.2.1</version.org.apache.maven.plugins.assembly> + <version.org.apache.maven.plugins.clean>2.4.1</version.org.apache.maven.plugins.clean> + <version.org.apache.maven.plugins.compiler>2.3.2</version.org.apache.maven.plugins.compiler> + <version.org.apache.maven.plugins.dependency>2.3</version.org.apache.maven.plugins.dependency> + <version.org.apache.maven.plugins.deploy>2.7</version.org.apache.maven.plugins.deploy> + <version.org.apache.maven.plugins.ear>2.6</version.org.apache.maven.plugins.ear> + <version.org.apache.maven.plugins.ejb>2.3</version.org.apache.maven.plugins.ejb> + <version.org.apache.maven.plugins.install>2.3.1</version.org.apache.maven.plugins.install> + <version.org.apache.maven.plugins.jar>2.3.2</version.org.apache.maven.plugins.jar> + <version.org.apache.maven.plugins.resources>2.5</version.org.apache.maven.plugins.resources> + <version.org.apache.maven.plugins.source>2.1.2</version.org.apache.maven.plugins.source> + <version.org.apache.maven.plugins.surefire>2.9</version.org.apache.maven.plugins.surefire> - <version.org.codehaus.mojo.build-helper-plugin>1.7</version.org.codehaus.mojo.build-helper-plugin> + <version.org.codehaus.mojo.build-helper-plugin>1.7</version.org.codehaus.mojo.build-helper-plugin> - <!-- ============ --> - <!-- Dependencies --> - <!-- ============ --> - <version.application>1-SNAPSHOT</version.application> - <version.delegate>1</version.delegate> - <version.ejb>2-SNAPSHOT</version.ejb> + <!-- ============ --> + <!-- Dependencies --> + <!-- ============ --> + <version.application>1-SNAPSHOT</version.application> + <version.delegate>1</version.delegate> + <version.ejb>2-SNAPSHOT</version.ejb> - <version.commons-lang>2.6</version.commons-lang> + <version.commons-lang>2.6</version.commons-lang> - <project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding> - </properties> + <project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding> + </properties> </project>
