Author: davidb
Date: Fri May 13 20:17:01 2011
New Revision: 1102887
URL: http://svn.apache.org/viewvc?rev=1102887&view=rev
Log:
Fixed dependencies.
Modified:
aries/trunk/spi-fly/pom.xml
aries/trunk/spi-fly/spi-fly-deps/pom.xml
Modified: aries/trunk/spi-fly/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/pom.xml?rev=1102887&r1=1102886&r2=1102887&view=diff
==============================================================================
--- aries/trunk/spi-fly/pom.xml (original)
+++ aries/trunk/spi-fly/pom.xml Fri May 13 20:17:01 2011
@@ -24,8 +24,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <artifactId>java6-parent</artifactId>
+ <version>0.4</version>
<relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
</parent>
@@ -49,19 +49,6 @@
<url>http://svn.apache.org/viewvc/aries/trunk/spi-fly</url>
</scm>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: aries/trunk/spi-fly/spi-fly-deps/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-deps/pom.xml?rev=1102887&r1=1102886&r2=1102887&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-deps/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-deps/pom.xml Fri May 13 20:17:01 2011
@@ -44,7 +44,8 @@
<configuration>
<tasks>
<!-- Add Ant tasks from the ant-contrib jar -->
- <taskdef
resource="net/sf/antcontrib/antcontrib.properties" />
+ <taskdef
resource="net/sf/antcontrib/antcontrib.properties"
+ classpathref="maven.plugin.classpath"
/>
<if>
<available
file="${basedir}/target/downloaded/org.eclipse.osgi_3.7.0.jar"/>
@@ -65,7 +66,15 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>20020829</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
+
</project>
