diff --git a/pom.xml b/pom.xml index 6dfdd41..474422d 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,9 @@ 3.6.3 1.3.71 3.6.0 - 0.7.0 + 0.9.0 + 1.8 + 1.8 @@ -147,7 +149,6 @@ src/main/kotlin src/test/kotlin - @@ -157,7 +158,6 @@ - org.jetbrains.kotlin @@ -201,6 +201,15 @@ org.apache.maven.plugins maven-failsafe-plugin 3.0.0-M5 + + + + ${maven.version} + ${maven.home} + + diff --git a/src/main/kotlin/com/github/helpermethod/UpdateMojo.kt b/src/main/kotlin/com/github/helpermethod/UpdateMojo.kt index bdd9a32..994700b 100644 --- a/src/main/kotlin/com/github/helpermethod/UpdateMojo.kt +++ b/src/main/kotlin/com/github/helpermethod/UpdateMojo.kt @@ -18,17 +18,13 @@ class UpdateMojo : AbstractMojo() { lateinit var localRepository: ArtifactRepository @Parameter(defaultValue = "\${settings}", required = true) lateinit var settings: Settings - @Parameter(property = "connectionUrl", defaultValue = "\${project.scm.connection}", required = true) + @Parameter(property = "connectionUrl", defaultValue = "\${project.scm.connection}") lateinit var connectionUrl: String - @Parameter( - property = "developerConnectionUrl", - defaultValue = "\${project.scm.developerConnection}", - required = true - ) + @Parameter(property = "developerConnectionUrl", defaultValue = "\${project.scm.developerConnection}") lateinit var developerConnectionUrl: String @Parameter(property = "connectionType", defaultValue = "connection", required = true) lateinit var connectionType: String - @Parameter(property = "dependencyUpdate.git.provider", defaultValue="native", required = false) + @Parameter(property = "dependencyUpdate.git.provider", defaultValue="NATIVE", required = false) lateinit var gitProvider : GitProviderChoice @Component diff --git a/src/test/java/com/github/helpermethod/UpdateMojoNativeGitIT.java b/src/test/java/com/github/helpermethod/UpdateMojoNativeGitIT.java deleted file mode 100644 index e20f21c..0000000 --- a/src/test/java/com/github/helpermethod/UpdateMojoNativeGitIT.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.helpermethod; - -import com.soebes.itf.jupiter.extension.MavenJupiterExtension; -import com.soebes.itf.jupiter.extension.MavenTest; -import org.apache.maven.execution.MavenExecutionResult; - -@MavenJupiterExtension -class UpdateMojoNativeGitIT { - - @MavenTest(goals = "dependency-update-maven-plugin:update") - void nativeProviderIsSet(MavenExecutionResult result) { - } -} \ No newline at end of file diff --git a/src/test/kotlin/com/github/helpermethod/UpdateMojoNativeGitIT.kt b/src/test/kotlin/com/github/helpermethod/UpdateMojoNativeGitIT.kt new file mode 100644 index 0000000..ec5e0bb --- /dev/null +++ b/src/test/kotlin/com/github/helpermethod/UpdateMojoNativeGitIT.kt @@ -0,0 +1,18 @@ +package com.github.helpermethod + +import com.soebes.itf.extension.assertj.MavenExecutionResultAssert.assertThat +import com.soebes.itf.jupiter.extension.MavenGoal +import com.soebes.itf.jupiter.extension.MavenGoals +import com.soebes.itf.jupiter.extension.MavenJupiterExtension +import com.soebes.itf.jupiter.extension.MavenTest +import com.soebes.itf.jupiter.maven.MavenExecutionResult + +@MavenJupiterExtension +internal class UpdateMojoNativeGitIT { + //TODO: add test for making connectionUrl or developerConnection mandatory only if provider == JGIT + @MavenTest + @MavenGoal("\${project.groupId}:\${project.artifactId}:\${project.version}:update") + fun nativeProviderIsSet(result: MavenExecutionResult) { + assertThat(result).isSuccessful() + } +} \ No newline at end of file diff --git a/src/test/resources-its/com/github/helpermethod/UpdateMojoNativeGitIT/nativeProviderIsSet/pom.xml b/src/test/resources-its/com/github/helpermethod/UpdateMojoNativeGitIT/nativeProviderIsSet/pom.xml index 298ec79..a777bcb 100644 --- a/src/test/resources-its/com/github/helpermethod/UpdateMojoNativeGitIT/nativeProviderIsSet/pom.xml +++ b/src/test/resources-its/com/github/helpermethod/UpdateMojoNativeGitIT/nativeProviderIsSet/pom.xml @@ -6,6 +6,11 @@ native-git-provider-test 0.6.0 + + someConnection + someDeveloperConnection + + org.junit.jupiter