Author: snicoll
Date: Sat Nov 4 01:09:01 2006
New Revision: 471142
URL: http://svn.apache.org/viewvc?view=rev&rev=471142
Log:
MEAR-39: Added tests to check dependency scopes handling.
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/expected-META-INF/application.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/pom.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/expected-META-INF/application.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/pom.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/expected-META-INF/application.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarMojoTest.java
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt?view=diff&rev=471142&r1=471141&r2=471142
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt Sat Nov 4
01:09:01 2006
@@ -80,7 +80,13 @@
* project-025: builds an EAR and make sure that a classified dependency with
mutiple candidates is detected when specifying the classifier
- * project-026: builds an EAR and make sure that the build fails if a
unclassifed module configuration with mutiple candidates is specified.
+ * project-026: builds an EAR and make sure that the build fails if a
unclassifed module configuration with mutiple candidates is specified
+
+ * project-027: builds an EAR and make sure that provided dependencies are
not included in the EAR
+
+ * project-028: builds an EAR and make sure that test dependencies are not
included in the EAR
+
+ * project-029: builds an EAR and make sure that system dependencies are not
included in the EAR
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarMojoTest.java?view=diff&rev=471142&r1=471141&r2=471142
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarMojoTest.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarMojoTest.java
Sat Nov 4 01:09:01 2006
@@ -288,4 +288,31 @@
assertFalse("Execution should have failed", getEarArchive(baseDir,
"project-026").exists());
}
+ /**
+ * Builds an EAR and make sure that provided dependencies are not included
in the EAR.
+ */
+ public void testProject027()
+ throws Exception
+ {
+ doTestProject( "project-027", new String[]{"ejb-sample-one-1.0.jar"} );
+ }
+
+ /**
+ * Builds an EAR and make sure that test dependencies are not included in
the EAR.
+ */
+ public void testProject028()
+ throws Exception
+ {
+ doTestProject( "project-028", new String[]{"ejb-sample-one-1.0.jar"} );
+ }
+
+ /**
+ * Builds an EAR and make sure that system dependencies are not included
in the EAR.
+ */
+ public void testProject029()
+ throws Exception
+ {
+ doTestProject( "project-029", new String[]{"ejb-sample-one-1.0.jar"} );
+ }
+
}
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/expected-META-INF/application.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/expected-META-INF/application.xml?view=auto&rev=471142
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/expected-META-INF/application.xml
(added)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/expected-META-INF/application.xml
Sat Nov 4 01:09:01 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd";>
+<application>
+ <display-name>maven-ear-plugin-test-project-027</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/pom.xml?view=auto&rev=471142
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/pom.xml
(added)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/pom.xml
Sat Nov 4 01:09:01 2006
@@ -0,0 +1,25 @@
+<?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>ear</groupId>
+ <artifactId>maven-ear-plugin-test-project-027</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <packaging>ear</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>ejb-sample-two</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/expected-META-INF/application.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/expected-META-INF/application.xml?view=auto&rev=471142
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/expected-META-INF/application.xml
(added)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/expected-META-INF/application.xml
Sat Nov 4 01:09:01 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd";>
+<application>
+ <display-name>maven-ear-plugin-test-project-028</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/pom.xml?view=auto&rev=471142
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/pom.xml
(added)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/pom.xml
Sat Nov 4 01:09:01 2006
@@ -0,0 +1,25 @@
+<?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>ear</groupId>
+ <artifactId>maven-ear-plugin-test-project-028</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <packaging>ear</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>ejb-sample-two</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/expected-META-INF/application.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/expected-META-INF/application.xml?view=auto&rev=471142
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/expected-META-INF/application.xml
(added)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/expected-META-INF/application.xml
Sat Nov 4 01:09:01 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd";>
+<application>
+ <display-name>maven-ear-plugin-test-project-029</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/pom.xml?view=auto&rev=471142
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/pom.xml
(added)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/pom.xml
Sat Nov 4 01:09:01 2006
@@ -0,0 +1,25 @@
+<?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>ear</groupId>
+ <artifactId>maven-ear-plugin-test-project-029</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <packaging>ear</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>javax.sql</groupId>
+ <artifactId>jdbc-stdext</artifactId>
+ <version>2.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/lib/rt.jar</systemPath>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
