Skip to content

Commit 88f142a

Browse files
committed
Towards ISSUE #42. Moved webInf into copy()
1 parent b67edfd commit 88f142a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/main/groovy/com/lookout/jruby/JRubyWar.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ class JRubyWar extends War {
2525
// Bring in any compiled classes from our project
2626
from "$project.buildDir/classes/main"
2727

28-
// Bring our vendored gems into the created war file
29-
webInf {
30-
from project.jruby.gemInstallDir
31-
into 'gems'
32-
}
33-
3428
// note that zipTree call is wrapped in closure so that configuration
3529
// is only resolved at execution time. This will take the embeds
3630
// from within the `jrubyEmbeds` configuration and dump them into the war
@@ -43,6 +37,12 @@ class JRubyWar extends War {
4337

4438
@Override
4539
void copy() {
40+
// Bring our vendored gems into the created war file
41+
webInf {
42+
from project.jruby.gemInstallDir
43+
into 'gems'
44+
}
45+
4646
manifest {
4747
attributes 'Main-Class' : mainClass
4848
}

src/test/groovy/com/lookout/jruby/JRubyJarSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ class JRubyJarSpec extends Specification {
2828
def "basic sanity check"() {
2929
expect: "jarTask to be an instance"
3030
jarTask instanceof JRubyJar
31-
jarTask.group == 'JRuby'
31+
project.tasks.jrubyJar.group == 'JRuby'
3232
}
3333
}

0 commit comments

Comments
 (0)