You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by ad...@apache.org on 2017/10/19 18:30:12 UTC
[1/2] kudu git commit: [java] Upgrade to the latest gradle version
Repository: kudu
Updated Branches:
refs/heads/master 43a64f8bf -> d33075ebc
[java] Upgrade to the latest gradle version
Change-Id: I91e46f7a303ae8a714f6340c75f17dcdb198e3c0
Reviewed-on: http://gerrit.cloudera.org:8080/8331
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Adar Dembo <ad...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/edb5ae3c
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/edb5ae3c
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/edb5ae3c
Branch: refs/heads/master
Commit: edb5ae3c955fece83a079d0161ab92e03404308a
Parents: 43a64f8
Author: Grant Henke <gr...@gmail.com>
Authored: Thu Oct 19 09:15:35 2017 -0500
Committer: Adar Dembo <ad...@cloudera.com>
Committed: Thu Oct 19 18:29:54 2017 +0000
----------------------------------------------------------------------
java/gradle/dependencies.gradle | 2 +-
java/gradlew | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/edb5ae3c/java/gradle/dependencies.gradle
----------------------------------------------------------------------
diff --git a/java/gradle/dependencies.gradle b/java/gradle/dependencies.gradle
index 0a296d7..5954018 100755
--- a/java/gradle/dependencies.gradle
+++ b/java/gradle/dependencies.gradle
@@ -32,7 +32,7 @@ versions += [
commonsIo : "2.5",
findbugs : "3.0.1",
flume : "1.7.0",
- gradle : "4.1",
+ gradle : "4.2.1",
guava : "20.0",
hadoop : "2.8.1",
hamcrest : "1.3",
http://git-wip-us.apache.org/repos/asf/kudu/blob/edb5ae3c/java/gradlew
----------------------------------------------------------------------
diff --git a/java/gradlew b/java/gradlew
index 0ff8b29..8c9dd31 100755
--- a/java/gradlew
+++ b/java/gradlew
@@ -81,10 +81,10 @@ esac
mkdir -p $APP_HOME/gradle/wrapper
if [ ! -e $APP_HOME/gradle/wrapper/gradle-wrapper.jar ]; then
- curl -o $APP_HOME/gradle/wrapper/gradle-wrapper.jar https://raw.githubusercontent.com/gradle/gradle/v4.1.0/gradle/wrapper/gradle-wrapper.jar
+ curl -o $APP_HOME/gradle/wrapper/gradle-wrapper.jar https://raw.githubusercontent.com/gradle/gradle/v4.2.1/gradle/wrapper/gradle-wrapper.jar
fi
if [ ! -e $APP_HOME/gradle/wrapper/gradle-wrapper.properties ]; then
- curl -o $APP_HOME/gradle/wrapper/gradle-wrapper.properties https://raw.githubusercontent.com/gradle/gradle/v4.1.0/gradle/wrapper/gradle-wrapper.properties
+ curl -o $APP_HOME/gradle/wrapper/gradle-wrapper.properties https://raw.githubusercontent.com/gradle/gradle/v4.2.1/gradle/wrapper/gradle-wrapper.properties
fi
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
[2/2] kudu git commit: [java] Convert Gradle to new buildSrc style
layout
Posted by ad...@apache.org.
[java] Convert Gradle to new buildSrc style layout
Currently we use a buildscript.gradle file to add plugins and code
to the build. However, a newer way to do this has been added in
newer Gradle versions and this allows for more flexible and
predictable behavior of the Gradle build plugins and classpath.
See details here:
https://docs.gradle.org/current/userguide/organizing_build_logic.html#sec:build_sources
Change-Id: If23f8178ccff67f3c5ee12f82ac37db9999dfbad
Reviewed-on: http://gerrit.cloudera.org:8080/8332
Tested-by: Kudu Jenkins
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/d33075eb
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/d33075eb
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/d33075eb
Branch: refs/heads/master
Commit: d33075ebc798999c9fe6ed546ad8426e97e3ff7f
Parents: edb5ae3
Author: Grant Henke <gr...@gmail.com>
Authored: Thu Oct 19 09:23:16 2017 -0500
Committer: Adar Dembo <ad...@cloudera.com>
Committed: Thu Oct 19 18:29:55 2017 +0000
----------------------------------------------------------------------
java/build.gradle | 3 ---
java/buildSrc/build.gradle | 38 +++++++++++++++++++++++++++++++++++++
java/gradle/buildscript.gradle | 38 -------------------------------------
3 files changed, 38 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/d33075eb/java/build.gradle
----------------------------------------------------------------------
diff --git a/java/build.gradle b/java/build.gradle
index 6bd21fc..51fb517 100755
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -18,9 +18,6 @@
// This file is the entry-point for the gradle build and contains
// common logic for the various subprojects in the build.
-// Load the buildscript file to apply dependencies needed for the gradle build itself.
-buildscript { apply from: file("gradle/buildscript.gradle"), to: buildscript }
-
// Plugins and scripts applied at the root level only, instead of per module.
apply plugin: "idea"
apply plugin: "eclipse"
http://git-wip-us.apache.org/repos/asf/kudu/blob/d33075eb/java/buildSrc/build.gradle
----------------------------------------------------------------------
diff --git a/java/buildSrc/build.gradle b/java/buildSrc/build.gradle
new file mode 100644
index 0000000..9ab7892
--- /dev/null
+++ b/java/buildSrc/build.gradle
@@ -0,0 +1,38 @@
+// 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 file contains the dependencies required for the gradle build itself.
+
+repositories {
+ mavenCentral()
+ jcenter()
+ maven { url "http://clojars.org/repo" } // Only used for the clojure plugin below.
+ maven { url "http://repo.spring.io/plugins-release" } // Only used for the propdeps plugin below.
+ maven { url "https://plugins.gradle.org/m2/" }
+}
+
+// Manage plugin dependencies since the plugin block can't be used in included build scripts yet.
+// For more details see: https://docs.gradle.org/current/userguide/plugins.html#plugins_dsl_limitations
+dependencies {
+ compile "com.commercehub.gradle.plugin:gradle-avro-plugin:0.9.0"
+ compile "com.github.ben-manes:gradle-versions-plugin:0.15.0"
+ compile "com.github.jengelman.gradle.plugins:shadow:2.0.1"
+ compile "com.google.protobuf:protobuf-gradle-plugin:0.8.2"
+ compile "com.netflix.nebula:nebula-clojure-plugin:4.1.0"
+ compile "io.spring.gradle:propdeps-plugin:0.0.9.RELEASE"
+ compile "ru.vyarus:gradle-animalsniffer-plugin:1.4.2"
+}
http://git-wip-us.apache.org/repos/asf/kudu/blob/d33075eb/java/gradle/buildscript.gradle
----------------------------------------------------------------------
diff --git a/java/gradle/buildscript.gradle b/java/gradle/buildscript.gradle
deleted file mode 100644
index 89827b3..0000000
--- a/java/gradle/buildscript.gradle
+++ /dev/null
@@ -1,38 +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 file contains the dependencies required for the gradle build itself.
-
-repositories {
- mavenCentral()
- jcenter()
- maven { url "http://clojars.org/repo" } // Only used for the clojure plugin below.
- maven { url "http://repo.spring.io/plugins-release" } // Only used for the propdeps plugin below.
- maven { url "https://plugins.gradle.org/m2/" }
-}
-
-// Manage plugin dependencies since the plugin block can't be used in included build scripts yet.
-// For more details see: https://docs.gradle.org/current/userguide/plugins.html#plugins_dsl_limitations
-dependencies {
- classpath "com.commercehub.gradle.plugin:gradle-avro-plugin:0.9.0"
- classpath "com.github.ben-manes:gradle-versions-plugin:0.15.0"
- classpath "com.github.jengelman.gradle.plugins:shadow:2.0.1"
- classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.2"
- classpath "com.netflix.nebula:nebula-clojure-plugin:4.1.0"
- classpath "io.spring.gradle:propdeps-plugin:0.0.9.RELEASE"
- classpath "ru.vyarus:gradle-animalsniffer-plugin:1.4.2"
-}