Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-06 15:42:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2093 from gitbucket/improve-plugin-version-handling

Browse Source 
Improve plugin version handling
This commit is contained in:
Naoki Takezoe
2018-07-05 01:55:06 +09:00
committed by GitHub
parent 7ced7795ff 61261dcb4e
commit f5e2e5a0aa
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/gitbucket/core/plugin/PluginRegistry.scala
View File

@@ -272,17 +272,23 @@ object PluginRegistry {
lazy val extraPluginDir: Option[String] = Option(System.getProperty("gitbucket.pluginDir"))
def getGitBucketVersion(pluginJarFileName: String): Option[String] = {
val regex = ".+-gitbucket\\_(\\d+\\.\\d+\\.\\d+)-.+".r
val regex = ".+-gitbucket\\_(\\d+\\.\\d+\\.\\d+(-SNAPSHOT)?)-.+".r
pluginJarFileName match {
case regex(x) => Some(x)
case _ => None
case regex(all, _) => Some(all)
case _ => None
}
}
def getPluginVersion(pluginJarFileName: String): String = {
val regex = ".+-(\\d+\\.\\d+\\.\\d+)\\.jar$".r
val regex = ".+-((\\d+)\\.(\\d+)(\\.(\\d+))?(-SNAPSHOT)?)\\.jar$".r
pluginJarFileName match {
case regex(x) => x
case regex(all, major, minor, _, patch, modifier) => {
if (patch != null) all
else {
s"${major}.${minor}.0" + (if (modifier == null) "" else modifier)
}
}
case _ => "0.0.0"
}
}