From 0c72623038cee349c3b6adafeb221e1a0f54c1c7 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Fri, 5 Apr 2013 14:30:56 -0500 Subject: [PATCH] HHH-8152 - General cleanup --- build.gradle | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index b81c176bb1..e73cc6eea7 100644 --- a/build.gradle +++ b/build.gradle @@ -4,10 +4,9 @@ apply from: "./libraries.gradle" allprojects { repositories { - mavenCentral() - mavenLocal() - - + mavenCentral() + mavenLocal() + mavenRepo name: 'jboss-nexus', url: "http://repository.jboss.org/nexus/content/groups/public/" mavenRepo name: "jboss-snapshots", url: "http://snapshots.jboss.org/maven2/" } @@ -15,10 +14,9 @@ allprojects { buildscript { repositories { - mavenCentral() - mavenLocal() - - + mavenCentral() + mavenLocal() + mavenRepo name: 'jboss-nexus', url: "http://repository.jboss.org/nexus/content/groups/public/" mavenRepo name: "jboss-snapshots", url: "http://snapshots.jboss.org/maven2/" } @@ -29,6 +27,11 @@ buildscript { ext.hibernateTargetVersion = '4.3.0-SNAPSHOT' +task wrapper(type: Wrapper) { + gradleVersion = '1.5' +} + + idea { project { languageLevel = '1.6' @@ -52,7 +55,6 @@ idea { } - subprojects { subProject -> apply plugin: 'idea' apply plugin: 'eclipse' @@ -97,6 +99,7 @@ subprojects { subProject -> // appropriately inject the common dependencies into each sub-project dependencies { compile( libraries.logging ) + testCompile( libraries.junit ) testCompile( libraries.byteman ) testCompile( libraries.byteman_install ) @@ -109,22 +112,28 @@ subprojects { subProject -> testRuntime( libraries.jcl ) testRuntime( libraries.javassist ) testRuntime( libraries.h2 ) + jbossLoggingTool( libraries.logging_processor ) + hibernateJpaModelGenTool( libraries.jpa_modelgen ) + jaxb( libraries.jaxb ){ exclude group: "javax.xml.stream" } jaxb( libraries.jaxb2_basics ) jaxb( libraries.jaxb2_ant ) + deployerJars "org.apache.maven.wagon:wagon-http:1.0" } + // mac-specific stuff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ext.toolsJar = file("${System.getProperty('java.home')}/../lib/tools.jar") if ( ext.toolsJar.exists() ) { dependencies{ testCompile files( toolsJar ) } } + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ task compile compile.dependsOn compileJava, compileTestJava @@ -233,8 +242,6 @@ subprojects { subProject -> maxHeapSize = "1024m" } - - processTestResources.doLast( { copy { from( sourceSets.test.java.srcDirs ) { @@ -349,13 +356,3 @@ subprojects { subProject -> } } - -// This is a task that generates the gradlew scripts, allowing users to run gradle without having gradle installed -// on their system. -// This task should be run by "build master" and the resulting output committed to source control. Its outputs include: -// 1) /gradlew which is the *NIX shell script for executing builds -// 2) /gradlew.bat which is the windows bat script for for executing builds -// 3) /wrapper which is a directory named by the "jarPath" config which contains other needed files. -task wrapper(type: Wrapper) { - gradleVersion = '1.5' -}