Author: hlship
Date: Wed Jan 4 23:46:52 2012
New Revision: 1227401
URL: http://svn.apache.org/viewvc?rev=1227401&view=rev
Log:
Initial work moving up to Gradle 1.0-m-6
Modified:
tapestry/tapestry5/trunk/build.gradle
tapestry/tapestry5/trunk/quickstart/build.gradle
tapestry/tapestry5/trunk/quickstart/filtered/archetype-resources/build.gradle
tapestry/tapestry5/trunk/tapestry-jpa/build.gradle
tapestry/tapestry5/trunk/tapestry-kaptcha/build.gradle
Modified: tapestry/tapestry5/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1227401&r1=1227400&r2=1227401&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/build.gradle (original)
+++ tapestry/tapestry5/trunk/build.gradle Wed Jan 4 23:46:52 2012
@@ -18,34 +18,29 @@ snapshotUrl = "https://repository.apache
doSign = !project.hasProperty('noSign') && project.hasProperty("signing.keyId")
-buildscript {
- repositories {
- mavenLocal()
- mavenRepo name: "Gradle", urls:
"http://repo.gradle.org/gradle/plugins-snapshots/";
- }
- dependencies {
- classpath "org.gradle.plugins:gradle-signing-plugin:0.0.1-SNAPSHOT"
- }
-}
-
allprojects {
apply plugin: 'eclipse'
apply plugin: 'idea'
- ideaProject {
- javaVersion = 1.5
- beforeConfigured { project ->
- project.modulePaths.clear()
- }
- }
-
repositories {
mavenCentral()
- // All things JBoss/Javassist/Hibernate
- mavenRepo urls:
"https://repository.jboss.org/nexus/content/repositories/releases/";
+ // All things JBoss/Hibernate
+ mavenRepo name: "JBoss", url:
"https://repository.jboss.org/nexus/content/repositories/releases/";
+ }
+
+ idea {
+ project {
+ jdkName = "1.5"
+ }
}
+
+// idea.project.ipr {
+// beforeMerged { project -> project.modulePaths.clear() }
+// }
+
+
}
subprojects {
@@ -81,7 +76,7 @@ subprojects {
}
}
- ideaModule {
+ idea.module {
scopes.PROVIDED.plus += configurations.provided
}
@@ -208,7 +203,7 @@ task aggregateJavadoc(type: Javadoc, gro
stylesheetFile = new File(projectDir, 'src/javadoc/stylesheet.css')
windowTitle = 'Tapestry API Documentation'
docTitle = "Tapestry JavaDoc ($project.version)"
- bottom = "Copyright © 2003-2011 <a
href=\"http://tapestry.apache.org\";>The Apache Software Foundation</a>."
+ bottom = "Copyright © 2003-2012 <a
href=\"http://tapestry.apache.org\";>The Apache Software Foundation</a>."
use = true
links = ['http://download.oracle.com/javase/6/docs/api/',
'http://download.oracle.com/javaee/6/api/']
addStringOption "tagletpath", configurations.javadoc.asPath
@@ -216,12 +211,12 @@ task aggregateJavadoc(type: Javadoc, gro
exclude "org/apache/tapestry5/internal/plastic/asm/**"
}
- subprojects.findAll({ sp -> sp.name != "quickstart" }).each { sp ->
- sp.sourceSets.all.findAll { set -> set.name != "test" }.each { set ->
+ subprojects.each({ sp -> sp.name != "quickstart" }).each { sp ->
+ sp.sourceSets.find { set -> set.name != "test" }.each { set ->
source set.java
- classpath += set.classes + set.compileClasspath
+ classpath += set.output + set.compileClasspath
// Some of the component .xdoc files refer to PNG images
// (we could also exclude .java and .xdoc)
@@ -253,7 +248,7 @@ task generateRelease(dependsOn: ['quicks
description: "Generates and uploads a final release to Apache Nexus")
task wrapper(type: Wrapper) {
- gradleVersion = '1.0-milestone-3'
+ gradleVersion = '1.0-milestone-6'
description = "Regenerates the Gradle Wrapper files"
}
Modified: tapestry/tapestry5/trunk/quickstart/build.gradle
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/build.gradle?rev=1227401&r1=1227400&r2=1227401&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/build.gradle (original)
+++ tapestry/tapestry5/trunk/quickstart/build.gradle Wed Jan 4 23:46:52 2012
@@ -7,10 +7,10 @@ task processFiltered(type: Copy) {
inputs.file srcDir
inputs.file file("../build.gradle")
- outputs.dir sourceSets.main.classesDir
+ outputs.dir sourceSets.main.output.classesDir
from srcDir
- into sourceSets.main.classesDir
+ into sourceSets.main.output.classesDir
// Use some of the filters provided by Ant
filter(FixCrLfFilter)
Modified:
tapestry/tapestry5/trunk/quickstart/filtered/archetype-resources/build.gradle
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/filtered/archetype-resources/build.gradle?rev=1227401&r1=1227400&r2=1227401&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/quickstart/filtered/archetype-resources/build.gradle
(original)
+++
tapestry/tapestry5/trunk/quickstart/filtered/archetype-resources/build.gradle
Wed Jan 4 23:46:52 2012
@@ -13,17 +13,17 @@ version = "${version}"
repositories {
mavenCentral()
- // All things JBoss/Javassist/Hibernate
- mavenRepo urls: "http://repository.jboss.org/nexus/content/groups/public/";
+ // All things JBoss/Hibernate
+ mavenRepo name: "JBoss", url:
"http://repository.jboss.org/nexus/content/groups/public/";
// For stable versions of the tapx libraries
- mavenRepo urls: "http://howardlewisship.com/repository/";
+ mavenRepo name: "HLS", url: "http://howardlewisship.com/repository/";
// For non-stable versions of the tapx libraries
- mavenRepo urls: "http://howardlewisship.com/snapshot-repository/";
+ mavenRepo name: "HLS Snapshots", url:
"http://howardlewisship.com/snapshot-repository/";
// For access to Apache Staging (Preview) packages
- mavenRepo urls: "https://repository.apache.org/content/groups/staging";
+ mavenRepo name: "Apache Staging", url:
"https://repository.apache.org/content/groups/staging";
}
// This simulates Maven's "provided" scope, until it is officially supported
by Gradle
Modified: tapestry/tapestry5/trunk/tapestry-jpa/build.gradle
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/build.gradle?rev=1227401&r1=1227400&r2=1227401&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/build.gradle (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/build.gradle Wed Jan 4 23:46:52 2012
@@ -13,7 +13,7 @@ dependencies {
}
repositories {
- mavenRepo urls: "http://download.eclipse.org/rt/eclipselink/maven.repo/";
+ mavenRepo name: "EclipseLink", url:
"http://download.eclipse.org/rt/eclipselink/maven.repo/";
}
test {
Modified: tapestry/tapestry5/trunk/tapestry-kaptcha/build.gradle
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-kaptcha/build.gradle?rev=1227401&r1=1227400&r2=1227401&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-kaptcha/build.gradle (original)
+++ tapestry/tapestry5/trunk/tapestry-kaptcha/build.gradle Wed Jan 4 23:46:52
2012
@@ -8,7 +8,7 @@ dependencies {
}
repositories {
- mavenRepo urls: "http://howardlewisship.com/repository/";
+ mavenRepo name: "HLS", url: "http://howardlewisship.com/repository/";
}
jar {
