Repository: incubator-samza Updated Branches: refs/heads/master 5aef56f4c -> c06d8cda4
SAMZA-351; rename environment.gradle to customize.gradle and move it to the bottom of the list Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/c06d8cda Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/c06d8cda Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/c06d8cda Branch: refs/heads/master Commit: c06d8cda4d4ff0cefda2bb07a6b1e8b4d4a6fe2a Parents: 5aef56f Author: Chris Riccomini <[email protected]> Authored: Wed Jul 23 13:57:39 2014 -0700 Committer: Chris Riccomini <[email protected]> Committed: Wed Jul 23 13:57:39 2014 -0700 ---------------------------------------------------------------------- build.gradle | 2 +- gradle/customize.gradle | 32 ++++++++++++++++++++++++++++++++ gradle/environment.gradle | 32 -------------------------------- 3 files changed, 33 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/c06d8cda/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index b201f77..d1ee5e8 100644 --- a/build.gradle +++ b/build.gradle @@ -36,11 +36,11 @@ allprojects { } } -apply from: file('gradle/environment.gradle') apply from: file("gradle/dependency-versions.gradle") apply from: file("gradle/dependency-versions-scala-" + scalaVersion + ".gradle") apply from: file("gradle/release.gradle") apply from: file("gradle/rat.gradle") +apply from: file('gradle/customize.gradle') rat { excludes = [ http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/c06d8cda/gradle/customize.gradle ---------------------------------------------------------------------- diff --git a/gradle/customize.gradle b/gradle/customize.gradle new file mode 100644 index 0000000..bcc21b8 --- /dev/null +++ b/gradle/customize.gradle @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/* + * This script allows the Gradle environment to be overridden with custom + * settings. This is useful in environments (such as a private company) where a + * third party wishes to use custom repositories, or inject certain + * functionality into the default Gradle build lifecycle. + */ + +if(!project.hasProperty('overrideBuildEnvironment')) { + // If overrideBuildEnvironment is not set, then just use the default environment. + apply from: file('gradle/maven.gradle') +} else { + // Otherwise, assume overrideBuildEnvironment defines a path to a file, and apply it. + apply from: project.overrideBuildEnvironment +} http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/c06d8cda/gradle/environment.gradle ---------------------------------------------------------------------- diff --git a/gradle/environment.gradle b/gradle/environment.gradle deleted file mode 100644 index bcc21b8..0000000 --- a/gradle/environment.gradle +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * This script allows the Gradle environment to be overridden with custom - * settings. This is useful in environments (such as a private company) where a - * third party wishes to use custom repositories, or inject certain - * functionality into the default Gradle build lifecycle. - */ - -if(!project.hasProperty('overrideBuildEnvironment')) { - // If overrideBuildEnvironment is not set, then just use the default environment. - apply from: file('gradle/maven.gradle') -} else { - // Otherwise, assume overrideBuildEnvironment defines a path to a file, and apply it. - apply from: project.overrideBuildEnvironment -}
