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/09/21 19:40:27 UTC
[1/3] incubator-geode git commit: GEODE-1791: Update LICENSE
Repository: incubator-geode
Updated Branches:
refs/heads/develop 4562e466d -> c4e63ac0d
GEODE-1791: Update LICENSE
Edit LICENSE files to add jQuery version, MooTools, and sizzle.js.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c4e63ac0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c4e63ac0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c4e63ac0
Branch: refs/heads/develop
Commit: c4e63ac0d02a70baa8ce572a02c28c5f51ba8b7e
Parents: 67e13a0
Author: Anthony Baker <ab...@apache.org>
Authored: Mon Sep 19 21:15:32 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Wed Sep 21 12:39:51 2016 -0700
----------------------------------------------------------------------
LICENSE | 5 ++++-
geode-assembly/src/main/dist/LICENSE | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4e63ac0/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 8109496..3f777c7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -327,7 +327,7 @@ 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.
- - jQuery JavaScript Library v.1.7.2 (https://jquery.com), Copyright (c)
+ - jQuery JavaScript Library v1.7.2, v1.8.0 (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/),
Copyright (c) 2010, "Cowboy" Ben Alman
@@ -355,10 +355,13 @@ 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
+ Proietti, <http://mad4milk.net/>
- Normalize.css v2.1.0 (https://necolas.github.io/normalize.css/),
Copyright (c) Nicolas Gallagher and Jonathan Neal
- Respond.js v1.1.0 (https://github.com/scottjehl/Respond), Copyright (c)
2012 Scott Jehl
+ - Sizzle.js (http://sizzlejs.com/), Copyright (c) 2011, The Dojo Foundation
- Split.js (https://github.com/nathancahill/Split.js), Copyright (c)
2015 Nathan Cahill
- TableDnD v0.5 (https://github.com/isocra/TableDnD), Copyright (c) 2012
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4e63ac0/geode-assembly/src/main/dist/LICENSE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index 375521e..04ce74c 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -673,7 +673,7 @@ Apache Geode bundles the following files under the MIT license:
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 JavaScript Library v1.7.2, v1.8.0 (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/),
Copyright (c) 2010, "Cowboy" Ben Alman
@@ -701,11 +701,14 @@ 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
+ Proietti, <http://mad4milk.net/>
- Normalize.css v2.1.0 (https://necolas.github.io/normalize.css/),
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.21 (http://www.slf4j.org), Copyright (c) 2004-2013 QOS.ch
+ - sizzle.js (http://sizzlejs.com/), Copyright (c) 2011, The Dojo Foundation
- Split.js (https://github.com/nathancahill/Split.js), Copyright (c)
2015 Nathan Cahill
- TableDnD v0.5 (https://github.com/isocra/TableDnD), Copyright (c) 2012
[3/3] incubator-geode git commit: GEODE-1513: Remove duplicate jars
from war files
Posted by ab...@apache.org.
GEODE-1513: Remove duplicate jars from war files
Remove duplicate jar files from the lib directory of the
geode-web, geode-web-api, and geode-pulse war archives. Gradle
doesn't appear to be doing the correct thing, so force it using
a duplicates strategy. In addition, do not create geode-web-api
or geode-pulse jar files. These don't seem to be used anywhere.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/36273278
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/36273278
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/36273278
Branch: refs/heads/develop
Commit: 362732786eae2fa206df2b818ce553b70323fee1
Parents: 4562e46
Author: Anthony Baker <ab...@apache.org>
Authored: Sun Sep 18 18:05:24 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Wed Sep 21 12:39:51 2016 -0700
----------------------------------------------------------------------
geode-assembly/build.gradle | 7 +------
geode-pulse/build.gradle | 9 +--------
geode-web-api/build.gradle | 8 +++-----
geode-web/build.gradle | 2 +-
4 files changed, 6 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/36273278/geode-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 3ed864b..a83b7a9 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -342,9 +342,6 @@ distributions {
from { project(":geode-core").raJar }
from { project(":geode-core").jcaJar }
- // include this jar
- from project(":geode-web-api").jar
-
// dependency jars
from depsJar
from gfshDepsJar
@@ -364,9 +361,7 @@ distributions {
}
into ('tools/Pulse') {
- from (project(":geode-pulse").configurations.archives.allArtifacts.files) {
- exclude '*.jar'
- }
+ from (project(":geode-pulse").configurations.archives.allArtifacts.files)
}
into ('tools/Modules') {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/36273278/geode-pulse/build.gradle
----------------------------------------------------------------------
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index e53a698..c58da78 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -26,10 +26,6 @@ sourceSets {
}
dependencies {
-
-
-
-
compile 'org.springframework:spring-beans:' + project.'springframework.version'
compile 'commons-beanutils:commons-beanutils:' + project.'commons-beanutils.version'
@@ -105,10 +101,6 @@ task copyGemFireVersionFile(type: Copy) {
into generatedResources
}
-jar {
- from sourceSets.main.output
-}
-
eclipse.classpath.file {
whenMerged { classpath ->
classpath.entries.removeAll { entry -> entry.path.contains('geode-core/build')}
@@ -125,6 +117,7 @@ artifacts {
}
war {
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
classpath configurations.runtime
classpath project(':geode-core').webJar.archivePath
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/36273278/geode-web-api/build.gradle
----------------------------------------------------------------------
diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle
index 388dbba..9e93bb9 100755
--- a/geode-web-api/build.gradle
+++ b/geode-web-api/build.gradle
@@ -74,11 +74,9 @@ dependencies {
provided project(':geode-core')
}
-jar {
- from sourceSets.main.output
-}
-
war {
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+ // this shouldn't be necessary but if it's not specified we're missing some of the jars
+ // from the runtime classpath
classpath configurations.runtime
}
-
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/36273278/geode-web/build.gradle
----------------------------------------------------------------------
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index 75844d3..ffab391 100755
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -82,7 +82,7 @@ integrationTest {
war {
dependsOn ':geode-core:webJar'
-
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
classpath configurations.runtime
classpath project(':geode-core').webJar.archivePath
}
[2/3] incubator-geode git commit: GEODE-1791: update mbean src headers
Posted by ab...@apache.org.
GEODE-1791: update mbean src headers
Add src header for mbeans-descriptors.dtd and mbeans-descriptors.xml.
The dtd is from an ASF project and the xml file is specific for
geode--both of these require the standard ASF source header.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/67e13a0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/67e13a0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/67e13a0c
Branch: refs/heads/develop
Commit: 67e13a0c572368093053bc0a8c25ca17f0d4affb
Parents: 3627327
Author: Anthony Baker <ab...@apache.org>
Authored: Tue Sep 20 15:39:48 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Wed Sep 21 12:39:51 2016 -0700
----------------------------------------------------------------------
.../jmx/internal/doc-files/mbeans-descriptors.dtd | 17 ++++++++++++++++-
.../apache/geode/admin/jmx/mbeans-descriptors.xml | 17 +++++++++++++++++
gradle/rat.gradle | 4 ----
3 files changed, 33 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/67e13a0c/geode-core/src/main/resources/org/apache/geode/admin/jmx/internal/doc-files/mbeans-descriptors.dtd
----------------------------------------------------------------------
diff --git a/geode-core/src/main/resources/org/apache/geode/admin/jmx/internal/doc-files/mbeans-descriptors.dtd b/geode-core/src/main/resources/org/apache/geode/admin/jmx/internal/doc-files/mbeans-descriptors.dtd
index 2a8b7b4..7c41bc2 100644
--- a/geode-core/src/main/resources/org/apache/geode/admin/jmx/internal/doc-files/mbeans-descriptors.dtd
+++ b/geode-core/src/main/resources/org/apache/geode/admin/jmx/internal/doc-files/mbeans-descriptors.dtd
@@ -1,5 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<!--
DTD for the Model MBeans Configuration File
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/67e13a0c/geode-core/src/main/resources/org/apache/geode/admin/jmx/mbeans-descriptors.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/main/resources/org/apache/geode/admin/jmx/mbeans-descriptors.xml b/geode-core/src/main/resources/org/apache/geode/admin/jmx/mbeans-descriptors.xml
index 2408641..b54716f 100755
--- a/geode-core/src/main/resources/org/apache/geode/admin/jmx/mbeans-descriptors.xml
+++ b/geode-core/src/main/resources/org/apache/geode/admin/jmx/mbeans-descriptors.xml
@@ -3,6 +3,23 @@
"-//Apache Software Foundation//DTD Model MBeans Configuration File"
"http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
<!-- ===================================================================== -->
<!-- MBeans are defined in this file for these components: -->
<!-- org.apache.geode.admin.jmx.Agent -->
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/67e13a0c/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index fc1ef40..0c09c68 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -146,10 +146,6 @@ rat {
// --- Other Licenses ---
- // Copied from other ASF projects
- 'geode-core/src/main/resources/org/apache/geode/admin/jmx/internal/doc-files/mbeans-descriptors.dtd',
- 'geode-core/src/main/resources/org/apache/geode/admin/jmx/mbeans-descriptors.xml',
-
// Public Domain http://meyerweb.com/eric/tools/css/reset/
'geode-web-api/src/main/webapp/docs/css/reset.css',
'geode-pulse/src/main/webapp/scripts/lib/tooltip.js',