Revision: 15261
http://gate.svn.sourceforge.net/gate/?rev=15261&view=rev
Author: ian_roberts
Date: 2012-01-30 11:02:12 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
Changed java2html and javacc to "provided" scope rather than "compile" as they
are needed at build time but not at runtime (and so shouldn't be pulled in as
transitive dependencies when someone else depends on gate-core).
Also changed test.snapshot to read the pom directly rather than depending on
gate-core, so it correctly downloads provided-scope dependencies.
Modified Paths:
--------------
gate/trunk/build/deploy/maven/build.xml
gate/trunk/build/deploy/maven/gate-core.pom.template
Modified: gate/trunk/build/deploy/maven/build.xml
===================================================================
--- gate/trunk/build/deploy/maven/build.xml 2012-01-30 10:34:33 UTC (rev
15260)
+++ gate/trunk/build/deploy/maven/build.xml 2012-01-30 11:02:12 UTC (rev
15261)
@@ -58,10 +58,9 @@
</artifact:install>
</target>
- <target name="test.snapshot" depends="snapshot-install">
- <artifact:dependencies filesetId="dependency.fileset"
versionsId="dependency.versions">
- <dependency groupId="uk.ac.gate" artifactId="gate-core"
version="${gate.version}"/>
- </artifact:dependencies>
+ <target name="test.snapshot" depends="prepare.snapshot.pom">
+ <artifact:pom id="gate-core.pom" file="${gate.core.pom}"/>
+ <artifact:dependencies filesetId="dependency.fileset"
versionsId="dependency.versions" pomRefId="gate-core.pom"/>
<delete dir="lib"/>
<copy todir="lib">
<fileset refid="dependency.fileset" />
Modified: gate/trunk/build/deploy/maven/gate-core.pom.template
===================================================================
--- gate/trunk/build/deploy/maven/gate-core.pom.template 2012-01-30
10:34:33 UTC (rev 15260)
+++ gate/trunk/build/deploy/maven/gate-core.pom.template 2012-01-30
11:02:12 UTC (rev 15261)
@@ -39,7 +39,8 @@
<groupId>net.java.dev.javacc</groupId>
<artifactId>javacc</artifactId>
<version>5.0</version>
- <scope>compile</scope>
+ <!-- required for build but not to run -->
+ <scope>provided</scope>
</dependency>
<!-- needed to prodcue the nice HTML versions of the Java code that
get added to the javadocs -->
@@ -47,7 +48,8 @@
<groupId>de.java2html</groupId>
<artifactId>java2html</artifactId>
<version>5.0</version>
- <scope>compile</scope>
+ <!-- required for build but not to run -->
+ <scope>provided</scope>
</dependency>
<!-- needed to ensure the same version across configurations -->
@@ -192,7 +194,8 @@
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
- <scope>compile</scope>
+ <!-- required for build but not to run -->
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>ant</groupId>
@@ -229,7 +232,7 @@
<scope>runtime</scope>
</dependency>
- <!-- needed by XSteam at runtime -->
+ <!-- needed by CreoleAnnotationHandler at runtime -->
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
