This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4791
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-4791 by this
push:
new 3274ee8 Reverted java.gradle bad formatting back to 2 spaces
3274ee8 is described below
commit 3274ee8edfda9c5b6c195981bcbf548db4b625e7
Author: Udo <ukohlme...@pivotal.io>
AuthorDate: Wed Mar 7 11:35:34 2018 -0800
Reverted java.gradle bad formatting back to 2 spaces
---
gradle/java.gradle | 146 ++++++++++++++++++++++++++---------------------------
1 file changed, 73 insertions(+), 73 deletions(-)
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 1ce4ea9..7f99604 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -16,97 +16,97 @@
*/
allprojects {
- apply plugin: 'java'
- sourceCompatibility = 1.8
- targetCompatibility = 1.8
- compileJava.options.encoding = 'UTF-8'
+ apply plugin: 'java'
+ sourceCompatibility = 1.8
+ targetCompatibility = 1.8
+ compileJava.options.encoding = 'UTF-8'
}
subprojects {
- apply plugin: 'java'
+ apply plugin: 'java'
- String javaVersion = System.properties['java.version']
- if (javaVersion.startsWith("1.8.0") &&
javaVersion.split("_")[1].toInteger() < 121) {
- throw new GradleException("Java version 1.8.0_121 or later required,
but was " + javaVersion)
+ String javaVersion = System.properties['java.version']
+ if (javaVersion.startsWith("1.8.0") && javaVersion.split("_")[1].toInteger()
< 121) {
+ throw new GradleException("Java version 1.8.0_121 or later required, but
was " + javaVersion)
+ }
+
+ // apply compiler options
+ gradle.taskGraph.whenReady({ graph ->
+ tasks.withType(JavaCompile).each { javac ->
+ javac.configure {
+ sourceCompatibility '1.8'
+ targetCompatibility '1.8'
+ options.encoding = 'UTF-8'
+ }
}
+ })
- // apply compiler options
- gradle.taskGraph.whenReady({ graph ->
- tasks.withType(JavaCompile).each { javac ->
- javac.configure {
- sourceCompatibility '1.8'
- targetCompatibility '1.8'
- options.encoding = 'UTF-8'
- }
- }
- })
-
- // apply default manifest
- gradle.taskGraph.whenReady({ graph ->
- tasks.withType(Jar).each { jar ->
- jar.doFirst {
- manifest {
- attributes(
- "Manifest-Version": "1.0",
- "Created-By": System.getProperty("user.name"),
- "Title": rootProject.name,
- "Version": version,
- "Organization": productOrg
- )
- }
- }
- jar.metaInf {
- from("$rootDir/LICENSE")
- if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
- from("$rootDir/NOTICE")
- }
- }
+ // apply default manifest
+ gradle.taskGraph.whenReady({ graph ->
+ tasks.withType(Jar).each { jar ->
+ jar.doFirst {
+ manifest {
+ attributes(
+ "Manifest-Version": "1.0",
+ "Created-By": System.getProperty("user.name"),
+ "Title": rootProject.name,
+ "Version": version,
+ "Organization": productOrg
+ )
}
- })
-
- configurations {
- provided {
- description 'a dependency that is provided externally at runtime'
- visible true
- }
-
- testOutput {
- extendsFrom testCompile
- description 'a dependency that exposes test artifacts'
+ }
+ jar.metaInf {
+ from("$rootDir/LICENSE")
+ if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
+ from("$rootDir/NOTICE")
}
+ }
}
+ })
- // This ensures that javadoc and source jars also have any prefix paths
stripped and will
- // be created as libs/foo-sources.jar instead of
libs/extensions/foo-sources.jar for example.
- tasks.all { task ->
- if (task instanceof Jar) {
- baseName = sanitizedName()
- }
+ configurations {
+ provided {
+ description 'a dependency that is provided externally at runtime'
+ visible true
}
- task jarTest(type: Jar, dependsOn: testClasses) {
- description 'Assembles a jar archive of test classes.'
- from sourceSets.test.output
- classifier 'test'
+ testOutput {
+ extendsFrom testCompile
+ description 'a dependency that exposes test artifacts'
}
+ }
- artifacts {
- testOutput jarTest
+ // This ensures that javadoc and source jars also have any prefix paths
stripped and will
+ // be created as libs/foo-sources.jar instead of
libs/extensions/foo-sources.jar for example.
+ tasks.all { task ->
+ if (task instanceof Jar) {
+ baseName = sanitizedName()
}
+ }
- sourceSets {
- main.compileClasspath += configurations.provided
- main.runtimeClasspath -= configurations.provided
- test.compileClasspath += configurations.provided
- test.runtimeClasspath += configurations.provided
- }
+ task jarTest(type: Jar, dependsOn: testClasses) {
+ description 'Assembles a jar archive of test classes.'
+ from sourceSets.test.output
+ classifier 'test'
+ }
- javadoc.classpath += configurations.provided
+ artifacts {
+ testOutput jarTest
+ }
- javadoc {
- options.addStringOption('Xdoclint:none', '-quiet')
- options.encoding = 'UTF-8'
- }
+ sourceSets {
+ main.compileClasspath += configurations.provided
+ main.runtimeClasspath -= configurations.provided
+ test.compileClasspath += configurations.provided
+ test.runtimeClasspath += configurations.provided
+ }
+
+ javadoc.classpath += configurations.provided
+
+ javadoc {
+ options.addStringOption('Xdoclint:none', '-quiet')
+ options.encoding = 'UTF-8'
+ }
}
--
To stop receiving notification emails like this one, please contact
u...@apache.org.
