HHH-8152 - General cleanup
This commit is contained in:
parent
4213e3c13a
commit
0c72623038
27
build.gradle
27
build.gradle
|
@ -7,7 +7,6 @@ allprojects {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
|
|
||||||
|
|
||||||
mavenRepo name: 'jboss-nexus', url: "http://repository.jboss.org/nexus/content/groups/public/"
|
mavenRepo name: 'jboss-nexus', url: "http://repository.jboss.org/nexus/content/groups/public/"
|
||||||
mavenRepo name: "jboss-snapshots", url: "http://snapshots.jboss.org/maven2/"
|
mavenRepo name: "jboss-snapshots", url: "http://snapshots.jboss.org/maven2/"
|
||||||
}
|
}
|
||||||
|
@ -18,7 +17,6 @@ buildscript {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
|
|
||||||
|
|
||||||
mavenRepo name: 'jboss-nexus', url: "http://repository.jboss.org/nexus/content/groups/public/"
|
mavenRepo name: 'jboss-nexus', url: "http://repository.jboss.org/nexus/content/groups/public/"
|
||||||
mavenRepo name: "jboss-snapshots", url: "http://snapshots.jboss.org/maven2/"
|
mavenRepo name: "jboss-snapshots", url: "http://snapshots.jboss.org/maven2/"
|
||||||
}
|
}
|
||||||
|
@ -29,6 +27,11 @@ buildscript {
|
||||||
|
|
||||||
ext.hibernateTargetVersion = '4.3.0-SNAPSHOT'
|
ext.hibernateTargetVersion = '4.3.0-SNAPSHOT'
|
||||||
|
|
||||||
|
task wrapper(type: Wrapper) {
|
||||||
|
gradleVersion = '1.5'
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
idea {
|
idea {
|
||||||
project {
|
project {
|
||||||
languageLevel = '1.6'
|
languageLevel = '1.6'
|
||||||
|
@ -52,7 +55,6 @@ idea {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
subprojects { subProject ->
|
subprojects { subProject ->
|
||||||
apply plugin: 'idea'
|
apply plugin: 'idea'
|
||||||
apply plugin: 'eclipse'
|
apply plugin: 'eclipse'
|
||||||
|
@ -97,6 +99,7 @@ subprojects { subProject ->
|
||||||
// appropriately inject the common dependencies into each sub-project
|
// appropriately inject the common dependencies into each sub-project
|
||||||
dependencies {
|
dependencies {
|
||||||
compile( libraries.logging )
|
compile( libraries.logging )
|
||||||
|
|
||||||
testCompile( libraries.junit )
|
testCompile( libraries.junit )
|
||||||
testCompile( libraries.byteman )
|
testCompile( libraries.byteman )
|
||||||
testCompile( libraries.byteman_install )
|
testCompile( libraries.byteman_install )
|
||||||
|
@ -109,22 +112,28 @@ subprojects { subProject ->
|
||||||
testRuntime( libraries.jcl )
|
testRuntime( libraries.jcl )
|
||||||
testRuntime( libraries.javassist )
|
testRuntime( libraries.javassist )
|
||||||
testRuntime( libraries.h2 )
|
testRuntime( libraries.h2 )
|
||||||
|
|
||||||
jbossLoggingTool( libraries.logging_processor )
|
jbossLoggingTool( libraries.logging_processor )
|
||||||
|
|
||||||
hibernateJpaModelGenTool( libraries.jpa_modelgen )
|
hibernateJpaModelGenTool( libraries.jpa_modelgen )
|
||||||
|
|
||||||
jaxb( libraries.jaxb ){
|
jaxb( libraries.jaxb ){
|
||||||
exclude group: "javax.xml.stream"
|
exclude group: "javax.xml.stream"
|
||||||
}
|
}
|
||||||
jaxb( libraries.jaxb2_basics )
|
jaxb( libraries.jaxb2_basics )
|
||||||
jaxb( libraries.jaxb2_ant )
|
jaxb( libraries.jaxb2_ant )
|
||||||
|
|
||||||
deployerJars "org.apache.maven.wagon:wagon-http:1.0"
|
deployerJars "org.apache.maven.wagon:wagon-http:1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// mac-specific stuff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
ext.toolsJar = file("${System.getProperty('java.home')}/../lib/tools.jar")
|
ext.toolsJar = file("${System.getProperty('java.home')}/../lib/tools.jar")
|
||||||
if ( ext.toolsJar.exists() ) {
|
if ( ext.toolsJar.exists() ) {
|
||||||
dependencies{
|
dependencies{
|
||||||
testCompile files( toolsJar )
|
testCompile files( toolsJar )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
task compile
|
task compile
|
||||||
compile.dependsOn compileJava, compileTestJava
|
compile.dependsOn compileJava, compileTestJava
|
||||||
|
@ -233,8 +242,6 @@ subprojects { subProject ->
|
||||||
maxHeapSize = "1024m"
|
maxHeapSize = "1024m"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
processTestResources.doLast( {
|
processTestResources.doLast( {
|
||||||
copy {
|
copy {
|
||||||
from( sourceSets.test.java.srcDirs ) {
|
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'
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue