Bugfix to add conf and type to source and javadoc jar artifacts publi…

…shed to Ivy repositories
nebula-plugins · Nov 18, 2015 · 3e79657 · 3e79657
1 parent c5e775e
commit 3e79657
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+4.4.3 / 2015-11-18
+==================
+
+* Bugfix to add conf and type to source and javadoc jar artifacts published to Ivy repositories
+
 4.4.2 / 2015-11-12
 ==================
 

diff --git a/src/main/groovy/nebula/plugin/publishing/publications/JavadocJarPlugin.groovy b/src/main/groovy/nebula/plugin/publishing/publications/JavadocJarPlugin.groovy
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 package nebula.plugin.publishing.publications
-
+import nebula.plugin.publishing.ivy.IvyBasePublishPlugin
+import nebula.plugin.publishing.maven.MavenBasePublishPlugin
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPlugin
@@ -37,6 +38,8 @@ class JavadocJarPlugin implements Plugin<Project> {
             }
 
             project.plugins.withType(org.gradle.api.publish.maven.plugins.MavenPublishPlugin) {
+                project.plugins.apply(MavenBasePublishPlugin)
+
                 project.publishing {
                     publications {
                         nebula(MavenPublication) {
@@ -47,10 +50,15 @@ class JavadocJarPlugin implements Plugin<Project> {
             }
 
             project.plugins.withType(org.gradle.api.publish.ivy.plugins.IvyPublishPlugin) {
+                project.plugins.apply(IvyBasePublishPlugin)
+
                 project.publishing {
                     publications {
                         nebulaIvy(IvyPublication) {
-                            artifact project.tasks.javadocJar
+                            artifact(project.tasks.javadocJar) {
+                                type 'javadoc'
+                                conf 'javadoc'
+                            }
                         }
                     }
                 }

diff --git a/src/main/groovy/nebula/plugin/publishing/publications/SourceJarPlugin.groovy b/src/main/groovy/nebula/plugin/publishing/publications/SourceJarPlugin.groovy
@@ -15,6 +15,8 @@
  */
 package nebula.plugin.publishing.publications
 
+import nebula.plugin.publishing.ivy.IvyBasePublishPlugin
+import nebula.plugin.publishing.maven.MavenBasePublishPlugin
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPlugin
@@ -35,6 +37,8 @@ class SourceJarPlugin implements Plugin<Project> {
             }
 
             project.plugins.withType(org.gradle.api.publish.maven.plugins.MavenPublishPlugin) {
+                project.plugins.apply(MavenBasePublishPlugin)
+
                 project.publishing {
                     publications {
                         nebula(MavenPublication) {
@@ -45,10 +49,15 @@ class SourceJarPlugin implements Plugin<Project> {
             }
 
             project.plugins.withType(org.gradle.api.publish.ivy.plugins.IvyPublishPlugin) {
+                project.plugins.apply(IvyBasePublishPlugin)
+
                 project.publishing {
                     publications {
                         nebulaIvy(IvyPublication) {
-                            artifact project.tasks.sourceJar
+                            artifact(project.tasks.sourceJar) {
+                                type 'sources'
+                                conf 'sources'
+                            }
                         }
                     }
                 }

diff --git a/src/test/groovy/nebula/plugin/publishing/publications/JavadocJarPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/publications/JavadocJarPluginIntegrationSpec.groovy
@@ -112,8 +112,17 @@ class JavadocJarPluginIntegrationSpec extends IntegrationSpec {
         when:
         runTasksSuccessfully('publishNebulaIvyPublicationToTestIvyRepository')
 
+        def ivyXmlFile = new File(ivyPublishDir, 'ivy-0.1.0.xml')
+
         then:
         new File(ivyPublishDir, 'javadoctest-0.1.0-javadoc.jar').exists()
+        ivyXmlFile.exists()
+
+        when:
+        def ivyXml = new XmlSlurper().parse(ivyXmlFile)
+
+        then:
+        ivyXml.publications[0].artifact.find { it.@type == 'javadoc' && it.@conf == 'javadoc' }
     }
 
     def 'javadoc jar has content for ivy'() {

diff --git a/src/test/groovy/nebula/plugin/publishing/publications/SourceJarPluginIntegrationSpec.groovy b/src/test/groovy/nebula/plugin/publishing/publications/SourceJarPluginIntegrationSpec.groovy
@@ -98,8 +98,17 @@ class SourceJarPluginIntegrationSpec extends IntegrationSpec {
         when:
         runTasksSuccessfully('publishNebulaIvyPublicationToTestIvyRepository')
 
+        def ivyXmlFile = new File(ivyPublishDir, 'ivy-0.1.0.xml')
+
         then:
         new File(ivyPublishDir, 'sourcetest-0.1.0-sources.jar').exists()
+        ivyXmlFile.exists()
+
+        when:
+        def ivyXml = new XmlSlurper().parse(ivyXmlFile)
+
+        then:
+        ivyXml.publications[0].artifact.find { it.@type == 'sources' && it.@conf == 'sources' }
     }
 
     def 'source jar contains java sources for maven publication'() {