Move deploy-assembly-jar script

deploy-assembly/deploy-assembly-jar.sh

@@ -6,6 +6,6 @@ mvn deploy:deploy-file \
   -DartifactId=gitbucket-assembly\
   -Dversion=3.2.0\
   -Dpackaging=jar\
-  -Dfile=target/scala-2.11/gitbucket-assembly-3.2.0.jar\
+  -Dfile=../target/scala-2.11/gitbucket-assembly-3.2.0.jar\
   -DrepositoryId=sourceforge.jp\
   -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/mvn/

doc/release.md

@@ -31,7 +31,7 @@ object AutoUpdate {
     ...
 ```
 
-### deploy-assembly-jar.sh
+### deploy-assembly/deploy-assembly-jar.sh
 
 ```bash
 #!/bin/sh
@@ -42,7 +42,7 @@ mvn deploy:deploy-file \
   -DartifactId=gitbucket-assembly\
   -Dversion=3.2.0\ # <---- update here!!
   -Dpackaging=jar\
-  -Dfile=target/scala-2.11/gitbucket-assembly-x.x.x.jar\ # <---- update here!!
+  -Dfile=../target/scala-2.11/gitbucket-assembly-x.x.x.jar\ # <---- update here!!
   -DrepositoryId=sourceforge.jp\
   -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/mvn/
 ```
@@ -61,6 +61,7 @@ Run ant with `build.xml` in the root directory. The release war file is generate
 For plug-in development, we have to publish the assembly jar file to the public Maven repository.
 
 ```
+cd deploy-assembly/
 ./deploy-assembly-jar.sh
 ```
 

gitbucket-assembly.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

project/build.scala

@@ -47,7 +47,7 @@ object MyBuild extends Build {
       "org.scalatra" %% "scalatra" % ScalatraVersion,
       "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
       "org.scalatra" %% "scalatra-json" % ScalatraVersion,
-      "org.json4s" %% "json4s-jackson" % "3.2.11",
+      //"org.json4s" %% "json4s-jackson" % "3.2.11",
       "jp.sf.amateras" %% "scalatra-forms" % "0.1.0",
       "commons-io" % "commons-io" % "2.4",
       "org.pegdown" % "pegdown" % "1.4.1", // 1.4.2 has incompatible APi changes
@@ -66,7 +66,12 @@ object MyBuild extends Build {
       "com.typesafe" % "config" % "1.2.1",
       "com.typesafe.play" %% "twirl-compiler" % "1.0.4",
       "com.typesafe.akka" %% "akka-actor" % "2.3.10",
-      "com.enragedginger" %% "akka-quartz-scheduler" % "1.3.0-akka-2.3.x"
+      "com.enragedginger" %% "akka-quartz-scheduler" % "1.3.0-akka-2.3.x",
+      "org.elasticsearch" % "elasticsearch" % "1.5.2",
+      "com.sksamuel.elastic4s" %% "elastic4s" % "1.5.6",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.4.2",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.4.2",
+      "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.4.2"
     ),
     play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._",
     EclipseKeys.withSource := true,