geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [geode] branch develop updated: Revert "GEODE-4791: backing out upgrade to 4.5.1 back to 3.5.1"
Date Fri, 09 Mar 2018 18:06:43 GMT
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 <ukohlmeyer@pivotal.io>
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.

Mime
View raw message