diff --git a/build.gradle b/build.gradle index 485965757..bc3aef5a4 100644 --- a/build.gradle +++ b/build.gradle @@ -7,9 +7,9 @@ subprojects { apply from: "${rootDir}/gradle/upstream-repositories.gradle" apply from: "${rootDir}/gradle/versions.gradle" - apply from: "${rootDir}/gradle/eclipse-project-layout.gradle" apply from: "${rootDir}/gradle/java-compiler-settings.gradle" apply from: "${rootDir}/gradle/maven-deployment.gradle" + apply from: "${rootDir}/gradle/eclipse-project-layout.gradle" apply from: "${rootDir}/gradle/manifest-gen.gradle" group = 'org.eclipse.xtext' diff --git a/gradle/eclipse-project-layout.gradle b/gradle/eclipse-project-layout.gradle index 78222cb55..5d2e48d1c 100644 --- a/gradle/eclipse-project-layout.gradle +++ b/gradle/eclipse-project-layout.gradle @@ -25,9 +25,16 @@ jar { from ('.') { include 'about*.*', 'plugin.xml', 'schema/**', 'model/**', 'plugin.properties' } + if (isTestProject) + from(sourceSets.test.output) } -if (isTestProject) { - jar.from(sourceSets.test.output) +if (isTestProject || name.contains('testlanguage')) { + tasks.withType(Javadoc) { + enabled = false + } + javadocJar.enabled = false uploadArchives.enabled = false +} else { + artifacts.archives javadocJar } diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle index d745cf770..3366beb5b 100644 --- a/gradle/maven-deployment.gradle +++ b/gradle/maven-deployment.gradle @@ -8,16 +8,13 @@ task sourcesJar(type: Jar, dependsOn: classes) { include 'schema/**', 'model/**' } } +artifacts.archives sourcesJar task javadocJar(type: Jar, dependsOn: javadoc) { classifier = 'javadoc' from javadoc.destinationDir } -artifacts { - archives sourcesJar, javadocJar -} - //------------------------------------------------------ // Sign the artifacts if the signing info is complete