Updated Branches: refs/heads/master dbc15a3b0 -> 266d2fcc2
Adding resources for the test project in mng-5207. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/266d2fcc Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/266d2fcc Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/266d2fcc Branch: refs/heads/master Commit: 266d2fcc234e9b54b253e9db7d8dc3164fd90222 Parents: dbc15a3 Author: Jason van Zyl <[email protected]> Authored: Sat Feb 8 13:32:43 2014 -0500 Committer: Jason van Zyl <[email protected]> Committed: Sat Feb 8 13:32:43 2014 -0500 ---------------------------------------------------------------------- .../test/resources/mng-5207/application/pom.xml | 26 ++ .../test/resources/mng-5207/delegate/pom.xml | 28 ++ .../src/test/resources/mng-5207/ejb/pom.xml | 43 ++++ .../ejb/src/main/java/maven/bugs/IssueHome.java | 5 + .../ejb/src/main/resources/META-INF/ejb-jar.xml | 14 + .../src/test/resources/mng-5207/pom.xml | 19 ++ .../resources/mng-5207/prepare/delegate-1.jar | Bin 0 -> 407 bytes .../resources/mng-5207/prepare/delegate-1.pom | 28 ++ .../resources/mng-5207/prepare/ejb-1-client.jar | Bin 0 -> 835 bytes .../test/resources/mng-5207/prepare/ejb-1.jar | Bin 0 -> 1234 bytes .../test/resources/mng-5207/prepare/ejb-1.pom | 43 ++++ .../resources/mng-5207/prepare/master-1.pom | 256 +++++++++++++++++++ .../resources/mng-5207/prepare/master-x.pom | 256 +++++++++++++++++++ .../test/resources/mng-5207/prepare/prepare.sh | 7 + 14 files changed, 725 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/application/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5207/application/pom.xml b/core-it-suite/src/test/resources/mng-5207/application/pom.xml new file mode 100755 index 0000000..fc65b33 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5207/application/pom.xml @@ -0,0 +1,26 @@ +<?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>x-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>application</artifactId> + <version>1-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Issue Application</name> + <description><![CDATA[Demonstration of issue with application.]]></description> + + <dependencies> + <dependency> + <groupId>bugs.maven.issue</groupId> + <artifactId>delegate</artifactId> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml b/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml new file mode 100755 index 0000000..4aceaed --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml @@ -0,0 +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>x-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>delegate</artifactId> + <version>2-SNAPSHOT</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> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml b/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml new file mode 100755 index 0000000..56168e7 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml @@ -0,0 +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>x-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>ejb</artifactId> + <version>2-SNAPSHOT</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> + + <dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/ejb/src/main/java/maven/bugs/IssueHome.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5207/ejb/src/main/java/maven/bugs/IssueHome.java b/core-it-suite/src/test/resources/mng-5207/ejb/src/main/java/maven/bugs/IssueHome.java new file mode 100755 index 0000000..8496726 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5207/ejb/src/main/java/maven/bugs/IssueHome.java @@ -0,0 +1,5 @@ +package maven.bugs; + +public interface IssueHome +{ +} http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/ejb/src/main/resources/META-INF/ejb-jar.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5207/ejb/src/main/resources/META-INF/ejb-jar.xml b/core-it-suite/src/test/resources/mng-5207/ejb/src/main/resources/META-INF/ejb-jar.xml new file mode 100755 index 0000000..8529c49 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5207/ejb/src/main/resources/META-INF/ejb-jar.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd";> +<ejb-jar> + <display-name>IssueMEJB18</display-name> + <enterprise-beans> + <session> + <ejb-name>MEJB18</ejb-name> + <home>mejb.Issue18Home</home> + <remote>mejb.Issue18</remote> + <ejb-class>mejb.Issue18Bean</ejb-class> + <session-type>Stateless</session-type> + </session> + </enterprise-beans> +</ejb-jar> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5207/pom.xml b/core-it-suite/src/test/resources/mng-5207/pom.xml new file mode 100755 index 0000000..cb48175 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5207/pom.xml @@ -0,0 +1,19 @@ +<?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";> + + <modelVersion>4.0.0</modelVersion> + <groupId>bugs.maven.issue</groupId> + <artifactId>builder</artifactId> + <packaging>pom</packaging> + <name>Builder for Issue</name> + <version>x-SNAPSHOT</version> + + <modules> + <module>application</module> + <module>delegate</module> + <module>ejb</module> + </modules> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.jar ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.jar b/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.jar new file mode 100644 index 0000000..23bcd45 Binary files /dev/null and b/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.jar differ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom ---------------------------------------------------------------------- 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 new file mode 100755 index 0000000..0ba4151 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom @@ -0,0 +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> + + <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> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1-client.jar ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1-client.jar b/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1-client.jar new file mode 100644 index 0000000..0f6ed47 Binary files /dev/null and b/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1-client.jar differ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.jar ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.jar b/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.jar new file mode 100644 index 0000000..b7a1ae9 Binary files /dev/null and b/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.jar differ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom ---------------------------------------------------------------------- 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 new file mode 100755 index 0000000..1a056d9 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom @@ -0,0 +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> + + <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> + + <dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..5de9921 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom @@ -0,0 +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> + + <!-- 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> + + <!-- 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> + + <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> + + <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> + + <!-- ======= --> + <!-- 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> + + <!-- ============ --> + <!-- 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> + + <project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding> + </properties> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..0de53bc --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom @@ -0,0 +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> + + <!-- 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> + + <!-- 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> + + <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> + + <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> + + <!-- ======= --> + <!-- 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> + + <!-- ============ --> + <!-- 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> + + <project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding> + </properties> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/266d2fcc/core-it-suite/src/test/resources/mng-5207/prepare/prepare.sh ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/prepare.sh b/core-it-suite/src/test/resources/mng-5207/prepare/prepare.sh new file mode 100755 index 0000000..468e16f --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5207/prepare/prepare.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +mvn install:install-file -Dfile=master-1.pom -DpomFile=master-1.pom +mvn install:install-file -Dfile=master-x.pom -DpomFile=master-x.pom +mvn install:install-file -Dfile=ejb-1.jar -DpomFile=ejb-1.pom +mvn install:install-file -Dfile=ejb-1-client.jar -Dclassifier=client -DpomFile=ejb-1.pom +mvn install:install-file -Dfile=delegate-1.jar -DpomFile=delegate-1.pom
