diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt
index ff15cc4c..0d09844a 100644
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@@ -21,7 +21,7 @@ import java.util.zip.ZipEntry
import java.util.zip.ZipOutputStream
val bs = buildScript {
- repos("http://dl.bintray.com/cbeust/maven")
+ repos("https://dl.bintray.com/cbeust/maven")
}
object Versions {
@@ -92,7 +92,7 @@ val kobaltPluginApi = project {
version = readVersion()
directory = "modules/kobalt-plugin-api"
description = "A build system in Kotlin"
- url = "http://beust.com/kobalt"
+ url = "https://beust.com/kobalt"
pom = createPom(name, "A build system in Kotlin")
@@ -309,13 +309,13 @@ fun taskCopyVersionForWrapper(project: Project) : TaskResult {
fun createPom(projectName: String, projectDescription: String) = Model().apply {
name = projectName
description = projectDescription
- url = "http://beust.com/kobalt"
+ url = "https://beust.com/kobalt"
licenses = listOf(License().apply {
name = "Apache-2.0"
- url = "http://www.apache.org/licenses/LICENSE-2.0"
+ url = "https://www.apache.org/licenses/LICENSE-2.0"
})
scm = Scm().apply {
- url = "http://github.com/cbeust/kobalt"
+ url = "https://github.com/cbeust/kobalt"
connection = "https://github.com/cbeust/kobalt.git"
developerConnection = "git@github.com:cbeust/kobalt.git"
}
diff --git a/modules/kobalt-plugin-api/pom.xml b/modules/kobalt-plugin-api/pom.xml
new file mode 100644
index 00000000..f9026387
--- /dev/null
+++ b/modules/kobalt-plugin-api/pom.xml
@@ -0,0 +1,279 @@
+
+ 4.0.0
+
+ com.beust
+ kobalt-pom
+ 1.1.0
+ ../..
+
+
+ kobalt-plugin-api
+ jar
+ 1.1.0
+
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+ ${kotlin.version}
+
+
+ org.apache.maven
+ maven-aether-provider
+ 3.3.9
+
+
+ org.eclipse.aether
+ impl
+
+
+ org.eclipse.aether
+ spi
+
+
+ org.eclipse.aether
+ util
+
+
+ org.eclipse.aether
+ api
+
+
+
+
+ org.apache.maven.resolver
+ maven-resolver-api
+ ${mavenresolver.version}
+
+
+ org.apache.maven.resolver
+ maven-resolver-spi
+ ${mavenresolver.version}
+
+
+ org.apache.maven.resolver
+ maven-resolver-util
+ ${mavenresolver.version}
+
+
+ org.apache.maven.resolver
+ maven-resolver-impl
+ ${mavenresolver.version}
+
+
+ org.apache.maven.resolver
+ maven-resolver-connector-basic
+ ${mavenresolver.version}
+
+
+ org.apache.maven.resolver
+ maven-resolver-transport-http
+ ${mavenresolver.version}
+
+
+ org.apache.maven.resolver
+ maven-resolver-transport-file
+ ${mavenresolver.version}
+
+
+ io.reactivex
+ rxjava
+ 1.3.3
+
+
+ com.squareup.okio
+ okio
+ ${okio.version}
+
+
+ javax.inject
+ javax.inject
+ 1
+ compile
+
+
+ com.google.inject
+ guice
+ 4.2.2
+
+
+ com.google.inject.extensions
+ guice-assistedinject
+ 4.2.2
+
+
+ com.beust
+ jcommander
+ 1.72
+
+
+ org.apache.maven
+ maven-model
+ 3.5.2
+
+
+ com.google.code.findbugs
+ jsr305
+ 3.0.2
+
+
+ com.google.code.gson
+ gson
+ 2.8.2
+
+
+ com.squareup.retrofit2
+ retrofit
+ 2.3.0
+
+
+ com.squareup.retrofit2
+ converter-gson
+ 2.3.0
+
+
+ biz.aQute.bnd
+ biz.aQute.bndlib
+ 3.5.0
+
+
+ com.squareup.okhttp3
+ logging-interceptor
+ ${okhttp3.version}
+
+
+ com.sparkjava
+ spark-core
+ 2.6.0
+
+
+ org.codehaus.groovy
+ groovy
+ 2.4.12
+
+
+ org.apache.commons
+ commons-compress
+ 1.15
+
+
+ commons-io
+ commons-io
+ 2.6
+
+
+ org.junit.platform
+ junit-platform-surefire-provider
+ ${junit.version}
+
+
+ org.junit.platform
+ junit-platform-runner
+ ${junit.version}
+
+
+ org.junit.platform
+ junit-platform-engine
+ ${junit.version}
+
+
+ org.junit.platform
+ junit-platform-console
+ ${junit.version}
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ ${junitJupiter.version}
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ ${junitJupiter.version}
+
+
+ org.testng.testng-remote
+ testng-remote
+ 1.3.2
+
+
+ org.testng
+ testng
+ ${testng.version}
+
+
+ org.eclipse.jgit
+ org.eclipse.jgit
+ 4.9.0.201710071750-r
+
+
+ org.slf4j
+ slf4j-simple
+ ${slf4j.version}
+
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.0
+
+
+
+
+
+
+ org.jetbrains.kotlin
+ kotlin-maven-plugin
+ ${kotlin.version}
+
+
+ compile
+ compile
+
+
+ ${project.basedir}/src/main/kotlin
+
+
+
+
+ test-compile
+ test-compile
+
+
+ ${project.basedir}/src/test/kotlin
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.5.1
+
+
+
+ default-compile
+ none
+
+
+
+ default-testCompile
+ none
+
+
+ java-compile
+ compile
+ compile
+
+
+ java-test-compile
+ test-compile
+ testCompile
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt
index 053d0b92..8eb73c84 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt
@@ -13,9 +13,9 @@ object Constants {
internal val DEFAULT_REPOS = listOf(
// "https://maven-central.storage.googleapis.com/",
- HostConfig("http://repo1.maven.org/maven2/", "Maven"),
+ HostConfig("https://repo1.maven.org/maven2/", "Maven"),
HostConfig("https://jcenter.bintray.com/", "JCenter")
-// "http://repository.jetbrains.com/all/", // <-- contains snapshots
+// "https://repository.jetbrains.com/all/", // <-- contains snapshots
// snapshots
// "https://oss.sonatype.org/content/repositories/snapshots/"
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DocUrl.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DocUrl.kt
index 8acab0ab..93010294 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DocUrl.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DocUrl.kt
@@ -2,7 +2,7 @@ package com.beust.kobalt.internal
class DocUrl {
companion object {
- private const val HOST = "http://beust.com/kobalt/"
+ private const val HOST = "https://beust.com/kobalt/"
private fun url(path: String) = HOST + path
val PUBLISH_PLUGIN_URL = url("plug-ins/index.html#publishing")
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/KobaltMavenResolver.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/KobaltMavenResolver.kt
index f5fcde59..7c8b705f 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/KobaltMavenResolver.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/KobaltMavenResolver.kt
@@ -52,7 +52,7 @@ class KobaltMavenResolver @Inject constructor(val settings: KobaltSettings,
}
fun error(s1: String, s2: String) {
throw KobaltException("Found \"$s1\" but not \"$s2\" in local.properties for ${Kurl.KEY}.$host",
- docUrl = "http://beust.com/kobalt/documentation/index.html#maven-repos-authenticated")
+ docUrl = "https://beust.com/kobalt/documentation/index.html#maven-repos-authenticated")
}
if (! hostInfo.username.isNullOrBlank() && hostInfo.password.isNullOrBlank()) {
error("username", "password")
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt
index fc030edd..fcf5b86a 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt
@@ -57,8 +57,11 @@ class KFiles {
"kobalt/wrapper/kobalt-$previousVersion.jar")
latestInstalledVersion()
val result = listOf("", "modules/kobalt-plugin-api", "modules/wrapper").map {
- File(homeDir(KFiles.joinDir("kotlin", "kobalt", it, "kobaltBuild", "classes")))
- .absolutePath
+ File(homeDir(KFiles.joinDir("kotlin", "kobalt", it, "kobaltBuild", "classes"))) //kobalt build dirs
+ .absolutePath
+ } + listOf("modules/kobalt", "modules/kobalt-plugin-api", "modules/wrapper").map {
+ File(homeDir(KFiles.joinDir("kotlin", "kobalt", it, "target", "classes"))) //maven build dirs
+ .absolutePath
} + listOf(previousJar)
debug("Couldn't find ${jarFile.absolutePath}, using\n " + result.joinToString(" "))
return result.filter { File(it).exists() }
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt
index 06d01e7b..a7b5177d 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt
@@ -24,7 +24,7 @@ class KobaltWrapperProperties @Inject constructor() {
}
private fun defaultUrlFor(version: String) =
- "http://beust.com/kobalt/kobalt-$version.zip"
+ "https://beust.com/kobalt/kobalt-$version.zip"
private val file: File
get() = File("$WRAPPER_DIR/$KOBALT_WRAPPER_PROPERTIES")
diff --git a/modules/kobalt/pom.xml b/modules/kobalt/pom.xml
new file mode 100644
index 00000000..44dc799c
--- /dev/null
+++ b/modules/kobalt/pom.xml
@@ -0,0 +1,231 @@
+
+ 4.0.0
+
+ com.beust
+ kobalt-pom
+ 1.1.0
+ ../..
+
+
+ kobalt
+ jar
+ 1.1.0
+
+
+
+ com.beust
+ kobalt-plugin-api
+ 1.1.0
+
+
+ com.beust
+ wrapper
+ 1.1.0
+
+
+ org.jetbrains.kotlin
+ kotlin-compiler-embeddable
+ ${kotlin.version}
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+ ${kotlin.version}
+
+
+ com.github.spullara.mustache.java
+ compiler
+ 0.9.5
+ compile
+
+
+ javax.inject
+ javax.inject
+ 1
+ compile
+
+
+ com.google.inject
+ guice
+ 4.2.2
+
+
+ com.google.inject.extensions
+ guice-assistedinject
+ 4.2.2
+
+
+ com.beust
+ jcommander
+ 1.72
+
+
+ org.apache.maven
+ maven-model
+ 3.5.2
+
+
+ com.google.code.findbugs
+ jsr305
+ 3.0.2
+
+
+ com.google.code.gson
+ gson
+ 2.8.2
+
+
+ com.squareup.retrofit2
+ retrofit
+ 2.3.0
+
+
+ com.squareup.retrofit2
+ converter-gson
+ 2.3.0
+
+
+ biz.aQute.bnd
+ biz.aQute.bndlib
+ 3.5.0
+
+
+ com.squareup.okhttp3
+ logging-interceptor
+ ${okhttp3.version}
+
+
+ com.sparkjava
+ spark-core
+ 2.6.0
+
+
+ org.codehaus.groovy
+ groovy
+ 2.4.12
+
+
+ org.apache.maven.resolver
+ maven-resolver-spi
+ ${mavenresolver.version}
+
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.0
+
+
+ com.sun.xml.bind
+ jaxb-impl
+ 2.3.0
+
+
+ com.sun.xml.bind
+ jaxb-core
+ 2.3.0
+
+
+ com.sun.activation
+ javax.activation
+ 1.2.0
+
+
+
+ org.assertj
+ assertj-core
+ 3.8.0
+ test
+
+
+ org.jetbrains.kotlin
+ kotlin-test
+ ${kotlin.version}
+ test
+
+
+ org.testng
+ testng
+ ${testng.version}
+ test
+
+
+
+
+
+
+ org.jetbrains.kotlin
+ kotlin-maven-plugin
+ ${kotlin.version}
+
+
+ compile
+ compile
+
+
+ ${project.basedir}../../src/main/kotlin
+
+
+
+
+ test-compile
+ test-compile
+
+
+ ${project.basedir}../../src/test/kotlin
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.5.1
+
+
+
+ default-compile
+ none
+
+
+
+ default-testCompile
+ none
+
+
+ java-compile
+ compile
+ compile
+
+
+ java-test-compile
+ test-compile
+ testCompile
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.2.1
+
+
+
+ com.beust.kobalt.MainKt
+
+
+
+
+
+ package
+
+ shade
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/wrapper/pom.xml b/modules/wrapper/pom.xml
new file mode 100644
index 00000000..a9dc8796
--- /dev/null
+++ b/modules/wrapper/pom.xml
@@ -0,0 +1,28 @@
+
+ 4.0.0
+
+ com.beust
+ kobalt-pom
+ 1.1.0
+ ../..
+
+
+ wrapper
+ jar
+ 1.1.0
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.0
+
+ 1.7
+ 1.7
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
index 40e21ea5..f31bbc3f 100644
--- a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
+++ b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
@@ -118,7 +118,7 @@ public class Main {
}
private static String downloadUrl(String version) {
- return "http://beust.com/kobalt/kobalt-" + version + ".zip";
+ return "https://beust.com/kobalt/kobalt-" + version + ".zip";
}
private void initWrapperFile(String version) throws IOException {
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..3a87c7ac
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,34 @@
+
+ 4.0.0
+
+ com.beust
+ kobalt-pom
+ pom
+ 1.1.0
+
+
+ modules/kobalt-plugin-api
+ modules/wrapper
+ modules/kobalt
+
+
+
+
+ testng
+ https://dl.bintray.com/cbeust/maven
+
+
+
+
+ 1.2.71
+ 1.13.0
+ 3.9.1
+ 1.1.0
+ 1.1.0
+ 5.1.0
+ 6.12
+ 1.7.3
+
+
+
\ No newline at end of file