Skip to content

Commit

Permalink
GEODE-8039: update incorrect versions in LICENSE (apache#5018)
Browse files Browse the repository at this point in the history
* GEODE-8039: update incorrect versions in LICENSE
* add license review as part of the release process and RC pipeline
* fix wrapping and capitalization so that binary license is a superset of source license
  • Loading branch information
onichols-pivotal authored May 5, 2020
1 parent be8ac49 commit 7ee1042
Show file tree
Hide file tree
Showing 9 changed files with 528 additions and 151 deletions.
86 changes: 42 additions & 44 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -219,43 +219,43 @@ Apache Geode bundles the following files under the BSD 3-Clause License:

- ANSIBuffer (http://jline.sourceforge.net/apidocs/jline/ANSIBuffer.html),
Copyright (c) 2002-2007 Marc Prud'hommeaux.
- jQuery Sparklines v2.0 (http://omnipotent.net/jquery.sparkline/), Copyright
(c) 2012 Splunk Inc.
- Protocol Buffers (https://github.com/google/protobuf), Copyright (c) 2014
Google Inc.
- jQuery Sparklines v2.0 (http://omnipotent.net/jquery.sparkline/),
Copyright (c) 2012 Splunk Inc.
- Protocol Buffers (https://github.com/google/protobuf), Copyright (c)
2014 Google Inc.

All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.

---------------------------------------------------------------------------
The MIT License (http://opensource.org/licenses/mit-license.html)
---------------------------------------------------------------------------

Apache Geode bundles the following files under the MIT license:
Apache Geode bundles the following files under the MIT License:

- HTML5 Shiv vpre3.5 (https://github.com/aFarkas/html5shiv), Copyright
(c) 2014 Alexander Farkas (aFarkas)
Expand All @@ -280,8 +280,6 @@ Apache Geode bundles the following files under the MIT license:
Foundation and other contributors, http://jquery.org
- jScrollPane (http://jscrollpane.kelvinluck.com/), Copyright (c) 2010
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/>
- Sizzle.js (http://sizzlejs.com/), Copyright (c) 2011, The Dojo Foundation
Expand Down Expand Up @@ -312,7 +310,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.


---------------------------------------------------------------------------
The MX4J License (http://mx4j.sourceforge.net/docs/ch01s06.html)
---------------------------------------------------------------------------
Expand Down Expand Up @@ -354,19 +351,20 @@ are met:
nor may "MX4J" appear in their name, without prior written
permission of Simone Bordet.

THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE MX4J CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.

THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MX4J
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

This software consists of voluntary contributions made by many
individuals on behalf of the MX4J project. For more information on
MX4J, please see the MX4J website (http://mx4j.sourceforge.net/).

---------------------------------------------------------------------------
Public Domain
Expand Down
6 changes: 6 additions & 0 deletions boms/geode-all-bom/src/test/resources/expected-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,12 @@
<version>3.0.11</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'com.nimbusds', name:'nimbus-jose-jwt', version:'8.11')
api(group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0')
api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '3.0.11')
api(group: 'com.sun.mail', name: 'javax.mail', version: '1.6.2')
api(group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.2')
api(group: 'com.tngtech.archunit', name:'archunit-junit4', version: '0.12.0')
api(group: 'com.zaxxer', name: 'HikariCP', version: '3.4.2')
Expand Down
1 change: 1 addition & 0 deletions dev-tools/release/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ These scripts are intended to be run from the parent directory of your geode dev

Overview of scripts:

license_review.sh: compares versions with a previous release and/or checks that all bundled dependencies are noted in appropriate LICENSE file
create_support_branches.sh: cuts support/x.y from develop for all projects and walks you through creating pipelines and setting version numbers
set_copyright.sh updates the copyright year
set_versions.sh: updates files that need to contain the version number planned for the next release from this support branch
Expand Down
25 changes: 25 additions & 0 deletions dev-tools/release/deploy_rc_pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,31 @@ jobs:
else
echo All good
fi
- name: verify-license
serial: true
plan:
- aggregate:
- get: geode
trigger: true
- task: validate
timeout: 1h
config:
image_resource:
type: docker-image
source:
repository: openjdk
tag: 8
inputs:
- name: geode
platform: linux
run:
path: /bin/bash
args:
- -ec
- |
set -e
FULL_VERSION=$(cd geode && git describe --tags | sed -e 's#^rel/v##')
geode/dev-tools/release/license_review.sh -v $FULL_VERSION
EOF
fly -t concourse.apachegeode-ci.info-main login --team-name main --concourse-url https://concourse.apachegeode-ci.info/
fly -t concourse.apachegeode-ci.info-main set-pipeline -p apache-support-${VERSION_MM//./-}-rc -c $PIPEYML
Expand Down
Loading

0 comments on commit 7ee1042

Please sign in to comment.