@@ -125,7 +125,7 @@ subprojects {
125
125
from sourceSets. main. allSource
126
126
classifier = ' sources'
127
127
}
128
-
128
+
129
129
task javadocJar(type : Jar , dependsOn : javadoc) {
130
130
classifier = ' javadoc'
131
131
from javadoc. destinationDir
@@ -401,25 +401,19 @@ project('artifactory-maven-plugin') {
401
401
task pluginDescriptor( type : Exec ) {
402
402
// http://www.gradle.org/docs/current/dsl/org.gradle.api.tasks.Exec.html
403
403
404
- final mvn = project. hasProperty( ' mvn' ) ? project. mvn : System . getProperty( ' os.name' )?. toLowerCase()?. contains( ' win' ) ? ' mvn.bat' : ' mvn'
405
- final mvnArgs = project. hasProperty( ' mvnArgs' ) ? project. mvnArgs : ' '
406
- final allArgs = [ ' -e' , ' -B' , mvnArgs, ' org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor' ]. grep()
404
+ final mvn = project. hasProperty( ' mvn' ) ? project. mvn : System . getProperty( ' os.name' )?. toLowerCase()?. contains( ' win' ) ? ' mvn.bat' : ' mvn'
405
+ final mvnArgs = project. hasProperty( ' mvnArgs' ) ? project. mvnArgs : ' '
406
+ final File pom = project. file( " $buildDir /pom.xml" )
407
+ final allArgs = [ ' -e' , ' -B' , ' -f' , pom. canonicalPath, mvnArgs, ' org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor' ]. grep()
407
408
408
409
executable mvn
409
410
args allArgs
410
411
411
412
doFirst {
412
413
assert project. compileGroovy. destinationDir. directory
413
- final File pom = project. file( ' pom.xml' )
414
414
install. repositories. mavenInstaller. pom. writeTo( pom )
415
- assert pom. file, " [$pom . canonicalPath ] was not created"
416
- println " POM file:$pom . canonicalPath is created"
417
-
418
- final buildDirName = project. buildDir. name
419
- final classesDirName = project. compileGroovy. destinationDir. canonicalPath. replace( ' \\ ' , ' /' ) -
420
- " ${ project.buildDir.canonicalPath.replace( '\\', '/' ) } /"
421
-
422
- println " classesDirName = [$classesDirName ]"
415
+ assert pom. file, " [$pom . canonicalPath ] was not generated"
416
+ println " POM is generated at file:$pom . canonicalPath "
423
417
424
418
pom. text = pom. text.
425
419
replace( ' <groupId>unknown</groupId>' , " <groupId>${ project.group} </groupId>" ).
@@ -428,8 +422,8 @@ project('artifactory-maven-plugin') {
428
422
|<version>${ version} </version>
429
423
| <packaging>maven-plugin</packaging>
430
424
| <build>
431
- | <directory>\ $ {project.basedir}/ $b uildDirName </directory>
432
- | <outputDirectory>\ $ {project.build.directory}/ $c lassesDirName </outputDirectory>
425
+ | <directory>${ project.buildDir.canonicalPath } </directory>
426
+ | <outputDirectory>${ project.compileGroovy.destinationDir.canonicalPath } </outputDirectory>
433
427
| </build>""" . stripMargin(). trim())
434
428
435
429
println " Running '$mvn ' with arguments $allArgs "
0 commit comments