erik/kobalt-maven-local
erik/kobalt-maven-local
1
0
Fork 0
Code Issues Pull requests Releases Activity

Added support for maven.repo.local

Browse source
This commit is contained in:
Erik C. Thauvin 2016-07-20 23:25:53 -07:00
parent feebc92d57
commit 508576d8c5
1 changed files with 33 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/main/kotlin/net/thauvin/erik/kobalt/plugin/maven/local/MavenLocalPlugin.kt
View file

@ -42,9 +42,9 @@ import java.io.FileInputStream
import java.util.* import java.util.*
public class MavenLocalPlugin : BasePlugin(), ILocalMavenRepoPathInterceptor { public class MavenLocalPlugin : BasePlugin(), ILocalMavenRepoPathInterceptor {
val MAVEN_LOCAL_REPO_PROPERTY = "maven-local-repo" val MAVEN_LOCAL_REPO_PROPERTY = "maven.repo.local"
var mavenLocalPath: String? = null var mvnLocalPath: String? = null
override val name = "kobalt-maven-local" override val name = "kobalt-maven-local"
@ -57,36 +57,45 @@ public class MavenLocalPlugin : BasePlugin(), ILocalMavenRepoPathInterceptor {
FileInputStream("local.properties").use { fis -> load(fis) } FileInputStream("local.properties").use { fis -> load(fis) }
} }
// val sysProps = Properties() val sysProps = System.getProperties()
// sysProps.putAll(System.getProperties())
// if (localProps.isNotEmpty()) {
// if (localProps.containsKey(MAVEN_LOCAL_REPO_PROPERTY)) {
// sysProps.put(MAVEN_LOCAL_REPO_PROPERTY, localProps.getProperty(MAVEN_LOCAL_REPO_PROPERTY))
// }
// }
// settings.systemProperties = sysProps
settings.systemProperties = System.getProperties() if (localProps.containsKey(MAVEN_LOCAL_REPO_PROPERTY)) {
val mvnLocalProp = localProps.getProperty(MAVEN_LOCAL_REPO_PROPERTY, "")
if (mvnLocalProp.length > 0) {
mvnLocalPath = mvnLocalProp
}
} else if (sysProps.containsKey(MAVEN_LOCAL_REPO_PROPERTY)) {
val mvnLocalProp = sysProps.getProperty(MAVEN_LOCAL_REPO_PROPERTY, "")
if (mvnLocalProp.length > 0) {
mvnLocalPath = mvnLocalProp
}
} else {
settings.systemProperties = sysProps
if (localProps.isNotEmpty()) {
if (localProps.containsKey(MAVEN_LOCAL_REPO_PROPERTY)) {
sysProps.put(MAVEN_LOCAL_REPO_PROPERTY, localProps.getProperty(MAVEN_LOCAL_REPO_PROPERTY))
}
}
settings.userSettingsFile = File(System.getProperty("user.home"), ".m2/settings.xml")
settings.userSettingsFile = File(System.getProperty("user.home"), ".m2/settings.xml") val m2Home = System.getProperty("M2_HOME")
if (m2Home != null) {
settings.globalSettingsFile = File(m2Home, "conf/settings.xml")
}
val m2Home = System.getProperty("M2_HOME") val result = builder.build(settings)
if (m2Home != null) { mvnLocalPath = result.effectiveSettings.localRepository
settings.globalSettingsFile = File(m2Home, "conf/settings.xml")
}
val result = builder.build(settings) if (mvnLocalPath == null) {
mavenLocalPath = result.effectiveSettings.localRepository warn("Unable to parse local maven settings.")
}
if (mavenLocalPath == null) {
warn("Unable to parse local maven settings.")
} }
} }
override fun repoPath(currentPath: String): String { override fun repoPath(currentPath: String): String {
if (mavenLocalPath != null) { if (mvnLocalPath != null) {
log(2, "Setting Maven Local Repository path to: " + mavenLocalPath) log(2, "Setting Maven Local Repository path to: " + mvnLocalPath)
return mavenLocalPath.toString() return mvnLocalPath.toString()
} else { } else {
return currentPath return currentPath
} }