.elasticbeanstalk/config.yml

@@ -11,4 +11,4 @@ global:
   repository: null
   sc: git
 deploy:
-  artifact: service/build/ROOT.war
+  artifact: build/ROOT.war

service/build.gradle

@@ -12,8 +12,6 @@ buildscript {
   }
 }
 
-import static com.jdbernard.gradle.ExecUtil.*
-
 dependencies {
     compile localGroovy()
     compile 'ch.qos.logback:logback-classic:1.1.8'

service/src/main/groovy/com/jdbernard/nlsongs/servlet/NLSongsContext.groovy

@@ -11,8 +11,7 @@ public class NLSongsContext {
     public static String mediaBaseUrl
 
     public static String makeUrl(Service service, Song song) {
-        return mediaBaseUrl + '/' + service.localDate.toString('yyyy') + "/" +
-            service.localDate.toString('yyyy-MM-dd') + '_' +
+        return mediaBaseUrl + '/' + service.localDate.toString('yyyy-MM-dd') + '_' +
             service.serviceType.name().toLowerCase() + '_' +
             song.name.replaceAll(/[\s'"\\\/\?!]/, '') + '.mp3' }
 }

uploader/build.gradle

@@ -18,7 +18,7 @@ task writeVersionFile(
   group: 'build',
   description: 'Write the version to VERSION.txt') { doLast {
 
-  (new File("${buildDir}/classes/main/VERSION.txt")).text = version
+  (new File('build/classes/main/VERSION.txt')).text = version
 } }
 
 build.dependsOn writeVersionFile