Author: veithen
Date: Sat Apr 17 12:46:28 2010
New Revision: 935169
URL: http://svn.apache.org/viewvc?rev=935169&view=rev
Log:
Manage inter-module dependencies properly.
Modified:
axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
Modified: axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml?rev=935169&r1=935168&r2=935169&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml Sat Apr 17 12:46:28
2010
@@ -93,6 +93,13 @@
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>addressing</artifactId>
+ <version>${project.version}</version>
+ <type>mar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -127,6 +134,9 @@
<include>**/*.properties</include>
</includes>
</testResource>
+ <testResource>
+ <directory>${project.build.directory}/repo</directory>
+ </testResource>
</testResources>
<plugins>
<plugin>
@@ -154,6 +164,22 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/repo/modules</outputDirectory>
+ <includeTypes>mar</includeTypes>
+ <includeScopes>test</includeScopes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -165,9 +191,7 @@
<!-- Set a property that can be picked up from
the ant build.xml's -->
<property name="maven.class.path"
refid="maven.runtime.classpath"/>
<property name="maven.test.path"
refid="maven.compile.classpath"/>
- <!-- copy the mars so that they are available
on the test classpath -->
- <copy
file="../addressing/target/addressing-${version}.mar"
-
tofile="target/test-classes/modules/addressing-${version}.mar"/>
+ <mkdir dir="target/test-classes"/>
<property name="axis2.home"
value="${basedir}/target"/>
<path id="maven.dependency.classpath">
