forked from grails/grails-core
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
47 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,21 +2,19 @@ import org.apache.tools.ant.filters.ReplaceTokens | |
|
|
||
| buildscript { | ||
| repositories { | ||
| maven { url "https://repo.grails.org/grails/core" } | ||
| jcenter() | ||
| } | ||
| dependencies { | ||
| classpath "commons-io:commons-io:2.2" | ||
| classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1" | ||
| classpath "com.netflix.nebula:gradle-extra-configurations-plugin:2.2.0" | ||
| classpath "com.github.adrianbk:gradle-travisci-trigger-plugin:1.0.0" | ||
| } | ||
| } | ||
|
|
||
| apply plugin: 'idea' | ||
|
|
||
| ext.optionalDeps = [] | ||
| ext.providedDeps = [] | ||
|
|
||
| ext.provided = { providedDeps << it } | ||
| ext { | ||
| bintrayPublish = false | ||
| grailsVersion = '3.0.0.BUILD-SNAPSHOT' | ||
|
|
@@ -51,6 +49,7 @@ ext { | |
| cglibVersion = "2.2.2" | ||
| objenesisVersion = "1.4" | ||
| tomcatVersion = "7.0.55" | ||
| servletApiVersion = "3.0.1" | ||
|
|
||
| isJava8Compatible = org.gradle.api.JavaVersion.current().isJava8Compatible() | ||
| } | ||
|
|
@@ -152,11 +151,28 @@ subprojects { project -> | |
| apply plugin: 'eclipse' | ||
| apply plugin: 'idea' | ||
| apply plugin: 'project-report' | ||
| apply plugin: 'provided-base' | ||
| apply plugin: 'optional-base' | ||
|
|
||
| sourceCompatibility = "1.7" | ||
| targetCompatibility = "1.7" | ||
|
|
||
| if(project.name =~ /^(grails-web|grails-plugin-|grails-project-api|grails-test-suite|grails-test)/) { | ||
| dependencies { | ||
| provided "javax.servlet:javax.servlet-api:$servletApiVersion" | ||
| // MockHttpServletRequest/Response/Context used in many classes | ||
| provided("org.springframework:spring-test:${springVersion}") { | ||
| exclude group: 'commons-logging', module:'commons-logging' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if(project.name =~ /^(grails-plugin-datasource|grails-test-suite)/) { | ||
| dependencies { | ||
| provided 'hsqldb:hsqldb:1.8.0.10' | ||
| provided 'com.h2database:h2:1.3.176' | ||
| } | ||
| } | ||
|
|
||
| jar{ | ||
| manifest.mainAttributes( | ||
|
|
@@ -340,20 +356,6 @@ subprojects { project -> | |
|
|
||
| pom.withXml { | ||
| def xml = asNode() | ||
| // respect 'optional' and 'provided' dependencies | ||
| optionalDeps.each { dep -> | ||
| xml.dependencies.find { it.artifactId == dep.name }?.optional = true | ||
| } | ||
| providedDeps.each { dep -> | ||
| xml.dependencies.find { it.artifactId == dep.name }?.scope = 'provided' | ||
|
|
||
| } | ||
|
|
||
| configurations.runtime.allDependencies.each { dependency -> | ||
| if (dependency.hasProperty("notInPom") && dependency.notInPom) { | ||
| xml.dependencies.removeAll { it.groupId == dependency.group && it.artifactId == dependency.name } | ||
| } | ||
| } | ||
|
|
||
| xml.children().last() + { | ||
| delegate.name 'Grails' | ||
|
|
@@ -374,8 +376,6 @@ subprojects { project -> | |
| delegate.developerConnection 'scm:[email protected]:grails/grails-core.git' | ||
| } | ||
|
|
||
|
|
||
|
|
||
| delegate.developers { | ||
| delegate.developer { | ||
| delegate.id 'graemerocher' | ||
|
|
@@ -386,8 +386,8 @@ subprojects { project -> | |
| delegate.name 'Jeff Brown' | ||
| } | ||
| delegate.developer { | ||
| delegate.id 'burtbeckwith' | ||
| delegate.name 'Burt Beckwith' | ||
| delegate.id 'lhotari' | ||
| delegate.name 'Lari Hotari' | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -478,4 +478,4 @@ tciTrigger { | |
| task wrapper(type: Wrapper) { | ||
| gradleVersion = '2.3' | ||
| jarFile = 'gradle/wrapper/gradle-wrapper.jar' | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| dependencies { | ||
| compile 'javax.servlet:javax.servlet-api:3.0.1', provided | ||
| compile 'javax:javaee-web-api:6.0', provided | ||
| provided "javax.servlet:javax.servlet-api:$servletApiVersion" | ||
| provided 'javax:javaee-web-api:6.0' | ||
| compile project(':grails-plugin-controllers'), project(':grails-plugin-events') | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,9 @@ | ||
| configurations { | ||
| optional | ||
| } | ||
| dependencies { | ||
| compile "commons-lang:commons-lang:$commonsLangVersion" | ||
| compile( "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:${concurrentlinkedhashmapVersion}" ) { | ||
| exclude group: 'commons-logging', module:'commons-logging' | ||
| } | ||
|
|
||
| compile project(":grails-web"), project(":grails-plugin-controllers"), project(":grails-validation") | ||
| optional "junit:junit:${junitVersion}" | ||
| provided "junit:junit:${junitVersion}" | ||
| } | ||
| sourceSets { | ||
| main { | ||
| compileClasspath += files(configurations.optional) | ||
| } | ||
| test { | ||
| runtimeClasspath += files(configurations.optional) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters