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 2008/09/19 23:31:06 UTC
svn commit: r697251 - in
/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196:
./ src/ src/main/ src/main/assembly/ src/main/java/ src/main/java/test/
Author: jdcasey
Date: Fri Sep 19 14:31:06 2008
New Revision: 697251
URL: http://svn.apache.org/viewvc?rev=697251&view=rev
Log:
[MASSEMBLY-196] Integration test that will verify this issue is working.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/java/test/App.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh (with props)
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/goals.txt?rev=697251&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/goals.txt Fri Sep 19 14:31:06 2008
@@ -0,0 +1,2 @@
+clean
+package
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/pom.xml?rev=697251&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/pom.xml Fri Sep 19 14:31:06 2008
@@ -0,0 +1,53 @@
+<?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>
+
+ <artifactId>massembly-196</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>single-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml?rev=697251&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml Fri Sep 19 14:31:06 2008
@@ -0,0 +1,22 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <repositories>
+ <repository>
+ <includeMetadata>true</includeMetadata>
+ <outputDirectory>repo</outputDirectory>
+ <groupVersionAlignments>
+ <groupVersionAlignment>
+ <id>org.apache.maven.plugins</id>
+ <version>2.0</version>
+ <excludes>
+ <exclude>maven-surefire-plugin</exclude>
+ </excludes>
+ </groupVersionAlignment>
+ </groupVersionAlignments>
+ </repository>
+ </repositories>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/java/test/App.java?rev=697251&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/java/test/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/java/test/App.java Fri Sep 19 14:31:06 2008
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh?rev=697251&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh Fri Sep 19 14:31:06 2008
@@ -0,0 +1,18 @@
+import java.io.File;
+
+File jarPlugin = new File( basedir, "target/massembly-196-1-bin.dir/repo/org/apache/maven/plugins/maven-jar-plugin/2.0/maven-jar-plugin-2.0.jar" );
+File surefirePlugin = new File( basedir, "target/massembly-196-1-bin.dir/repo/org/apache/maven/plugins/maven-surefire-plugin/2.3/maven-surefire-plugin-2.3.jar" );
+
+if ( !jarPlugin.exists() )
+{
+ System.out.println( "Cannot find jar plugin at: " + jarPlugin );
+ System.out.println( "jar plugin should have been relocated to version 2.0" );
+}
+
+if ( !surefirePlugin.exists() )
+{
+ System.out.println( "Cannot find surefire plugin at: " + surefirePlugin );
+ System.out.println( "surefire plugin should NOT have been relocated to 2.0" );
+}
+
+return jarPlugin.exists() && surefirePlugin.exists();
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native