From commits-return-25973-archive-asf-public=cust-asf.ponee.io@geode.apache.org Fri Mar 9 19:06:46 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 9CB15180676 for ; Fri, 9 Mar 2018 19:06:45 +0100 (CET) Received: (qmail 8051 invoked by uid 500); 9 Mar 2018 18:06:44 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 8042 invoked by uid 99); 9 Mar 2018 18:06:44 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Mar 2018 18:06:44 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id EEB338084A; Fri, 9 Mar 2018 18:06:43 +0000 (UTC) Date: Fri, 09 Mar 2018 18:06:43 +0000 To: "commits@geode.apache.org" Subject: [geode] branch develop updated: Revert "GEODE-4791: backing out upgrade to 4.5.1 back to 3.5.1" MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152061880354.18880.10867995245630432256@gitbox.apache.org> From: udo@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: geode X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: 8672678b7906a16a8140b9986f8c1f825414498b X-Git-Newrev: ccc8db872f560bde13938291a330e98c82e3725a X-Git-Rev: ccc8db872f560bde13938291a330e98c82e3725a X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. udo pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new ccc8db8 Revert "GEODE-4791: backing out upgrade to 4.5.1 back to 3.5.1" ccc8db8 is described below commit ccc8db872f560bde13938291a330e98c82e3725a Author: Udo AuthorDate: Fri Mar 9 10:02:36 2018 -0800 Revert "GEODE-4791: backing out upgrade to 4.5.1 back to 3.5.1" This reverts commit e09c4091382e1c6bfafbb77de86029bb08fcccea. --- build.gradle | 4 ++-- extensions/geode-modules-assembly/build.gradle | 7 +++++-- gradle.properties | 6 +----- gradle/java.gradle | 11 ++++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 56005a2..66c89ec 100755 --- a/build.gradle +++ b/build.gradle @@ -24,10 +24,10 @@ buildscript { dependencies { classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.0" classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1' - classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1' + classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.0.1' classpath "com.diffplug.gradle.spotless:spotless:2.2.0" classpath "me.champeau.gradle:jmh-gradle-plugin:0.3.1" - classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.5" + classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.4" classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0' } } diff --git a/extensions/geode-modules-assembly/build.gradle b/extensions/geode-modules-assembly/build.gradle index 6abd47b..59398ce 100644 --- a/extensions/geode-modules-assembly/build.gradle +++ b/extensions/geode-modules-assembly/build.gradle @@ -22,6 +22,11 @@ configurations { moduleDistOutputs } +dependencies { + slf4jDeps 'org.slf4j:slf4j-api:' + project.'slf4j-api.version' + slf4jDeps 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version' +} + jar.enabled = true extraArchive { sources = false @@ -197,8 +202,6 @@ task distTcServer30(type: Zip, dependsOn: [':extensions/geode-modules:assemble', } dependencies { - slf4jDeps 'org.slf4j:slf4j-api:' + project.'slf4j-api.version' - slf4jDeps 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version' moduleDistOutputs distTcServer.outputs.files moduleDistOutputs distTcServer30.outputs.files moduleDistOutputs distAppServer.outputs.files diff --git a/gradle.properties b/gradle.properties index 30c92af..ad3dbce 100755 --- a/gradle.properties +++ b/gradle.properties @@ -42,11 +42,7 @@ productOrg = Apache Software Foundation (ASF) org.gradle.daemon = true org.gradle.jvmargs = -Xmx2048m -org.gradle.parallel=true -org.gradle.configureondemand=true -org.gradle.workers.max=4 - -minimumGradleVersion = 4.2.1 +minimumGradleVersion = 3.5.1 # Set this on the command line with -P or in ~/.gradle/gradle.properties # to change the buildDir location. Use an absolute path. buildRoot= diff --git a/gradle/java.gradle b/gradle/java.gradle index 7f99604..22fec1c 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -54,11 +54,12 @@ subprojects { "Organization": productOrg ) } - } - jar.metaInf { - from("$rootDir/LICENSE") - if (jar.source.filter({ it.name.contains('NOTICE') }).empty) { - from("$rootDir/NOTICE") + + metaInf { + from("$rootDir/LICENSE") + if (jar.source.filter({ it.name.contains('NOTICE') }).empty) { + from("$rootDir/NOTICE") + } } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4516ad8..2fad278 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip -- To stop receiving notification emails like this one, please contact udo@apache.org.