You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by pa...@apache.org on 2015/05/15 15:06:41 UTC
[1/2] incubator-groovy git commit: tidy up some legacy parts of the
build
Repository: incubator-groovy
Updated Branches:
refs/heads/GROOVY_2_4_X a19c513f4 -> 412ea17c3
tidy up some legacy parts of the build
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/412ea17c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/412ea17c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/412ea17c
Branch: refs/heads/GROOVY_2_4_X
Commit: 412ea17c3ed1ecb28ca79377ef9c3aa6072f40a0
Parents: 54080af
Author: Paul King <pa...@asert.com.au>
Authored: Fri May 15 22:48:16 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Fri May 15 23:06:27 2015 +1000
----------------------------------------------------------------------
build.gradle | 12 ------------
gradle/docs.gradle | 4 ++--
2 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/412ea17c/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 227b701..6298c53 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,7 +101,6 @@ subprojects {
repositories {
// todo Some repos are needed only for some configs. Declare them just for the configuration once Gradle allows this.
- maven { url 'http://www.aQute.biz/repo' } // tools
maven { url 'http://repository.jboss.org/nexus/content/groups/m2-release-proxy' } // examples, tools
}
@@ -119,7 +118,6 @@ ext {
antVersion = '1.9.4'
asmVersion = '5.0.3'
antlrVersion = '2.7.7'
- bndVersion = '0.0.401'
checkstyleVersion = '4.4'
coberturaVersion = '1.9.4.1'
commonsCliVersion = '1.2'
@@ -191,7 +189,6 @@ dependencies {
}
tools "org.ow2.asm:asm-all:$asmVersion"
tools "com.thoughtworks.qdox:qdox:$qdoxVersion"
- tools "biz.aQute:bnd:$bndVersion"
examplesCompile project(':groovy-test')
examplesCompile project(':groovy-swing')
@@ -273,18 +270,10 @@ sourceSets {
resources {
srcDirs = ['src/test-resources']
}
- output.classesDir = "$buildDir/test-classes" as File
}
tools {
- groovy {
- srcDirs = ['src/tools']
- }
- resources {
- srcDirs = ['src/tools']
- }
compileClasspath = configurations.tools + sourceSets.main.runtimeClasspath
runtimeClasspath = output + compileClasspath
- output.classesDir = "$buildDir/tools-classes" as File
}
examples {
groovy {
@@ -294,7 +283,6 @@ sourceSets {
srcDirs = ['src/examples']
}
compileClasspath = configurations.examplesRuntime + sourceSets.main.output + project(':groovy-xml').sourceSets.main.output
- output.classesDir = "$buildDir/examples-classes" as File
}
}
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/412ea17c/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index eb98ffa..f7f84e3 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -20,7 +20,7 @@ task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK']) {
if (JavaVersion.current().java7Compatible) {
dependsOn 'asciidocAll', 'assembleAsciidoc'
}
- ext.footer = 'Copyright &copy; 2003-2014 The Codehaus. All rights reserved.'
+ ext.footer = 'Copyright © 2003-2015 The Apache Software Foundation. All rights reserved.'
ext.title = "Groovy ${groovyVersion}"
}
@@ -142,7 +142,7 @@ task docGDK {
arg(value: '-title')
arg(value: 'Groovy JDK enhancements')
arg(value: '-link')
- arg(value: 'groovy,org.codehaus.groovy=http://groovy.codehaus.org/gapi/')
+ arg(value: 'groovy,org.codehaus.groovy=http://docs.groovy-lang.org/latest/html/gapi/')
arg(value: '-link')
arg(value: 'java,org.xml,javax,org.w3c=http://docs.oracle.com/javase/7/docs/api/')
// either package name if in core or fully qualified path otherwise
[2/2] incubator-groovy git commit: add incubating to src zip name
Posted by pa...@apache.org.
add incubating to src zip name
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/54080afd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/54080afd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/54080afd
Branch: refs/heads/GROOVY_2_4_X
Commit: 54080afd2f9219bb4481bc35b8c62cc8d104a1a3
Parents: a19c513
Author: Paul King <pa...@asert.com.au>
Authored: Fri May 15 17:58:41 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Fri May 15 23:06:27 2015 +1000
----------------------------------------------------------------------
gradle/assemble.gradle | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/54080afd/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 9db3143..862c3ce 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -516,6 +516,7 @@ task syncDoc(type: Copy, dependsOn: doc) {
task distSrc(type: Zip) {
appendix = 'src'
+ classifier = 'incubating'
into("groovy-$version")
with srcSpec
}