Merge pull request #888 from Graylog2/fix-snapshot-directory-in-tgz

Fix directory in snapshot archives

Author: joschi

.travis.yml

@@ -21,7 +21,7 @@ script: play-${PLAY_VERSION}/play test
 after_script:
 - kill `cat $HOME/graylog2-server/graylog2-travis-server.pid`
 after_success:
-- play-${PLAY_VERSION}/play package-snapshot
+- play-${PLAY_VERSION}/play universal:package-zip-tarball
 deploy:
   provider: s3
   access_key_id: AKIAIGYGO43W76PZMMVA
@@ -30,7 +30,7 @@ deploy:
   bucket: graylog2-builds
   region: eu-west-1
   skip_cleanup: true
-  local-dir: target/universal/package
+  local-dir: target/universal
   on:
     repo: Graylog2/graylog2-web-interface
     jdk: oraclejdk7

project/Build.scala

@@ -7,80 +7,53 @@ import com.typesafe.sbt.SbtNativePackager.Universal
 import com.typesafe.sbt.packager.universal.Keys.packageZipTarball
 
 object ApplicationBuild extends Build {
-
   val appName         = "graylog2-web-interface"
   val appVersion      = "0.21.0-beta3-SNAPSHOT"
-
-
-  // use this to potentially add a timestamp to the built package name
-  def packageSnapshot = Command.command("package-snapshot") { state =>
-    val extracted = Project extract state
-
-    val configFile: File = new File("conf/graylog2-web-interface.conf")
-    val exampleConfigFile: File = new File("misc/graylog2-web-interface.conf.example")
-
-    // this will overwrite the config file with the sample one
-    IO.copyFile(exampleConfigFile, configFile, preserveLastModified = true)
-
-    val task: (State, File) = extracted.runTask(packageZipTarball in Universal, state)
-
-    val snapshot = extracted.getOpt(isSnapshot).get // getting current version
-    if (snapshot) {
-      val dateFormat = { val df = new SimpleDateFormat("yyyyMMddhhmmss");
-        df.setTimeZone(TimeZone.getTimeZone("UTC")); df
-      }
-      val timestamp = dateFormat.format(new Date())
-      // fuck it sbt, really.
-      // changing the state to use a different package name is not possible, because the artifact name has already been
-      // constructed at the time this runs. instead of doing it lazily the native packager does it eagerly, so we can't
-      // change it anymore.
-      val packageDir: File = new File(task._2.getParentFile, "package")
-      packageDir.mkdir()
-      task._2.renameTo(new File(packageDir, task._2.getName.replace(".tgz", "-" + timestamp + ".tgz")))
-    }
-    task._1
-  }
-
   val appDependencies = Seq(
     cache,
     javaCore,
-    javaJdbc,
     javaEbean,
-
     "com.google.code.gson" % "gson" % "2.2",
     "com.google.guava" % "guava" % "14.0",
     "com.ning" % "async-http-client" % "1.7.17",
     "org.apache.shiro" % "shiro-core" % "1.2.2",
     "com.google.inject" % "guice" % "3.0",
     "com.google.inject.extensions" % "guice-assistedinject" % "3.0",
     "javax.inject" % "javax.inject" % "1",
-
     "org.graylog2" % "play2-graylog2_2.10" % "1.0",
-//    "org.graylog2" % "graylog2-rest-client" % "0.21.0-SNAPSHOT" changing(),
-
-    "org.elasticsearch" % "elasticsearch" % "0.90.5" % "test",
-
-    "org.fluentlenium" % "fluentlenium-core" % "0.9.0" % "test",
-    "org.fluentlenium" % "fluentlenium-festassert" % "0.9.0" % "test",
-    "org.mockito" % "mockito-all" % "1.9.5" % "test",
 
     // TODO this is stupid, just to get that UriBuilder...
     "javax.ws.rs" % "jsr311-api" % "0.11",
     "com.sun.jersey" % "jersey-server" % "1.17.1",
     "com.sun.jersey" % "jersey-grizzly2" % "1.17.1",
     "com.sun.jersey" % "jersey-bundle" % "1.17.1",
 
+    "org.mockito" % "mockito-all" % "1.9.5" % "test",
+    "org.elasticsearch" % "elasticsearch" % "0.90.5" % "test",
+    "org.fluentlenium" % "fluentlenium-core" % "0.9.0" % "test",
+    "org.fluentlenium" % "fluentlenium-festassert" % "0.9.0" % "test",
     "org.codehaus.jackson" % "jackson-core-asl" % "1.9.12" % "test"
   )
+  val repositories = Seq(
+    Resolver.url("Graylog2 Play Repository", url("http://graylog2.github.io/play2-graylog2/releases/"))(Resolver.ivyStylePatterns),
+    Resolver.url("Graylog2 Play Snapshot Repository", url("http://graylog2.github.io/play2-graylog2/snapshots/"))(Resolver.ivyStylePatterns),
+    Resolver.sonatypeRepo("releases"),
+    ("Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots")
+  )
 
+  // Submodule
   lazy val restClient = Project("graylog2-rest-client", file("modules/graylog2-rest-client"))
 
+  // Helper
+  val isSnapshot: Boolean = appVersion.endsWith("SNAPSHOT")
+  val timestamp: String = {
+    val df = new SimpleDateFormat("yyyyMMddHHmmss")
+    df.setTimeZone(TimeZone.getTimeZone("UTC"))
+    df.format(new Date())
+  }
+
   val main = play.Project(appName, appVersion, appDependencies).settings(
-    resolvers += Resolver.url("Graylog2 Play Repository", url("http://graylog2.github.io/play2-graylog2/releases/"))(Resolver.ivyStylePatterns),
-    resolvers += Resolver.url("Graylog2 Play Snapshot Repository", url("http://graylog2.github.io/play2-graylog2/snapshots/"))(Resolver.ivyStylePatterns),
-    resolvers += Resolver.url("Typesafe Maven Releases", url("http://repo.typesafe.com/typesafe/maven-releases"))(Resolver.mavenStylePatterns),
-    resolvers += ("Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"),
-    commands ++= Seq(packageSnapshot),
+    resolvers ++= repositories,
     resourceGenerators in Compile <+= resourceManaged in Compile map { dir =>
       val propsFile = new File(dir, "git.properties")
       val currentGitSha = "git.sha1=%s\n".format("git rev-parse HEAD" !!)
@@ -98,7 +71,16 @@ object ApplicationBuild extends Build {
         IO.write(propsFile, currentGitSha)
       }
       Seq(propsFile)
+    },
+    sources in doc in Compile := List(),
+    mappings in Universal in packageZipTarball += file("misc/graylog2-web-interface.conf.example") -> "conf/graylog2-web-interface.conf",
+    name in Universal := {
+      val originalName = (name in Universal).value
+      if (isSnapshot) {
+        s"${appName}-${appVersion}-${timestamp}"
+      } else {
+        originalName
+      }
     }
-
   ).dependsOn(restClient)
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.0
+sbt.version=0.13.5

travis/graylog2-server.sh

@@ -1,17 +1,19 @@
-#!/bin/bash
+#!/bin/bash -e
+cd $HOME
 
-pushd $HOME
-
-git clone https://github.com/Graylog2/graylog2-server.git
+echo 'Cloning graylog2-server git repository...'
+git clone --quiet --depth 1 https://github.com/Graylog2/graylog2-server.git
 
 pushd graylog2-server
 
 sh install-syslog4j-jar.sh
-mvn clean package -DskipTests
 
-mvn install
+echo 'Building graylog2-server...'
+mvn --batch-mode --fail-fast --quiet -DskipTests=true \
+  -Dmaven.javadoc.skip=true -Dmaven.findbugs.skip=true -Dsource.skip=true \
+  clean install
 
-cp $TRAVIS_BUILD_DIR/travis/server.conf graylog2-travis-server.conf
-nohup java -jar graylog2-server/target/graylog2-server.jar -f graylog2-travis-server.conf -l -p graylog2-travis-server.pid &
+echo 'Starting graylog2-server...'
+nohup java -jar graylog2-server/target/graylog2-server.jar -f $TRAVIS_BUILD_DIR/travis/server.conf -l -p graylog2-travis-server.pid &
 
 popd