Skip to content

Commit d7ee96d

Browse files
author
Craig Walls
committed
Merge branch 'master' of github.com:SpringSource/spring-social-facebook
2 parents f9df102 + ccc59cd commit d7ee96d

File tree

2 files changed

+28
-13
lines changed

2 files changed

+28
-13
lines changed

build.gradle

+16-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ buildscript {
77
classpath 'me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1'
88
classpath('org.asciidoctor:asciidoctor-gradle-plugin:0.7.0')
99
classpath('org.asciidoctor:asciidoctor-java-integration:0.1.4.preview.1')
10+
classpath 'org.springframework.build.gradle:spring-io-plugin:0.0.3.RELEASE'
1011
}
1112
}
1213

@@ -30,7 +31,9 @@ configure(allprojects - docProjects) {
3031

3132
sourceSets.test.resources.srcDirs = ['src/test/resources', 'src/test/java']
3233

33-
test.systemProperty("java.awt.headless", "true")
34+
tasks.withType(Test).all {
35+
systemProperty("java.awt.headless", "true")
36+
}
3437

3538
repositories {
3639
maven { url "http://repo.spring.io/libs-snapshot" }
@@ -72,6 +75,18 @@ configure(allprojects - docProjects) {
7275
configure(subprojects - docProjects) { subproject ->
7376
apply from: "${rootProject.projectDir}/publish-maven.gradle"
7477

78+
if (project.hasProperty('platformVersion')) {
79+
apply plugin: 'spring-io'
80+
81+
repositories {
82+
maven { url "https://repo.spring.io/libs-snapshot" }
83+
}
84+
85+
dependencies {
86+
springIoVersions "io.spring.platform:platform-versions:${platformVersion}@properties"
87+
}
88+
}
89+
7590
jar {
7691
manifest.attributes['Implementation-Title'] = subproject.name
7792
manifest.attributes['Implementation-Version'] = subproject.version

gradle.properties

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
version = 1.1.1.BUILD-SNAPSHOT
2-
springSocialVersion = 1.1.0.RELEASE
3-
hamcrestVersion = 1.3
4-
jacksonVersion = 2.3.2
5-
jspApiVersion = 2.2.1
6-
junitVersion = 4.11
7-
mockitoVersion = 1.9.5
8-
servletApiVersion = 3.0.1
9-
springSecurityCryptoVersion = 3.2.3.RELEASE
10-
springVersion = 4.0.3.RELEASE
11-
springReleaseVersion = latest.release
12-
springSnapshotVersion = latest.integration
1+
springSecurityCryptoVersion=3.2.3.RELEASE
2+
junitVersion=4.11
3+
springVersion=4.0.3.RELEASE
4+
springSocialVersion=1.1.0.RELEASE
5+
springSnapshotVersion=latest.integration
6+
hamcrestVersion=1.3
7+
version=1.1.2.BUILD-SNAPSHOT
8+
jacksonVersion=2.3.2
9+
jspApiVersion=2.2.1
10+
servletApiVersion=3.0.1
11+
springReleaseVersion=latest.release
12+
mockitoVersion=1.9.5

0 commit comments

Comments
 (0)