You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2011/10/13 01:55:58 UTC
svn commit: r1182621 - in /tapestry/tapestry5/trunk: build.gradle
quickstart/build.gradle
Author: hlship
Date: Wed Oct 12 23:55:57 2011
New Revision: 1182621
URL: http://svn.apache.org/viewvc?rev=1182621&view=rev
Log:
TAP5-1682: Fiddle with the build to try and get the quickstart archetype building correctly
Modified:
tapestry/tapestry5/trunk/build.gradle
tapestry/tapestry5/trunk/quickstart/build.gradle
Modified: tapestry/tapestry5/trunk/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1182621&r1=1182620&r2=1182621&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/build.gradle (original)
+++ tapestry/tapestry5/trunk/build.gradle Wed Oct 12 23:55:57 2011
@@ -2,7 +2,7 @@ description = "Apache Tapestry 5 Project
// Remember that when generating a release, this should be incremented. Also don't forget to
// tag the release in Subversion.
-tapestryVersion = "5.3-beta-19"
+tapestryVersion = "5.3-beta-20"
jettyVersion = '7.0.0.v20091005'
tomcatVersion = '6.0.30'
@@ -51,20 +51,6 @@ allprojects {
subprojects {
version = parent.version
- apply plugin: 'java'
- apply plugin: 'groovy' // mostly for testing
- apply plugin: 'maven'
- apply plugin: 'project-report'
-
- sourceCompatibility = '1.5'
- targetCompatibility = '1.5'
-
- // This may be temporary, to help track down/verify the ProQuest production deployment
- // issue.
- compileJava {
- debug = false
- }
-
group = 'org.apache.tapestry'
configurations {
@@ -73,56 +59,71 @@ subprojects {
// meta -- non-code artifacts, such as sources and javadoc JARs
meta
-
- // published -- what gets uploaded to the Nexus repository
- published.extendsFrom archives, meta
- if (doSign)
- { published.extendsFrom signatures }
}
- // See http://jira.codehaus.org/browse/GRADLE-784
+ if (name != "quickstart")
+ {
+ apply plugin: 'java'
+ apply plugin: 'groovy' // mostly for testing
+ apply plugin: 'maven'
+ apply plugin: 'project-report'
+
+ sourceCompatibility = '1.5'
+ targetCompatibility = '1.5'
+
+ // See http://jira.codehaus.org/browse/GRADLE-784
+
+ sourceSets {
+ main {
+ compileClasspath += configurations.provided
+ }
+ test {
+ compileClasspath += configurations.provided
+ runtimeClasspath += configurations.provided
+ }
+ }
- sourceSets {
- main {
- compileClasspath += configurations.provided
+ ideaModule {
+ scopes.PROVIDED.plus += configurations.provided
}
- test {
- compileClasspath += configurations.provided
- runtimeClasspath += configurations.provided
+
+ dependencies {
+ groovy "org.codehaus.groovy:groovy-all:1.7.4"
+
+ deployerJars "org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6"
}
- }
- ideaModule {
- scopes.PROVIDED.plus += configurations.provided
- }
+ test {
+ useTestNG()
- dependencies {
- groovy "org.codehaus.groovy:groovy-all:1.7.4"
+ options.suites("src/test/conf/testng.xml")
- deployerJars "org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6"
- }
+ maxHeapSize = "400M"
- test {
- useTestNG()
+ // Turn off live service reloading
- options.suites("src/test/conf/testng.xml")
+ systemProperties["tapestry.service-reloading-enabled"] = "false"
- maxHeapSize = "400M"
+ jvmArgs("-XX:MaxPermSize=512m")
+ }
- // Turn off live service reloading
+ task sourcesJar(type: Jar, dependsOn: classes) {
+ classifier = 'sources'
+ from sourceSets.main.allSource
+ }
- systemProperties["tapestry.service-reloading-enabled"] = "false"
+ artifacts {
+ meta sourcesJar
+ }
- jvmArgs("-XX:MaxPermSize=512m")
}
- task sourcesJar(type: Jar, dependsOn: classes) {
- classifier = 'sources'
- from sourceSets.main.allSource
- }
+ configurations {
+ // published -- what gets uploaded to the Nexus repository
+ published.extendsFrom archives, meta
- artifacts {
- meta sourcesJar
+ if (doSign)
+ { published.extendsFrom signatures }
}
if (doSign)
@@ -139,7 +140,7 @@ subprojects {
deployPasswordProperty = isSnapshot() ? "snapshotDeployPassword" : "apacheDeployPassword"
canDeploy = [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
- uploadPublished {
+ task uploadPublished {
doFirst {
if (!canDeploy)
@@ -217,7 +218,7 @@ task aggregateJavadoc(type: Javadoc, gro
exclude "org/apache/tapestry5/internal/plastic/asm/**"
}
- subprojects.each { sp ->
+ subprojects.findAll({ sp -> sp.name != "quickstart" }).each { sp ->
sp.sourceSets.all.findAll { set -> set.name != "test" }.each { set ->
source set.java
Modified: tapestry/tapestry5/trunk/quickstart/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/build.gradle?rev=1182621&r1=1182620&r2=1182621&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/build.gradle (original)
+++ tapestry/tapestry5/trunk/quickstart/build.gradle Wed Oct 12 23:55:57 2011
@@ -39,7 +39,7 @@ task generateArchetype(type: Copy) {
}
-task archetype(type: Jar, dependsOn: 'generateArchetype') {
+task build(type: Jar, dependsOn: 'generateArchetype') {
description = "Creates a the JAR archive for the quickstart archetype"
group = "Release artifact"
@@ -50,3 +50,7 @@ task archetype(type: Jar, dependsOn: 'ge
from generatedDir
}
+
+artifacts {
+ archives build
+}