128 lines
4.2 KiB
Diff
128 lines
4.2 KiB
Diff
From f6fc82767bd6e4c52b5eb78fb8162bd4c72b5569 Mon Sep 17 00:00:00 2001
|
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
Date: Fri, 24 Oct 2014 14:25:15 +0200
|
|
Subject: [PATCH 3/6] Bintray
|
|
|
|
---
|
|
build.gradle | 9 ---------
|
|
gradle/docs.gradle | 21 +--------------------
|
|
gradle/upload.gradle | 8 +-------
|
|
3 files changed, 2 insertions(+), 36 deletions(-)
|
|
|
|
diff --git a/build.gradle b/build.gradle
|
|
index c049f93..fdbe73b 100644
|
|
--- a/build.gradle
|
|
+++ b/build.gradle
|
|
@@ -26,7 +26,6 @@ buildscript {
|
|
apply from: 'gradle/filter.gradle'
|
|
apply from: 'gradle/indy.gradle'
|
|
apply from: 'gradle/publish.gradle'
|
|
-apply plugin: 'javadocHotfix'
|
|
|
|
File javaHome = new File(System.getProperty('java.home'))
|
|
logger.lifecycle "Using Java from $javaHome (version ${System.getProperty('java.version')})"
|
|
@@ -167,11 +166,6 @@ dependencies {
|
|
testCompile "com.thoughtworks.qdox:qdox:$qdoxVersion"
|
|
|
|
tools "com.googlecode.jarjar:jarjar:$jarjarVersion"
|
|
- tools("net.sourceforge.cobertura:cobertura:$coberturaVersion") {
|
|
- exclude(module: 'asm')
|
|
- exclude(module: 'asm')
|
|
- exclude(module: 'ant')
|
|
- }
|
|
tools "org.ow2.asm:asm-all:$asmVersion"
|
|
tools "com.thoughtworks.qdox:qdox:$qdoxVersion"
|
|
|
|
@@ -437,9 +431,6 @@ apply from: 'gradle/groovydoc.gradle'
|
|
apply from: 'gradle/docs.gradle'
|
|
apply from: 'gradle/assemble.gradle'
|
|
apply from: 'gradle/upload.gradle'
|
|
-apply from: 'gradle/idea.gradle'
|
|
-apply from: 'gradle/eclipse.gradle'
|
|
-apply from: 'gradle/codehaus.gradle'
|
|
apply from: 'gradle/quality.gradle'
|
|
|
|
// If a local configuration file for tweaking the build is present, apply it
|
|
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
|
|
index ef761c9..83ea5f0 100644
|
|
--- a/gradle/docs.gradle
|
|
+++ b/gradle/docs.gradle
|
|
@@ -17,24 +17,10 @@
|
|
* under the License.
|
|
*/
|
|
task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK']) {
|
|
- if (JavaVersion.current().java7Compatible) {
|
|
- dependsOn 'asciidocAll', 'assembleAsciidoc'
|
|
- }
|
|
ext.footer = 'Copyright © 2003-2017 The Apache Software Foundation. All rights reserved.'
|
|
ext.title = "Groovy ${groovyVersion}"
|
|
}
|
|
|
|
-if (JavaVersion.current().java7Compatible) {
|
|
- task assembleAsciidoc(type: Copy, dependsOn: 'asciidocAll') {
|
|
- subprojects {
|
|
- from project.asciidoctor
|
|
- }
|
|
- into "$buildDir/asciidoc"
|
|
- }
|
|
-
|
|
- task asciidocAll(dependsOn: 'asciidoctor')
|
|
-}
|
|
-
|
|
def javadocSpec = {
|
|
maxMemory = javaDoc_mx
|
|
project.configure(options) {
|
|
@@ -187,11 +173,6 @@ task docGDK {
|
|
}
|
|
}
|
|
|
|
-// apply javadoc fix tool to generated javadocs - ensures no vulnerability even on old JDK versions
|
|
-allprojects {
|
|
- apply plugin: 'javadocHotfix'
|
|
-}
|
|
-
|
|
if (JavaVersion.current().isJava7Compatible()) {
|
|
javadocAll.options.source = '1.7'
|
|
}
|
|
@@ -203,4 +184,4 @@ if (JavaVersion.current().isJava8Compatible()) {
|
|
options.addStringOption('Xdoclint:none', '-quiet')
|
|
}
|
|
}
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|
|
diff --git a/gradle/upload.gradle b/gradle/upload.gradle
|
|
index 50926ec..42e8c28 100644
|
|
--- a/gradle/upload.gradle
|
|
+++ b/gradle/upload.gradle
|
|
@@ -91,15 +91,12 @@ allprojects {
|
|
|
|
artifacts {
|
|
archives jar
|
|
- archives sourceJar
|
|
- archives javadocJar
|
|
- archives groovydocJar
|
|
}
|
|
|
|
[uploadArchives, install]*.with {
|
|
// dependency on jarAllAll should in theory be replaced with jar, jarWithIndy but
|
|
// in practice, it is faster
|
|
- dependsOn([jarAllAll, sourceJar, javadocJar, groovydocJar])
|
|
+ dependsOn([jarAllAll])
|
|
doFirst {
|
|
if (rootProject.useIndy()) {
|
|
new GradleException('You cannot use uploadArchives or install task with the flag [indy] turned'
|
|
@@ -121,9 +118,6 @@ allprojects {
|
|
// gradle doesn't expect us to mutate configurations like we do here
|
|
// so signing the configuration won't work and we do it manually here
|
|
signArchiveTask(jar)
|
|
- signArchiveTask(sourceJar)
|
|
- signArchiveTask(javadocJar)
|
|
- signArchiveTask(groovydocJar)
|
|
def indyJar = rootProject.ext.deriveFile(jar.archivePath, 'indy')
|
|
if (indyJar.exists()) {
|
|
signWithClassifier('indy', indyJar)
|
|
--
|
|
2.9.3
|
|
|