61 lines
3.7 KiB
Diff
61 lines
3.7 KiB
Diff
From af73d2549325d6d4d5b3e1ba09a0123a8d766d57 Mon Sep 17 00:00:00 2001
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
Date: Sat, 11 Dec 2010 21:26:12 +0100
|
|
Subject: [PATCH] Set includeantruntime
|
|
|
|
Othewise a test would fail:
|
|
|
|
Testsuite: gant.targets.tests.Maven_Test
|
|
Tests run: 12, Failures: 1, Errors: 0, Time elapsed: 5.486 sec
|
|
|
|
Testcase: testLoadingTargets took 0.345 sec
|
|
Testcase: testCompileTargetInDirectoryOtherThanTheCurrentBuildDirectory took 2.926 sec
|
|
FAILED
|
|
expected:<...classes
|
|
[javac] []Compiling 1 source f...> but was:<...classes
|
|
[javac] [: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
|
|
[javac] ]Compiling 1 source f...>
|
|
junit.framework.ComparisonFailure: expected:<...classes
|
|
[javac] []Compiling 1 source f...> but was:<...classes
|
|
[javac] [: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
|
|
[javac] ]Compiling 1 source f...>
|
|
at groovy.util.GroovyTestCase.assertEquals(GroovyTestCase.java:440)
|
|
at org.codehaus.groovy.reflection.CachedMethod.invoke(CachedMethod.java:88)
|
|
at groovy.lang.MetaMethod.doMethodInvoke(MetaMethod.java:233)
|
|
at groovy.lang.MetaClassImpl.invokeStaticMethod(MetaClassImpl.java:1326)
|
|
at org.codehaus.groovy.runtime.callsite.StaticMetaClassSite.callStatic(StaticMetaClassSite.java:62)
|
|
at org.codehaus.groovy.runtime.callsite.CallSiteArray.defaultCallStatic(CallSiteArray.java:48)
|
|
at org.codehaus.groovy.runtime.callsite.AbstractCallSite.callStatic(AbstractCallSite.java:167)
|
|
at org.codehaus.groovy.runtime.callsite.AbstractCallSite.callStatic(AbstractCallSite.java:179)
|
|
at gant.targets.tests.Maven_Test.testCompileTargetInDirectoryOtherThanTheCurrentBuildDirectory(Maven_Test.groovy:56)
|
|
|
|
Testcase: testPackageNoGroupIdLeftShift took 0.232 sec
|
|
Testcase: testPackageNoGroupIdPower took 0.167 sec
|
|
Testcase: testPackageNoArtifactIdLeftShift took 0.497 sec
|
|
Testcase: testPackageNoArtifactIdPower took 0.153 sec
|
|
Testcase: testPackageVersionLeftShift took 0.228 sec
|
|
Testcase: testPackageVersionPower took 0.155 sec
|
|
Testcase: testBindingPropertyIsReadOnlyLeftShift took 0.225 sec
|
|
Testcase: testBindingPropertyIsReadOnlyPower took 0.144 sec
|
|
Testcase: testAdditionalTarget took 0.171 sec
|
|
Testcase: testAdditionalTargetError took 0.211 sec
|
|
---
|
|
src/main/groovy/gant/targets/Maven.groovy | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/src/main/groovy/gant/targets/Maven.groovy b/src/main/groovy/gant/targets/Maven.groovy
|
|
index 971e922..17af145 100644
|
|
--- a/src/main/groovy/gant/targets/Maven.groovy
|
|
+++ b/src/main/groovy/gant/targets/Maven.groovy
|
|
@@ -36,7 +36,7 @@ final class Maven {
|
|
testCompilePath : '' , // Defaults to standard Maven 2 convention. Set in constructor since it uses a GString dependent on a value in the map.
|
|
testReportPath : '' , // Defaults to standard Maven 2 convention. Set in constructor since it uses a GString dependent on a value in the map.
|
|
metadataPath : '' , // Defaults to standard Maven 2 convention. Set in constructor since it uses a GString dependent on a value in the map.
|
|
- javaCompileProperties : [ source : '1.5' , target : '1.5' , debug : 'false' ] ,
|
|
+ javaCompileProperties : [ includeantruntime : 'false' , source : '1.5' , target : '1.5' , debug : 'false' ] ,
|
|
groovyCompileProperties : [ : ] ,
|
|
nestedJavacCompilerArgs : [ ] ,
|
|
compileClasspath : [ ] ,
|
|
--
|
|
1.7.3.3
|
|
|