[virtualcommons-svn] SF.net SVN: virtualcommons:[68] foraging/trunk
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] SF.net SVN: virtualcommons:[68] foraging/trunk
|
From: <al...@us...> - 2008-12-13 01:59:36
|
Revision: 68
http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=68&view=rev
Author: alllee
Date: 2008-12-13 01:59:30 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
- updated dependencies, now using dev.java.net maven repo for jogl
- adding ant runner to execute ant tasks (not fully functional yet)
Modified Paths:
--------------
foraging/trunk/build.xml
foraging/trunk/ivy.xml
foraging/trunk/ivysettings.xml
foraging/trunk/pom.xml
Modified: foraging/trunk/build.xml
===================================================================
--- foraging/trunk/build.xml 2008-12-02 17:09:48 UTC (rev 67)
+++ foraging/trunk/build.xml 2008-12-13 01:59:30 UTC (rev 68)
@@ -333,6 +333,13 @@
</junit>
</target>
+ <property name='savefile.converter.class' value='edu.asu.commons.foraging.util.ForagingSaveFileConverter'/>
+ <target name='convert-savefiles' depends='compile'>
+ <java classname='${savefile.converter.class}' classpathref='project.classpath' fork='yes'>
+ <arg value='raw-data'/>
+ </java>
+ </target>
+
<!-- Run Test on GUI -->
<target name="guitest" depends="compile-tests">
<java fork="yes" classname="junit.swingui.TestRunner" taskname="JUnit" failonerror="true" dir="${basedir}">
Modified: foraging/trunk/ivy.xml
===================================================================
--- foraging/trunk/ivy.xml 2008-12-02 17:09:48 UTC (rev 67)
+++ foraging/trunk/ivy.xml 2008-12-13 01:59:30 UTC (rev 68)
@@ -5,9 +5,8 @@
<ivy-module version="2.0">
<info organisation="edu.asu.commons" module="foraging"/>
<dependencies>
- <dependency org="junit" name="junit" rev="4.4"/>
+ <dependency org="junit" name="junit" rev="latest.integration"/>
<dependency org="edu.asu.commons" name="csidex" rev="latest.integration"/>
- <dependency org="net.java.dev.jogl" name="jogl" rev="1.1.1"/>
- <dependency org="net.java.dev.jogl" name="gluegen-rt" rev="1.1.1"/>
+ <dependency org="net.java.dev.jogl" name="jogl" rev="1.1.1-rc6"/>
</dependencies>
</ivy-module>
Modified: foraging/trunk/ivysettings.xml
===================================================================
--- foraging/trunk/ivysettings.xml 2008-12-02 17:09:48 UTC (rev 67)
+++ foraging/trunk/ivysettings.xml 2008-12-13 01:59:30 UTC (rev 68)
@@ -3,12 +3,15 @@
vim:sts=2:sw=2:
-->
<ivysettings>
- <settings defaultResolver="tdar-archiva" checkUpToDate="false"/>
+ <settings defaultResolver="chain-resolver" checkUpToDate="false"/>
<resolvers>
- <ibiblio name='tdar-archiva' m2compatible='true' root='http://dev.tdar.org/archiva/repository/internal'/>
- <filesystem name="local">
- <ivy pattern="${repository.dir}/[module]/ivy-[revision].xml"/>
- <artifact pattern="${repository.dir}/[module]/[artifact]-[revision].[ext]"/>
- </filesystem>
+ <chain name='chain-resolver' returnFirst='true'>
+ <ibiblio name='tdar-archiva' m2compatible='true' root='http://dev.tdar.org/archiva/repository/internal'/>
+ <ibiblio name='dev.java.net' m2compatible='true' root='http://download.java.net/maven/2'/>
+ <filesystem name="local">
+ <ivy pattern="${repository.dir}/[module]/ivy-[revision].xml"/>
+ <artifact pattern="${repository.dir}/[module]/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ </chain>
</resolvers>
</ivysettings>
Modified: foraging/trunk/pom.xml
===================================================================
--- foraging/trunk/pom.xml 2008-12-02 17:09:48 UTC (rev 67)
+++ foraging/trunk/pom.xml 2008-12-13 01:59:30 UTC (rev 68)
@@ -17,35 +17,32 @@
<name>tDAR Maven2 repository</name>
<url>http://dev.tdar.org/archiva/repository/internal</url>
</repository>
+ <!--
<repository>
<id>java.net</id>
<name>java.net</name>
<url>http://download.java.net/maven/2</url>
<layout>default</layout>
</repository>
+ -->
</repositories>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>edu.asu.commons</groupId>
<artifactId>csidex</artifactId>
- <version>0.2</version>
+ <version>0.2.1</version>
</dependency>
<dependency>
<groupId>net.java.dev.jogl</groupId>
<artifactId>jogl</artifactId>
- <version>1.1.1</version>
+ <version>1.1.1-rc6</version>
</dependency>
- <dependency>
- <groupId>net.java.dev.jogl</groupId>
- <artifactId>gluegen-rt</artifactId>
- <version>1.1.1</version>
- </dependency>
</dependencies>
<build>
<finalName>foraging</finalName>
@@ -66,4 +63,44 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>ant</id>
+ <build>
+ <defaultGoal>antrun:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <goals>
+ <goal>load</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <!--
+ can be invoked via
+ mvn -P ant -D target=deploy
+ -->
+ <property name="compile.classpath" refid="maven.compile.classpath"/>
+ <property name="runtime.classpath" refid="maven.runtime.classpath"/>
+ <property name="test.classpath" refid="maven.test.classpath"/>
+ <property name="plugin.classpath" refid="maven.plugin.classpath"/>
+ <ant antfile="${basedir}/build.xml" inheritRefs="true" inheritAll="true">
+ <target name="${target}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ </profiles>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
