diff --git a/kotlin-maven-plugin-tools/pom.xml b/kotlin-maven-plugin-tools/pom.xml index fab82fe..dc285ee 100644 --- a/kotlin-maven-plugin-tools/pom.xml +++ b/kotlin-maven-plugin-tools/pom.xml @@ -104,6 +104,16 @@ org.apache.maven maven-plugin-descriptor + + + commons-logging + commons-logging + + + + org.ow2.asm + asm + diff --git a/kotlin-maven-plugin-tools/src/it/basic/pom.xml b/kotlin-maven-plugin-tools/src/it/basic/pom.xml index 574305d..ffea987 100644 --- a/kotlin-maven-plugin-tools/src/it/basic/pom.xml +++ b/kotlin-maven-plugin-tools/src/it/basic/pom.xml @@ -35,9 +35,11 @@ 1.2.41 1.8 1.8 - 3.5.3 + 3.9.5 UTF-8 UTF-8 + 3.7.1 + 3.10.2 @@ -59,7 +61,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.5.1 + ${maven-plugin-tools.version} provided @@ -101,7 +103,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.5.1 + ${maven-plugin-plugin.version} kotlin @@ -119,12 +121,6 @@ default-descriptor process-classes - - help-goal - - helpmojo - - diff --git a/kotlin-maven-plugin-tools/src/it/basic/postbuild.groovy b/kotlin-maven-plugin-tools/src/it/basic/postbuild.groovy index 353793d..a854eac 100644 --- a/kotlin-maven-plugin-tools/src/it/basic/postbuild.groovy +++ b/kotlin-maven-plugin-tools/src/it/basic/postbuild.groovy @@ -25,7 +25,7 @@ if (!file.isFile()) { def expected = ''' - + example-maven-plugin @@ -36,6 +36,7 @@ def expected = ''' example false true + 3.9.5 example @@ -85,8 +86,8 @@ def expected = ''' help - Display help information on example-maven-plugin.<br> -Call <code>mvn example:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details. + Display help information on example-maven-plugin. +Call mvn example:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. false false false @@ -104,7 +105,7 @@ Call <code>mvn example:help -Ddetail=true -Dgoal=&lt;goal-name&gt; boolean false true - If <code>true</code>, display all settable properties for each goal. + If true, display all settable properties for each goal. goal @@ -141,139 +142,127 @@ Call <code>mvn example:help -Ddetail=true -Dgoal=&lt;goal-name&gt; org.apache.maven maven-core jar - 3.5.3 + 3.9.5 org.apache.maven maven-model jar - 3.5.3 + 3.9.5 org.apache.maven maven-settings jar - 3.5.3 + 3.9.5 org.apache.maven maven-settings-builder jar - 3.5.3 + 3.9.5 org.codehaus.plexus - plexus-interpolation - jar - 1.24 - - - org.sonatype.plexus plexus-sec-dispatcher jar - 1.4 + 2.0 - org.sonatype.plexus + org.codehaus.plexus plexus-cipher jar - 1.4 + 2.0 org.apache.maven maven-builder-support jar - 3.5.3 + 3.9.5 org.apache.maven maven-repository-metadata jar - 3.5.3 + 3.9.5 org.apache.maven maven-artifact jar - 3.5.3 + 3.9.5 org.apache.maven maven-model-builder jar - 3.5.3 + 3.9.5 org.apache.maven maven-resolver-provider jar - 3.5.3 + 3.9.5 org.apache.maven.resolver maven-resolver-impl jar - 1.1.1 + 1.9.16 + + + org.apache.maven.resolver + maven-resolver-named-locks + jar + 1.9.16 org.apache.maven.resolver maven-resolver-api jar - 1.1.1 + 1.9.16 org.apache.maven.resolver maven-resolver-spi jar - 1.1.1 + 1.9.16 org.apache.maven.resolver maven-resolver-util jar - 1.1.1 + 1.9.16 org.apache.maven.shared maven-shared-utils jar - 3.2.1 - - - commons-io - commons-io - jar - 2.5 + 3.3.4 org.eclipse.sisu org.eclipse.sisu.plexus jar - 0.3.3 - - - javax.enterprise - cdi-api - jar - 1.0 + 0.3.5 javax.annotation - jsr250-api + javax.annotation-api jar - 1.0 + 1.2 org.eclipse.sisu org.eclipse.sisu.inject jar - 0.3.3 + 0.3.5 com.google.inject guice jar - 4.0 + 5.1.0 aopalliance @@ -285,7 +274,13 @@ Call <code>mvn example:help -Ddetail=true -Dgoal=&lt;goal-name&gt; com.google.guava guava jar - 20.0 + 32.0.1-jre + + + com.google.guava + failureaccess + jar + 1.0.1 javax.inject @@ -297,31 +292,43 @@ Call <code>mvn example:help -Ddetail=true -Dgoal=&lt;goal-name&gt; org.codehaus.plexus plexus-utils jar - 3.1.0 + 3.5.1 org.codehaus.plexus plexus-classworlds jar - 2.5.2 + 2.7.0 + + + org.codehaus.plexus + plexus-interpolation + jar + 1.26 org.codehaus.plexus plexus-component-annotations jar - 1.7.1 + 2.1.0 org.apache.commons commons-lang3 jar - 3.5 + 3.12.0 + + + org.slf4j + slf4j-api + jar + 1.7.36 org.apache.maven maven-plugin-api jar - 3.5.3 + 3.9.5 org.jetbrains.kotlin diff --git a/kotlin-maven-plugin-tools/src/main/kotlin/com/github/gantsign/maven/tools/plugin/extractor/kotlin/KotlinMojoDescriptorExtractor.kt b/kotlin-maven-plugin-tools/src/main/kotlin/com/github/gantsign/maven/tools/plugin/extractor/kotlin/KotlinMojoDescriptorExtractor.kt index 002f1b2..9b1c195 100644 --- a/kotlin-maven-plugin-tools/src/main/kotlin/com/github/gantsign/maven/tools/plugin/extractor/kotlin/KotlinMojoDescriptorExtractor.kt +++ b/kotlin-maven-plugin-tools/src/main/kotlin/com/github/gantsign/maven/tools/plugin/extractor/kotlin/KotlinMojoDescriptorExtractor.kt @@ -34,6 +34,7 @@ import org.apache.maven.plugin.descriptor.Requirement import org.apache.maven.repository.RepositorySystem import org.apache.maven.tools.plugin.ExtendedMojoDescriptor import org.apache.maven.tools.plugin.PluginToolsRequest +import org.apache.maven.tools.plugin.extractor.GroupKey import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ComponentAnnotationContent import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ExecuteAnnotationContent @@ -67,6 +68,12 @@ class KotlinMojoDescriptorExtractor @Inject constructor( return mojoAnnotatedClasses.toMojoDescriptors(request.pluginDescriptor) } + override fun getName(): String = "kotlin" + + override fun isDeprecated(): Boolean = false + + override fun getGroupKey(): GroupKey = GroupKey("kotlin", 100) + /** * Scan sources to get @since and @deprecated and description of classes and properties. */ diff --git a/pom.xml b/pom.xml index 2fe021c..cd4308f 100644 --- a/pom.xml +++ b/pom.xml @@ -47,10 +47,10 @@ 11 11 4.13.2 - 1.7.20 + 1.8.10 3.3.0 - 3.6.4 - 1.8.2 + 3.7.1 + 1.9.4 8 3.5.4 2.1.1 @@ -98,7 +98,7 @@ org.apache.httpcomponents httpcore - 4.4.15 + 4.4.16 org.apache.maven @@ -198,12 +198,12 @@ org.apache.maven.wagon wagon-provider-api - 3.5.2 + 3.5.3 org.codehaus.plexus plexus-archiver - 4.5.0 + 4.6.2 org.codehaus.plexus @@ -218,7 +218,7 @@ org.codehaus.plexus plexus-utils - 3.4.2 + 3.5.1 org.eclipse.sisu @@ -233,7 +233,7 @@ org.jetbrains markdown-jvm - 0.3.1 + 0.4.1 org.jetbrains.kotlin @@ -243,7 +243,7 @@ org.codehaus.plexus plexus-compiler-manager - 2.12.1 + 2.13.0 test @@ -409,6 +409,9 @@ update-file-header process-sources + + **/plugin.xml +