You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2016/07/14 21:59:54 UTC

[1/4] incubator-geode git commit: GEODE-1664: Update SLF4J version in LICENSE

Repository: incubator-geode
Updated Branches:
  refs/heads/release/1.0.0-incubating.M3 05e60b977 -> 1fdcdb284


GEODE-1664: Update SLF4J version in LICENSE


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/cc89b76b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/cc89b76b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/cc89b76b

Branch: refs/heads/release/1.0.0-incubating.M3
Commit: cc89b76b5559e582f4583acce02b54bc81554511
Parents: 05e60b9
Author: Anthony Baker <ab...@apache.org>
Authored: Thu Jul 14 11:10:32 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Jul 14 12:22:52 2016 -0700

----------------------------------------------------------------------
 geode-assembly/src/main/dist/LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cc89b76b/geode-assembly/src/main/dist/LICENSE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index 9c2580a..576e624 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -705,7 +705,7 @@ Apache Geode bundles the following files under the MIT license:
     Copyright (c) Nicolas Gallagher and Jonathan Neal
   - Respond.js v1.1.0 (https://github.com/scottjehl/Respond), Copyright (c)
     2012 Scott Jehl
-  - SLF4J API v1.7.7 (http://www.slf4j.org), Copyright (c) 2004-2013 QOS.ch
+  - SLF4J API v1.7.21 (http://www.slf4j.org), Copyright (c) 2004-2013 QOS.ch
   - Split.js (https://github.com/nathancahill/Split.js), Copyright (c)
     2015 Nathan Cahill
   - TableDnD v0.5 (https://github.com/isocra/TableDnD), Copyright (c) 2012


[2/4] incubator-geode git commit: GEODE-1664: Add AOP Alliance to LICENSE

Posted by ab...@apache.org.
GEODE-1664: Add AOP Alliance to LICENSE


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7c9d3a6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7c9d3a6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7c9d3a6b

Branch: refs/heads/release/1.0.0-incubating.M3
Commit: 7c9d3a6b175ffa2ea1f447ebe00cf21344154564
Parents: cc89b76
Author: Anthony Baker <ab...@apache.org>
Authored: Thu Jul 14 11:13:57 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Jul 14 12:22:59 2016 -0700

----------------------------------------------------------------------
 geode-assembly/src/main/dist/LICENSE | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7c9d3a6b/geode-assembly/src/main/dist/LICENSE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index 576e624..375521e 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -797,6 +797,7 @@ Public Domain
 Apache Geode bundles the following files, which are available in the public
 domain:
 
+  - AOP Alliance v1.0 (http://aopalliance.sourceforge.net)
   - CompactConcurrentHashSet2, derived from JSR-166 ConcurrentHashMap v1.43
     (http://gee.cs.oswego.edu/dl/concurrency-interest).
   - Reset CSS (http://meyerweb.com/eric/tools/css/reset/)


[3/4] incubator-geode git commit: GEODE-1664: Remove jopt-simple from src LICENSE

Posted by ab...@apache.org.
GEODE-1664: Remove jopt-simple from src LICENSE

The jopt-simple source dependency was replaced by a binary
dependency.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3c5c62fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3c5c62fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3c5c62fb

Branch: refs/heads/release/1.0.0-incubating.M3
Commit: 3c5c62fb51e7023aa84419f46355283dacf7251a
Parents: 7c9d3a6
Author: Anthony Baker <ab...@apache.org>
Authored: Thu Jul 14 11:15:27 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Jul 14 12:23:06 2016 -0700

----------------------------------------------------------------------
 LICENSE | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c5c62fb/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index f067970..8109496 100644
--- a/LICENSE
+++ b/LICENSE
@@ -327,8 +327,6 @@ Apache Geode bundles the following files under the MIT license:
     Foy, http://damirfoy.com
   - JavaScript InfoVis Toolkit v2.0.1 (http://philogb.github.io/jit/), 
     Copyright (c) 2011 Sencha Inc.
-  - JOpt Simple (http://pholser.github.io/jopt-simple/), Copyright (c)
-    2004-2015 Paul R. Holser, Jr.
   - jQuery JavaScript Library v.1.7.2 (https://jquery.com), Copyright (c)
     jQuery Foundation and other contributors, http://jquery.org
   - jQuery BBQ v1.2.1 (http://benalman.com/projects/jquery-bbq-plugin/),


[4/4] incubator-geode git commit: GEODE-1665: Remove bundled jar from source distribution

Posted by ab...@apache.org.
GEODE-1665: Remove bundled jar from source distribution

Modified the geode-example to remove the bundled gradle wrapper
jar from the source distribution.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1fdcdb28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1fdcdb28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1fdcdb28

Branch: refs/heads/release/1.0.0-incubating.M3
Commit: 1fdcdb2840dd7c646f3f6ddc53e5b388c5b59c9b
Parents: 3c5c62f
Author: Anthony Baker <ab...@apache.org>
Authored: Thu Jul 14 12:02:57 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Jul 14 12:23:11 2016 -0700

----------------------------------------------------------------------
 geode-assembly/build.gradle | 23 ++++++++++++++---------
 gradle/rat.gradle           |  2 --
 2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1fdcdb28/geode-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index c410f59..37b5cb1 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -263,10 +263,10 @@ distributions {
       from writeBuildInfo
       from (rootDir) {
         exclude 'KEYS'
-        exclude 'gradlew'
-        exclude 'gradlew.bat'
-        exclude 'gradle/wrapper/gradle-wrapper.jar'
-        exclude '.gradle'
+        exclude '**/gradlew'
+        exclude '**/gradlew.bat'
+        exclude '**/gradle/wrapper/gradle-wrapper.jar'
+        exclude '**/.gradle'
         exclude '**/build/**'
         exclude 'geode-spark-connector/**/target/**'
         exclude 'geode-spark-connector/project/project'
@@ -274,17 +274,22 @@ distributions {
         exclude '**/.classpath'
         exclude '**/.settings/**'
         exclude '**/build-eclipse/**'
-        exclude '.idea/**'
+        exclude '**/.idea/**'
         exclude '**/*.iml'
         exclude '**/*.ipr'
         exclude '**/*.iws'
+        exclude '**/.travis.yml'
         exclude '**/tags'
 
         //These directories are generated on the jenkins server by gradle
-        exclude 'caches'
-        exclude 'daemon'
-        exclude 'native'
-        exclude 'wrapper'
+        exclude '**/caches'
+        exclude '**/daemon'
+        exclude '**/native'
+        exclude '**/wrapper'
+      }
+
+      into ('geode-examples') {
+        from project.file( 'src/src/dist/gradlew' )
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1fdcdb28/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index 02bf85c..0ce82b9 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -44,8 +44,6 @@ rat {
     'geode-spark-connector/sbt',
 
     // Geode examples
-    'geode-examples/*/scripts/server*/',
-    'geode-examples/*/scripts/locator*/',
     'geode-examples/.idea/**',
     'geode-examples/gradlew*/**',
     'geode-examples/gradle/wrapper/**',