bump gitbucket

Author: yaroot

build.sbt

@@ -3,12 +3,14 @@ name          := "pages-plugin"
 scalaVersion  := "2.11.8"
 scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8", "-feature")
 
-resolvers += Resolver.jcenterRepo
-resolvers += "amateras-repo" at "http://amateras.sourceforge.jp/mvn/"
+resolvers ++= Seq(
+  Resolver.jcenterRepo,
+  Resolver.mavenLocal
+)
 
 libraryDependencies ++= Seq(
-  "gitbucket"          % "gitbucket-assembly" % "4.3.0"   % "provided",
-  "javax.servlet"      % "javax.servlet-api"  % "3.1.0"   % "provided"
+  "io.github.gitbucket"   %%  "gitbucket"           % "4.6.0",
+  "javax.servlet"         %   "javax.servlet-api"   % "3.1.0"
 )
 
 // bintrayReleaseOnPublish in ThisBuild := false

src/main/scala/Plugin.scala

@@ -1,10 +1,9 @@
-
 import gitbucket.core.controller.ControllerBase
 import gitbucket.plugin.pages.PagesController
+import gitbucket.plugin.pages.util.VersionUtil
 import io.github.gitbucket.solidbase.model.Version
 
 class Plugin extends gitbucket.core.plugin.Plugin {
-  import gitbucket.plugin.pages.util.VersionUtil
   override val pluginId = "pages"
   override val pluginName = "Pages Plugin"
   override val description = "Project pages for gitbucket"
@@ -15,19 +14,3 @@ class Plugin extends gitbucket.core.plugin.Plugin {
   )
 }
 
-package gitbucket.plugin.pages.util {
-  import scala.collection.JavaConverters._
-  import scala.util.Try
-  import java.util.jar.{ Manifest => JarManifest }
-
-  object VersionUtil {
-    val version = Try(getVersionFromManifests()).toOption.flatten
-    def getVersionFromManifests() = {
-      val resources = getClass.getClassLoader.getResources("META-INF/MANIFEST.MF").asScala.toList
-      resources
-        .flatMap(res => Try(new JarManifest(res.openStream())).toOption.toList)
-        .find(manifest => Option(manifest.getMainAttributes.getValue("Implementation-Title")).contains("pages-plugin"))
-        .flatMap(manifest => Option(manifest.getMainAttributes.getValue("Implementation-Version")))
-    }
-  }
-}

src/main/scala/gitbucket/plugin/pages/util/VersionUtil.scala

@@ -0,0 +1,18 @@
+package gitbucket.plugin.pages.util
+
+import java.util.jar.{ Manifest => JarManifest }
+
+import scala.util.Try
+import scala.collection.JavaConverters._
+
+object VersionUtil {
+  val version = Try(parseManifest()).toOption.flatten
+
+  def parseManifest() = {
+    val resources = getClass.getClassLoader.getResources("META-INF/MANIFEST.MF").asScala.toList
+    resources
+      .flatMap(res => Try(new JarManifest(res.openStream())).toOption.toList)
+      .find(manifest => Option(manifest.getMainAttributes.getValue("Implementation-Title")).contains("pages-plugin"))
+      .flatMap(manifest => Option(manifest.getMainAttributes.getValue("Implementation-Version")))
+  }
+}