You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2010/09/24 19:04:52 UTC
svn commit: r1000969 - in
/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope:
./ child1/ child1/src/ child1/src/main/ child1/src/main/java/
child1/src/main/java/test/ child2/ child2/src/ child2/src/main/ chil...
Author: jdcasey
Date: Fri Sep 24 17:04:51 2010
New Revision: 1000969
URL: http://svn.apache.org/viewvc?rev=1000969&view=rev
Log:
[MASSEMBLY-492] Verify that runtime scope deps are included.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/src/main/java/test/App.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/src/main/java/test/App.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/src/main/assembly/bin.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/verify.bsh
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/pom.xml?rev=1000969&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/pom.xml Fri Sep 24 17:04:51 2010
@@ -0,0 +1,9 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>child1</artifactId>
+</project>
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/src/main/java/test/App.java?rev=1000969&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/src/main/java/test/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child1/src/main/java/test/App.java Fri Sep 24 17:04:51 2010
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/pom.xml?rev=1000969&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/pom.xml Fri Sep 24 17:04:51 2010
@@ -0,0 +1,13 @@
+<?xml version='1.0'?>
+<project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>child2</artifactId>
+ <version>2</version>
+
+</project>
+
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/src/main/java/test/App.java?rev=1000969&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/src/main/java/test/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child2/src/main/java/test/App.java Fri Sep 24 17:04:51 2010
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/pom.xml?rev=1000969&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/pom.xml Fri Sep 24 17:04:51 2010
@@ -0,0 +1,54 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>test</groupId>
+ <artifactId>parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <artifactId>child3</artifactId>
+
+ <name>DependencySet::By-Version</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <version>1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child2</artifactId>
+ <version>2</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/src/main/assembly/bin.xml?rev=1000969&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/src/main/assembly/bin.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/child3/src/main/assembly/bin.xml Fri Sep 24 17:04:51 2010
@@ -0,0 +1,13 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <scope>runtime</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/pom.xml?rev=1000969&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/pom.xml Fri Sep 24 17:04:51 2010
@@ -0,0 +1,20 @@
+<?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>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1</version>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ <module>child3</module>
+ </modules>
+</project>
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/verify.bsh?rev=1000969&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-runtimeScope/verify.bsh Fri Sep 24 17:04:51 2010
@@ -0,0 +1,28 @@
+import java.io.*;
+
+try
+{
+ File dir = new File( basedir, "child3/target/child3-1-bin" );
+
+ File f = new File( dir, "child1-1.jar" );
+ if ( !f.exists() || !f.isFile() )
+ {
+ System.out.println( "Could not find dependency file: " + f );
+ return false;
+ }
+
+ f = new File( dir, "child2-2.jar" );
+ if ( !f.exists() || !f.isFile() )
+ {
+ System.out.println( "Could not find dependency file: " + f );
+ return false;
+ }
+
+ return true;
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+}
+
+return false;