This is an automated email from the ASF dual-hosted git repository.
abaker pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c076bef6471f43e227531c4829dd90b32931dd23
Author: Anthony Baker <aba...@apache.org>
AuthorDate: Tue Feb 6 17:17:07 2018 -0800
GEODE-4622 Update library dependencies
The following libraries have been updated to more recent versions:
commons-fileupload 1.3.2 => 1.3.3
commons-io 2.5 => 2.6
fastutil 7.1.0 => 8.1.1
google-gson 2.8.0 => 2.8.2
guava 21.0 => 24.0-jie
HikariCP 2.7.4 => 2.7.6
jackson 2.9.2 => 2.9.4
jansi 1.14 => 1.17
jgroups 3.6.10.Final => 3.6.14.Final
jna 4.0.0 => 4.5.1
jopt-simple 5.0.3 => 5.0.4
lucene 6.4.1 => 6.6.2
mx4j 3.0.1 => 3.0.2
netty 4.1.8.Final => 4.1.21.Final
protobuf 3.3.1 => 3.5.1
shiro 1.3.2 => 1.4.0
slf4j-api 1.7.24 => 1.7.25
spring-hateoas 0.23.0.RELEASE => 0.24.0.RELEASE
spring-ldap-core 2.3.1.RELEASE => 2.3.2.RELEASE
spring-security 4.2.3.RELEASE => 4.2.4.RELEASE
spring 4.3.13.RELEASE => 4.3.14.RELEASE
springfox 2.6.1 => 2.8.0
Add LICENSE entry for reflections. Update NOTICE versions. Remove
explicit dependency on commons-beanutils that is not required.
---
build.gradle | 58 +--------------
geode-assembly/src/main/dist/LICENSE | 22 +++++-
geode-assembly/src/main/dist/NOTICE | 8 +--
.../src/test/resources/expected_jars.txt | 11 +++
geode-core/build.gradle | 8 +--
.../geode/internal/shared/NativeCallsJNAImpl.java | 2 +-
geode-pulse/src/main/webapp/META-INF/NOTICE | 6 +-
geode-web-api/src/main/webapp/META-INF/NOTICE | 6 +-
geode-web/src/main/webapp/META-INF/NOTICE | 2 +-
gradle/dependency-versions.properties | 54 +++++++-------
build.gradle => gradle/spotless.gradle | 83 ----------------------
11 files changed, 74 insertions(+), 186 deletions(-)
diff --git a/build.gradle b/build.gradle
index f554226..66c89ec 100755
--- a/build.gradle
+++ b/build.gradle
@@ -92,67 +92,11 @@ apply from: "${scriptDir}/sonar.gradle"
apply from: "${scriptDir}/ide.gradle"
apply from: "${scriptDir}/rat.gradle"
apply from: "${scriptDir}/docker.gradle"
+apply from: "${scriptDir}/spotless.gradle"
subprojects {
// Make sure clean task for rootProject runs last
clean.finalizedBy rootProject.cleanAll
apply plugin: 'com.github.ben-manes.versions'
-
- apply plugin: "com.diffplug.gradle.spotless"
- spotless {
- lineEndings = 'unix'
- java {
- target project.fileTree(project.projectDir) {
- include '**/*.java'
- exclude '**/generated-src/**'
- }
-
- custom 'Remove commented-out import statements', {
- it.replaceAll(/\n\/\/ import .*?;.*/, '')
- }
-
- custom 'End files with a single blank line', {
- it.replaceAll(/\s+$/, '\n')
- }
-
- // Removes end-of-line whitespace
- trimTrailingWhitespace()
-
- // Enforce style import order
- importOrderFile
"${project(':geode-core').projectDir}/../etc/eclipseOrganizeImports.importorder"
-
- // The formatter is relative to geode-core and not the root project as
the root project would change
- // if Geode and submodules are included as part of a different gradle
project.
- eclipseFormatFile
"${project(':geode-core').projectDir}/../etc/eclipse-java-google-style.xml"
-
- // Enforce style modifier order
- custom 'Modifier ordering', {
- def modifierRanking = [
- public : 1,
- protected : 2,
- private : 3,
- abstract : 4,
- default : 5,
- static : 6,
- final : 7,
- transient : 8,
- volatile : 9,
- synchronized: 10,
- native : 11,
- strictfp : 12]
- // Find any instance of multiple modifiers. Lead with a non-word
character to avoid
- // accidental matching against for instance, "an alternative default
value"
- it.replaceAll(/\W(?:public |protected |private |abstract |default
|static |final |transient |volatile |synchronized |native |strictfp ){2,}/, {
- // Do not replace the leading non-word character. Identify the
modifiers
- it.replaceAll(/(?:public |protected |private |abstract |default
|static |final |transient |volatile |synchronized |native |strictfp ){2,}/, {
- // Sort the modifiers according to the ranking above
- it.split().sort({ modifierRanking[it] }).join(' ') + ' '
- }
- )
- }
- )
- }
- }
- }
}
diff --git a/geode-assembly/src/main/dist/LICENSE
b/geode-assembly/src/main/dist/LICENSE
index 2f2de95..ccb3a37 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -596,6 +596,26 @@ of the State of California, with venue lying in Santa
Clara County,
California.
---------------------------------------------------------------------------
+The WTF Public License (http://www.wtfpl.net/about/)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following files under the WTF license:
+
+ - Reflections v0.9.11 (https://github.com/ronmamo/reflections)
+
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ Version 2, December 2004
+
+Everyone is permitted to copy and distribute verbatim or modified
+copies of this license document, and changing it is allowed as long
+as the name is changed.
+
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. You just DO WHAT THE FUCK YOU WANT TO.
+
+---------------------------------------------------------------------------
The MIT License (http://opensource.org/licenses/mit-license.html)
---------------------------------------------------------------------------
@@ -626,7 +646,7 @@ Apache Geode bundles the following files under the MIT
license:
Kelvin Luck
- matchMedia() polyfill (https://github.com/paulirish/matchMedia.js),
Copyright (c) 2012 Scott Jehl
- - MooTools (http://mootools.net), Copyright (c) 2006-2015 Valerio
+ - MooTools (http://mootools.net), Copyright (c) 2006-2015 Valerio
Proietti, <http://mad4milk.net/>
- Normalize.css v2.1.0 (https://necolas.github.io/normalize.css/),
Copyright (c) Nicolas Gallagher and Jonathan Neal
diff --git a/geode-assembly/src/main/dist/NOTICE
b/geode-assembly/src/main/dist/NOTICE
index 686e5d1..18b276c 100644
--- a/geode-assembly/src/main/dist/NOTICE
+++ b/geode-assembly/src/main/dist/NOTICE
@@ -26,7 +26,7 @@ Java ClassMate library was originally written by Tatu
Saloranta (tatu.saloranta@
* Brian Langel
-Jackson Core 2.9.3
+Jackson Core 2.9.4
# Jackson JSON processor
@@ -119,7 +119,7 @@ Apache Lucene
Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the
original
source code for this can be found at http://www.eclipse.org/jetty/downloads.php
-Spring Framework 4.3.13.RELEASE
+Spring Framework 4.3.14.RELEASE
Copyright (c) 2002-2017 Pivotal, Inc.
This product is licensed to you under the Apache License, Version 2.0
@@ -131,7 +131,7 @@ Copyright (c) 2002-2017 Pivotal, Inc.
these subcomponents is subject to the terms and conditions of the
subcomponent's license, as noted in the license.txt file.
-Spring Hateoas 0.23.0.RELEASE
+Spring Hateoas 0.24.0.RELEASE
Copyright (c) [2012-2017] Pivotal Software, Inc.
This product is licensed to you under the Apache License, Version 2.0 (the
"License").
@@ -142,7 +142,7 @@ Copyright (c) [2012-2017] Pivotal Software, Inc.
code for the these subcomponents is subject to the terms and
conditions of the subcomponent's license, as noted in the LICENSE file.
-Spring LDAP Core 2.3.1.RELEASE
+Spring LDAP Core 2.3.2.RELEASE
This product includes software developed by the Spring LDAP
Project (http://www.springframework.org/ldap).
diff --git a/geode-assembly/src/test/resources/expected_jars.txt
b/geode-assembly/src/test/resources/expected_jars.txt
index 7e6f653..4c12335 100644
--- a/geode-assembly/src/test/resources/expected_jars.txt
+++ b/geode-assembly/src/test/resources/expected_jars.txt
@@ -1,6 +1,7 @@
activation
antlr
aopalliance
+byte-buddy
classmate
commons-beanutils
commons-codec
@@ -24,6 +25,7 @@ jackson-databind
jackson-module-paranamer
jackson-module-scala
jansi
+javassist
javax.mail-api
javax.resource-api
javax.servlet-api
@@ -58,10 +60,19 @@ netty-all
paranamer
protobuf-java
ra.jar
+reflections
rmiio
scala-library
scala-reflect
+shiro-cache
shiro-core
+shiro-config-core
+shiro-config-ogdl
+shiro-crypto-cipher
+shiro-crypto-core
+shiro-crypto-hash
+shiro-event
+shiro-lang
slf4j-api
snappy
spring-aop
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index d781c59..426840f 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -67,10 +67,10 @@ dependencies {
compile ('mx4j:mx4j:' + project.'mx4j.version') {
ext.optional = true;
}
- compile ('mx4j:mx4j-remote:' + project.'mx4j.version') {
+ compile ('mx4j:mx4j-remote:' + project.'mx4j-remote.version') {
ext.optional = true;
}
- compile ('mx4j:mx4j-tools:' + project.'mx4j.version') {
+ compile ('mx4j:mx4j-tools:' + project.'mx4j-tools.version') {
ext.optional = true;
}
compile ('net.java.dev.jna:jna:' + project.'jna.version')
@@ -119,10 +119,6 @@ dependencies {
}
compile 'org.apache.shiro:shiro-core:' + project.'shiro.version'
- // This is only added since shiro is using an old version of beanutils and
we want
- // to use a standard version. Once shiro deps are updated, remove this
explicit dependency
- // in favor of a transitive dependency on beanutils.
- compile 'commons-beanutils:commons-beanutils:' +
project.'commons-beanutils.version'
//
https://mvnrepository.com/artifact/io.github.lukehutch/fast-classpath-scanner
compile 'io.github.lukehutch:fast-classpath-scanner:' +
project.'fast-classpath-scanner.version'
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
index 40f3f89..441610e 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
@@ -897,7 +897,7 @@ public class NativeCallsJNAImpl {
public int keepaliveinterval;
@Override
- protected List<?> getFieldOrder() {
+ protected List<String> getFieldOrder() {
return Arrays.asList(new String[] {"onoff", "keepalivetime",
"keepaliveinterval"});
}
}
diff --git a/geode-pulse/src/main/webapp/META-INF/NOTICE
b/geode-pulse/src/main/webapp/META-INF/NOTICE
index dc1e33a..3abc660 100644
--- a/geode-pulse/src/main/webapp/META-INF/NOTICE
+++ b/geode-pulse/src/main/webapp/META-INF/NOTICE
@@ -20,7 +20,7 @@ Copyright 2016 AddThis
This product includes software developed by the MX4J
project (http://mx4j.sourceforge.net).
-Jackson Core 2.9.3
+Jackson Core 2.9.4
# Jackson JSON processor
@@ -43,7 +43,7 @@ Jackson Core 2.9.3
in some artifacts (usually source distributions); but is always available
from the source code management (SCM) system project uses.
-Spring Framework 4.3.13.RELEASE
+Spring Framework 4.3.14.RELEASE
Copyright (c) 2002-2017 Pivotal, Inc.
This product is licensed to you under the Apache License, Version 2.0
@@ -55,7 +55,7 @@ Copyright (c) 2002-2017 Pivotal, Inc.
these subcomponents is subject to the terms and conditions of the
subcomponent's license, as noted in the license.txt file.
-Spring LDAP Core 2.3.1.RELEASE
+Spring LDAP Core 2.3.2.RELEASE
This product includes software developed by the Spring LDAP
Project (http://www.springframework.org/ldap).
diff --git a/geode-web-api/src/main/webapp/META-INF/NOTICE
b/geode-web-api/src/main/webapp/META-INF/NOTICE
index fb62513..b09a4ea 100644
--- a/geode-web-api/src/main/webapp/META-INF/NOTICE
+++ b/geode-web-api/src/main/webapp/META-INF/NOTICE
@@ -26,7 +26,7 @@ Java ClassMate library was originally written by Tatu
Saloranta (tatu.saloranta@
* Brian Langel
-Jackson Core 2.9.3
+Jackson Core 2.9.4
# Jackson JSON processor
@@ -49,7 +49,7 @@ Jackson Core 2.9.3
in some artifacts (usually source distributions); but is always available
from the source code management (SCM) system project uses.
-Spring Framework 4.3.13.RELEASE
+Spring Framework 4.3.14.RELEASE
Copyright (c) 2002-2017 Pivotal, Inc.
This product is licensed to you under the Apache License, Version 2.0
@@ -61,7 +61,7 @@ Copyright (c) 2002-2017 Pivotal, Inc.
these subcomponents is subject to the terms and conditions of the
subcomponent's license, as noted in the license.txt file.
-Spring Hateoas 0.23.0.RELEASE
+Spring Hateoas 0.24.0.RELEASE
Copyright (c) [2012-2014] Pivotal Software, Inc.
This product is licensed to you under the Apache License, Version 2.0 (the
"License").
diff --git a/geode-web/src/main/webapp/META-INF/NOTICE
b/geode-web/src/main/webapp/META-INF/NOTICE
index 5779ac7..9e9e517 100644
--- a/geode-web/src/main/webapp/META-INF/NOTICE
+++ b/geode-web/src/main/webapp/META-INF/NOTICE
@@ -20,7 +20,7 @@ Copyright 2016 AddThis
This product includes software developed by the MX4J
project (http://mx4j.sourceforge.net).
-Spring Framework 4.3.13.RELEASE
+Spring Framework 4.3.14.RELEASE
Copyright (c) 2002-2017 Pivotal, Inc.
This product is licensed to you under the Apache License, Version 2.0
diff --git a/gradle/dependency-versions.properties
b/gradle/dependency-versions.properties
index 26076aa..153e3a1 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -26,26 +26,26 @@ commons-collections.version = 3.2.2
commons-configuration.version = 1.10
commons-digester.version=2.1
commons-exec.version=1.3
-commons-fileupload.version = 1.3.2
-commons-io.version = 2.5
+commons-fileupload.version = 1.3.3
+commons-io.version = 2.6
commons-lang.version = 2.6
commons-logging.version = 1.2
commons-modeler.version = 2.0.1
commons-validator.version = 1.6
-HikariCP.version = 2.7.4
+HikariCP.version = 2.7.6
derby.version = 10.13.1.1
dom4j.version = 1.6.1
fast-classpath-scanner.version=2.0.11
-fastutil.version = 7.1.0
-google-gson.version=2.8.0
-guava.version = 21.0
+fastutil.version = 8.1.1
+google-gson.version=2.8.2
+guava.version = 24.0-jre
hamcrest-all.version = 1.3
httpclient.version = 4.5.3
httpcore.version = 4.4.6
httpunit.version = 1.7.2
-jackson.version = 2.9.2
-jackson-module-scala_2.10.version = 2.8.6
-jansi.version = 1.14
+jackson.version = 2.9.4
+jackson-module-scala_2.10.version = 2.9.4
+jansi.version = 1.17
javassist.version = 3.21.0-GA
javax.ejb-api.version = 3.0
javax.jsr250-api.version = 1.0
@@ -56,44 +56,44 @@ javax.servlet-api.version = 3.1.0
javax.transaction-api.version = 1.2
jedis.version = 2.9.0
jetty.version = 9.4.8.v20171121
-jgroups.version = 3.6.10.Final
+jgroups.version = 3.6.14.Final
jmock.version = 2.8.2
-jna.version = 4.0.0
-jopt-simple.version = 5.0.3
+jna.version = 4.5.1
+jopt-simple.version = 5.0.4
json-path.version = 2.2.0
json-path-assert.version = 2.2.0
junit.version = 4.12
junit-quickcheck.version = 0.7
JUnitParams.version = 1.1.0
log4j.version = 2.8.2
-lucene.version = 6.4.1
+lucene.version = 6.6.2
mockito-core.version = 2.8.9
mockrunner.version = 1.1.2
mortbay-jetty-servlet-api.version=3.0.20100224
multithreadedtc.version = 1.01
-mx4j.version = 3.0.1
-mx4j-remote.version = 3.0.1
+mx4j.version = 3.0.2
+mx4j-remote.version = 3.0.2
mx4j-tools.version = 3.0.1
-netty-all.version = 4.1.8.Final
+netty-all.version = 4.1.21.Final
open-json.version = 1.8
phantomjsdriver.version=1.3.0
powermock.version = 1.7.1
-protobuf-gradle-plugin.version = 0.8.1
-protobuf-java.version = 3.3.1
-protoc.version = 3.0.0
+protobuf-gradle-plugin.version = 0.8.4
+protobuf-java.version = 3.5.1
+protoc.version = 3.5.1
rmiio.version = 2.1.2
selenium.version=3.0.1
-shiro.version=1.3.2
-slf4j-api.version = 1.7.24
+shiro.version=1.4.0
+slf4j-api.version = 1.7.25
snappy-java.version=0.4
-spring-hateoas.version = 0.23.0.RELEASE
-spring-ldap-core.version = 2.3.1.RELEASE
-spring-security.version = 4.2.3.RELEASE
+spring-hateoas.version = 0.24.0.RELEASE
+spring-ldap-core.version = 2.3.2.RELEASE
+spring-security.version = 4.2.4.RELEASE
spring-shell.version = 1.2.0.RELEASE
-spring-tx.version = 4.3.13.RELEASE
-springframework.version = 4.3.13.RELEASE
+spring-tx.version = 4.3.14.RELEASE
+springframework.version = 4.3.14.RELEASE
spymemcached.version = 2.12.2
-springfox.version=2.6.1
+springfox.version=2.8.0
stephenc-findbugs.version = 1.3.9-1
system-rules.version = 1.16.1
tempus-fugit.version = 1.1
diff --git a/build.gradle b/gradle/spotless.gradle
old mode 100755
new mode 100644
similarity index 54%
copy from build.gradle
copy to gradle/spotless.gradle
index f554226..6dedef0
--- a/build.gradle
+++ b/gradle/spotless.gradle
@@ -15,90 +15,7 @@
* limitations under the License.
*/
-buildscript {
- repositories {
- maven { url "https://plugins.gradle.org/m2/"; }
- jcenter()
- }
-
- 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.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.4"
- classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
- }
-}
-
-apply plugin: 'wrapper'
-
-wrapper {
- gradleVersion = minimumGradleVersion
-}
-
-// Load all properties in dependency-version.properties as project properties,
so all projects can read them
-Properties dependencyVersions = new Properties()
-dependencyVersions.load(new
FileInputStream("${project.projectDir}/gradle/dependency-versions.properties"))
-dependencyVersions.keys().each{ k -> project.ext[k] = dependencyVersions[k]}
-
-allprojects {
- version = versionNumber + releaseQualifier + releaseType
- ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
-
- // We want to see all test results. This is equivalatent to setting
--continue
- // on the command line.
- gradle.startParameter.continueOnFailure = true
-
- repositories {
- mavenCentral()
- maven { url "http://repo.spring.io/release"; }
- }
-
- group = "org.apache.geode"
-
- buildRoot = buildRoot.trim()
- if (!buildRoot.isEmpty()) {
- buildDir = buildRoot + project.path.replace(":", "/") + "/build"
- }
-}
-
-task cleanAll(type: Delete) {
- delete rootProject.buildDir
- if (!buildRoot.isEmpty()) {
- delete buildRoot
- }
-}
-
-// allow external projects to override include location
-if (name == 'geode') {
- ext.scriptDir = 'gradle'
-}
-
-if (project.hasProperty('parallelDunit')) {
- def pwd = System.getenv('PWD')
- def geodeDir = new File(pwd).getCanonicalPath()
- ext.dunitDockerVolumes = ["${geodeDir}":geodeDir]
-}
-
-apply from: "${scriptDir}/utilities.gradle"
-apply from: "${scriptDir}/java.gradle"
-apply from: "${scriptDir}/dependency-resolution.gradle"
-apply from: "${scriptDir}/test.gradle"
-apply from: "${scriptDir}/publish.gradle"
-apply from: "${scriptDir}/code-analysis.gradle"
-apply from: "${scriptDir}/sonar.gradle"
-apply from: "${scriptDir}/ide.gradle"
-apply from: "${scriptDir}/rat.gradle"
-apply from: "${scriptDir}/docker.gradle"
-
subprojects {
- // Make sure clean task for rootProject runs last
- clean.finalizedBy rootProject.cleanAll
-
- apply plugin: 'com.github.ben-manes.versions'
-
apply plugin: "com.diffplug.gradle.spotless"
spotless {
lineEndings = 'unix'
--
To stop receiving notification emails like this one, please contact
aba...@apache.org.
