Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

[WIP] Upgrade gradle version to 4.10 #2661

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,9 @@ allprojects {
}

[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
compileJava.options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
compileJava.options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation' << '-proc:none'
compileTestJava.options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'

task wrapper(type: Wrapper) {
gradleVersion = '3.2'
}

task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
from sourceSets.main.allSource
Expand Down
16 changes: 0 additions & 16 deletions frameworks/cassandra/build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,8 @@
group 'com.mesosphere.sdk'
version '1.1-SNAPSHOT'

apply plugin: 'java'
apply plugin: 'application'

repositories {
maven {
url "http://downloads.mesosphere.com/maven/"
}
maven {
url "http://downloads.mesosphere.com/maven-snapshot/"
}
}

ext {
junitVer = "4.12"
systemRulesVer = "1.16.0"
mockitoVer = "1.9.5"
}

dependencies {
compile project(":scheduler")
testCompile project(":testing")
Expand Down
16 changes: 0 additions & 16 deletions frameworks/elastic/build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,8 @@
group 'com.mesosphere.sdk'
version '1.1-SNAPSHOT'

apply plugin: 'java'
apply plugin: 'application'

repositories {
maven {
url "http://downloads.mesosphere.com/maven/"
}
maven {
url "http://downloads.mesosphere.com/maven-snapshot/"
}
}

ext {
junitVer = "4.12"
systemRulesVer = "1.16.0"
mockitoVer = "1.9.5"
}

dependencies {
compile project(":scheduler")
testCompile project(":testing")
Expand Down
16 changes: 0 additions & 16 deletions frameworks/hdfs/build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,8 @@
group 'com.mesosphere.sdk.hdfs'
version '1.0-SNAPSHOT'

apply plugin: 'java'
apply plugin: 'application'

repositories {
maven {
url "http://downloads.mesosphere.com/maven/"
}
maven {
url "http://downloads.mesosphere.com/maven-snapshot/"
}
}

ext {
junitVer = "4.12"
systemRulesVer = "1.16.0"
mockitoVer = "1.9.5"
}

dependencies {
compile project(":scheduler")
testCompile project(":testing")
Expand Down
10 changes: 0 additions & 10 deletions frameworks/helloworld/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
group 'com.mesosphere.sdk'
version '1.1.1-SNAPSHOT'

apply plugin: 'java'
apply plugin: 'application'

repositories {
maven {
url "http://downloads.mesosphere.com/maven/"
}
maven {
url "http://downloads.mesosphere.com/maven-snapshot/"
}
}

dependencies {
compile project(":scheduler")
testCompile project(":testing")
Expand Down
38 changes: 5 additions & 33 deletions frameworks/helloworld/tests/tls/keystore/build.gradle
Original file line number Diff line number Diff line change
@@ -1,43 +1,15 @@
group 'com.mesosphere.sdk'
version '0.1-SNAPSHOT'

buildscript {
repositories {
jcenter()
mavenLocal()
mavenCentral()
maven {
url 'http://downloads.mesosphere.com/maven/'
}
maven {
url 'http://downloads.mesosphere.com/maven-snapshot/'
}
}
dependencies {
classpath "com.github.jengelman.gradle.plugins:shadow:2.0.1"
}
plugins {
id "com.github.johnrengelman.shadow" version "2.0.4"
id 'application'
}

apply plugin: "com.github.johnrengelman.shadow"
apply plugin: 'java'
apply plugin: 'application'
group 'com.mesosphere.sdk'
version '0.1-SNAPSHOT'

ext {
dropwizardVer = '1.1.2'
}

repositories {
jcenter()
mavenLocal()
mavenCentral()
maven {
url 'http://downloads.mesosphere.com/maven/'
}
maven {
url 'http://downloads.mesosphere.com/maven-snapshot/'
}
}

dependencies {
compile "io.dropwizard:dropwizard-core:${dropwizardVer}"
compile "io.dropwizard:dropwizard-client:${dropwizardVer}"
Expand Down
16 changes: 0 additions & 16 deletions frameworks/kafka/build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,8 @@
group 'com.mesosphere.sdk'
version '1.0-SNAPSHOT'

apply plugin: 'java'
apply plugin: 'application'

repositories {
maven {
url "http://downloads.mesosphere.com/maven/"
}
maven {
url "http://downloads.mesosphere.com/maven-snapshot/"
}
}

ext {
junitVer = "4.12"
systemRulesVer = "1.16.0"
mockitoVer = "1.9.5"
}

dependencies {
compile project(":scheduler")
testCompile project(":testing")
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Feb 19 11:00:19 PST 2018
#Mon Sep 10 15:50:38 PDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
15 changes: 8 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,13 +155,14 @@ if $cygwin ; then
fi

# Escape application args
for s in "${@}" ; do
s=\"$s\"
APP_ARGS=$APP_ARGS" "$s
done
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- "$DEFAULT_JVM_OPTS" "$JAVA_OPTS" "$GRADLE_OPTS" "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
Expand Down
3 changes: 3 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ project(':sdk/scheduler').name = 'scheduler'

include 'sdk/testing'
project(':sdk/testing').name = 'testing'

// For Gradle 5.0 Upgrade compatibility
enableFeaturePreview('STABLE_PUBLISHING')