rearranging

integration-tests/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.antwerkz.graven</groupId>
         <artifactId>graven-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
+        <version>0.4.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

integration-tests/src/test/kotlin/com/antwerkz/build/maven/GradleInvocationTest.kt → integration-tests/src/test/kotlin/com/antwerkz/graven/maven/GradleInvocationTest.kt

@@ -1,6 +1,5 @@
-package com.antwerkz.build.maven
+package com.antwerkz.graven.maven
 
-import com.antwerkz.build.maven.MavenTester.Companion.initProject
 import java.io.File
 import org.testng.Assert.assertTrue
 import org.testng.annotations.Test

integration-tests/src/test/kotlin/com/antwerkz/build/maven/MavenProcessInvocationResult.kt → integration-tests/src/test/kotlin/com/antwerkz/graven/maven/MavenProcessInvocationResult.kt

@@ -1,4 +1,4 @@
-package com.antwerkz.build.maven
+package com.antwerkz.graven.maven
 
 import org.apache.maven.shared.invoker.InvocationResult
 import org.apache.maven.shared.utils.cli.CommandLineException

integration-tests/src/test/kotlin/com/antwerkz/build/maven/MavenProcessInvoker.java → integration-tests/src/test/kotlin/com/antwerkz/graven/maven/MavenProcessInvoker.java

@@ -1,4 +1,4 @@
-package com.antwerkz.build.maven;
+package com.antwerkz.graven.maven;
 
 import org.apache.maven.shared.invoker.*;
 import org.apache.maven.shared.utils.cli.CommandLineException;

integration-tests/src/test/kotlin/com/antwerkz/build/maven/MavenTester.kt → integration-tests/src/test/kotlin/com/antwerkz/graven/maven/MavenTester.kt

@@ -1,4 +1,4 @@
-package com.antwerkz.build.maven
+package com.antwerkz.graven.maven
 
 import java.io.File
 import java.io.FileNotFoundException

integration-tests/src/test/kotlin/com/antwerkz/build/maven/ReplacementMojoTest.kt → integration-tests/src/test/kotlin/com/antwerkz/graven/maven/ReplacementMojoTest.kt

@@ -1,4 +1,4 @@
-package com.antwerkz.build.maven
+package com.antwerkz.graven.maven
 
 import java.io.File
 import java.nio.charset.Charset

integration-tests/src/test/kotlin/com/antwerkz/build/maven/RunningInvoker.kt → integration-tests/src/test/kotlin/com/antwerkz/graven/maven/RunningInvoker.kt

@@ -1,4 +1,4 @@
-package com.antwerkz.build.maven
+package com.antwerkz.graven.maven
 
 import java.io.File
 import java.io.IOException

integration-tests/src/test/resources/maven/projects/doubleQuotes/src/main/kotlin/com/antwerkz/build/DoubleQuotes.kt

@@ -1,3 +1,3 @@
-package com.antwerkz.build
+package com.antwerkz.graven
 
 class DoubleQuotes

integration-tests/src/test/resources/maven/projects/gradleInvoke/src/main/kotlin/com/antwerkz/build/GradleDummy.kt

@@ -1,4 +1,4 @@
-package com.antwerkz.build
+package com.antwerkz.graven
 
 class GradleDummy  {
 

integration-tests/src/test/resources/maven/projects/gradleInvoke/src/test/kotlin/com/antwerkz/build/DummyTest.kt

@@ -1,4 +1,4 @@
-package com.antwerkz.build
+package com.antwerkz.graven
 
 class DummyTest  {
 

integration-tests/src/test/resources/maven/projects/noRegex/src/main/kotlin/com/antwerkz/build/SampleClass.kt

@@ -1,4 +1,4 @@
-package com.antwerkz.build
+package com.antwerkz.graven
 
 class SampleClass  {
 

integration-tests/src/test/resources/maven/projects/properties/src/main/kotlin/com/antwerkz/build/SampleClass.kt

@@ -1,4 +1,4 @@
-package com.antwerkz.build
+package com.antwerkz.graven
 
 class SampleClass  {
 

integration-tests/src/test/resources/maven/projects/singleQuotes/src/main/kotlin/com/antwerkz/build/SampleClass.kt

@@ -1,4 +1,4 @@
-package com.antwerkz.build
+package com.antwerkz.graven
 
 class SampleClass  {
     i should fail

mojo/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.antwerkz.graven</groupId>
         <artifactId>graven-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
+        <version>0.4.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

mojo/src/main/kotlin/com/antwerkz/build/GradleInvocationMojo.kt → mojo/src/main/kotlin/com/antwerkz/graven/GradleInvocationMojo.kt

@@ -1,6 +1,7 @@
-package com.antwerkz.build
+package com.antwerkz.graven
 
-import com.antwerkz.build.GradleInvocationMojo.Companion.MOJO_NAME
+import com.antwerkz.graven.GradleInvocationMojo.Companion.MOJO_NAME
+import com.antwerkz.graven.model.GradleTask
 import java.io.File
 import java.io.FileOutputStream
 import org.apache.maven.plugin.AbstractMojo

mojo/src/main/kotlin/com/antwerkz/build/GravenLifecycleParticipant.kt → mojo/src/main/kotlin/com/antwerkz/graven/GravenLifecycleParticipant.kt

@@ -1,6 +1,6 @@
-package com.antwerkz.build
+package com.antwerkz.graven
 
-import com.antwerkz.build.model.TargetPlugin
+import com.antwerkz.graven.model.TargetPlugin
 import java.io.File
 import java.util.Properties
 import javax.inject.Named

mojo/src/main/kotlin/com/antwerkz/build/ReplacementMojo.kt → mojo/src/main/kotlin/com/antwerkz/graven/ReplacementMojo.kt

@@ -1,8 +1,8 @@
-package com.antwerkz.build
+package com.antwerkz.graven
 
+import com.antwerkz.graven.model.RegexReplacement
 import com.antwerkz.expression.RegularExpression
 import com.antwerkz.expression.toRegex
-import com.fasterxml.jackson.annotation.JsonRootName
 import java.io.File
 import java.io.IOException
 import java.nio.charset.Charset
@@ -120,28 +120,6 @@ class ReplacementMojo : AbstractMojo() {
     }
 }
 
-@JsonRootName("replacement")
-class RegexReplacement() {
-    lateinit var pattern: String
-    lateinit var value: String
-    private val regex by lazy { Regex(pattern) }
-
-    constructor(pattern: String, value: String) : this() {
-        this.pattern = pattern
-        this.value = value
-    }
-
-    fun replace(input: String): String {
-        return input.replace(regex, value)
-    }
-
-    override fun toString(): String {
-        return "Replacement(pattern='$pattern', value='$value')"
-    }
-}
-
-data class MappedProperty(var gradleProperty: String = "", var mavenProperty: String = "")
-
 fun List<Dependency>.groupDeps(): Map<String, Dependency> {
     return groupBy { "${it.groupId}:${it.artifactId}" }.map { it.key to it.value.first() }.toMap()
 }

mojo/src/main/kotlin/com/antwerkz/build/Updaters.kt → mojo/src/main/kotlin/com/antwerkz/graven/Updaters.kt

@@ -1,13 +1,14 @@
-package com.antwerkz.build
+package com.antwerkz.graven
 
-import com.antwerkz.build.UpdateValues.matcher
-import com.antwerkz.build.UpdateValues.propertyMatcher
+import com.antwerkz.graven.UpdateValues.matcher
+import com.antwerkz.graven.UpdateValues.propertyMatcher
 import com.antwerkz.expression.RegularExpression.Companion.capture
 import com.antwerkz.expression.RegularExpression.Companion.oneOrMore
 import com.antwerkz.expression.RegularExpression.Companion.oneOrMoreLazy
 import com.antwerkz.expression.toRegex
 import org.apache.maven.model.Dependency
 
+@Suppress("unused")
 enum class Updaters {
     DOUBLE_QUOTED_VERSIONS {
         override fun create(input: String): DepReplacer {

mojo/src/main/kotlin/com/antwerkz/build/GradleTask.kt → mojo/src/main/kotlin/com/antwerkz/graven/model/GradleTask.kt

@@ -1,4 +1,4 @@
-package com.antwerkz.build
+package com.antwerkz.graven.model
 
 import com.fasterxml.jackson.annotation.JsonRootName
 

mojo/src/main/kotlin/com/antwerkz/build/GravenConfig.kt → mojo/src/main/kotlin/com/antwerkz/graven/model/GravenConfig.kt

@@ -1,4 +1,4 @@
-package com.antwerkz.build
+package com.antwerkz.graven.model
 
 import com.fasterxml.jackson.annotation.JsonRootName
 

mojo/src/main/kotlin/com/antwerkz/graven/model/RegexReplacement.kt

@@ -0,0 +1,23 @@
+package com.antwerkz.graven.model
+
+import com.fasterxml.jackson.annotation.JsonRootName
+
+@JsonRootName("replacement")
+class RegexReplacement() {
+    lateinit var pattern: String
+    lateinit var value: String
+    private val regex by lazy { Regex(pattern) }
+
+    constructor(pattern: String, value: String) : this() {
+        this.pattern = pattern
+        this.value = value
+    }
+
+    fun replace(input: String): String {
+        return input.replace(regex, value)
+    }
+
+    override fun toString(): String {
+        return "Replacement(pattern='$pattern', value='$value')"
+    }
+}

mojo/src/main/kotlin/com/antwerkz/build/model/TargetPlugin.kt → mojo/src/main/kotlin/com/antwerkz/graven/model/TargetPlugin.kt

@@ -1,4 +1,4 @@
-package com.antwerkz.build.model
+package com.antwerkz.graven.model
 
 data class TargetPlugin(
     val groupId: String,

mojo/src/test/kotlin/com/antwerkz/build/ReplacementMojoTest.kt → mojo/src/test/kotlin/com/antwerkz/graven/ReplacementMojoTest.kt

@@ -1,5 +1,6 @@
-package com.antwerkz.build
+package com.antwerkz.graven
 
+import com.antwerkz.graven.model.RegexReplacement
 import org.apache.maven.model.Dependency
 import org.testng.Assert.assertEquals
 import org.testng.annotations.DataProvider

mojo/src/test/resources/logback.xml

@@ -9,8 +9,5 @@
     <root level="warn">
         <appender-ref ref="STDOUT" />
     </root>
-    <logger name="com.antwerkz.bottlerocket" level="warn">
-        <appender-ref ref="STDOUT" />
-    </logger>
 
 </configuration>

pom.xml

@@ -12,10 +12,9 @@
 
     <groupId>com.antwerkz.graven</groupId>
     <artifactId>graven-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>graven</name>
     <description>
         This plugin drives a gradle build from maven allowing for single-lifecycle development on mixed build projects
     </description>
@@ -28,6 +27,7 @@
 
     <properties>
         <jackson.version>2.15.2</jackson.version>
+        <maven.version>3.9.3</maven.version>
 
         <kotlin.code.style>official</kotlin.code.style>
     </properties>
@@ -54,7 +54,7 @@
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-core</artifactId>
-                <version>3.9.4</version>
+                <version>${maven.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -65,7 +65,7 @@
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-plugin-api</artifactId>
-                <version>3.9.4</version>
+                <version>${maven.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>