Skip to content

Commit 82a3d4c

Browse files
nmariznmariz
committed
WL11473: Update license text
1 parent bec514e commit 82a3d4c

File tree

5 files changed

+89
-70
lines changed

5 files changed

+89
-70
lines changed

‎cpyint

‎docs/mysqlx/license.rst

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
License
22
=======
33

4-
MySQL Connector/Python - MySQL driver written in Python.
5-
Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
6-
7-
MySQL Connector/Python is licensed under the terms of the GPLv2
8-
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
9-
MySQL Connectors. There are special exceptions to the terms and
10-
conditions of the GPLv2 as it is applied to this software, see the
11-
FOSS License Exception
12-
<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
4+
Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
135

146
This program is free software; you can redistribute it and/or modify
15-
it under the terms of the GNU General Public License as published by
16-
the Free Software Foundation.
7+
it under the terms of the GNU General Public License, version 2.0, as
8+
published by the Free Software Foundation.
9+
10+
This program is also distributed with certain software (including
11+
but not limited to OpenSSL) that is licensed under separate terms,
12+
as designated in a particular file or component or in included license
13+
documentation. The authors of MySQL hereby grant you an
14+
additional permission to link the program and your derivative works
15+
with the separately licensed software that they have included with
16+
MySQL.
17+
18+
Without limiting anything contained in the foregoing, this file,
19+
which is part of MySQL Connector/Python, is also subject to the
20+
Universal FOSS Exception, version 1.0, a copy of which can be found at
21+
http://oss.oracle.com/licenses/universal-foss-exception.
1722

18-
This program is distributed in the hope that it will be useful,
19-
but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-
GNU General Public License for more details.
23+
This program is distributed in the hope that it will be useful, but
24+
WITHOUT ANY WARRANTY; without even the implied warranty of
25+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
26+
See the GNU General Public License, version 2.0, for more details.
2227

2328
You should have received a copy of the GNU General Public License
24-
along with this program; if not, write to the Free Software
25-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
29+
along with this program; if not, write to the Free Software Foundation, Inc.,
30+
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

‎support/django/run_django_tests.py

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
#!/usr/bin/env python
22

3-
# MySQL Connector/Python - MySQL driver written in Python.
4-
# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
5-
6-
# MySQL Connector/Python is licensed under the terms of the GPLv2
7-
# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
8-
# MySQL Connectors. There are special exceptions to the terms and
9-
# conditions of the GPLv2 as it is applied to this software, see the
10-
# FOSS License Exception
11-
# <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
3+
# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
124
#
135
# This program is free software; you can redistribute it and/or modify
14-
# it under the terms of the GNU General Public License as published by
15-
# the Free Software Foundation.
6+
# it under the terms of the GNU General Public License, version 2.0, as
7+
# published by the Free Software Foundation.
168
#
17-
# This program is distributed in the hope that it will be useful,
18-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
19-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20-
# GNU General Public License for more details.
9+
# This program is also distributed with certain software (including
10+
# but not limited to OpenSSL) that is licensed under separate terms,
11+
# as designated in a particular file or component or in included license
12+
# documentation. The authors of MySQL hereby grant you an
13+
# additional permission to link the program and your derivative works
14+
# with the separately licensed software that they have included with
15+
# MySQL.
16+
#
17+
# Without limiting anything contained in the foregoing, this file,
18+
# which is part of MySQL Connector/Python, is also subject to the
19+
# Universal FOSS Exception, version 1.0, a copy of which can be found at
20+
# http://oss.oracle.com/licenses/universal-foss-exception.
21+
#
22+
# This program is distributed in the hope that it will be useful, but
23+
# WITHOUT ANY WARRANTY; without even the implied warranty of
24+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
25+
# See the GNU General Public License, version 2.0, for more details.
2126
#
2227
# You should have received a copy of the GNU General Public License
23-
# along with this program; if not, write to the Free Software
24-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
28+
# along with this program; if not, write to the Free Software Foundation, Inc.,
29+
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2530

2631
"""Script for executing Django unit tests
2732

‎support/django/test_mysqlconnector_settings.py

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
1-
2-
# MySQL Connector/Python - MySQL driver written in Python.
3-
# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
4-
5-
# MySQL Connector/Python is licensed under the terms of the GPLv2
6-
# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
7-
# MySQL Connectors. There are special exceptions to the terms and
8-
# conditions of the GPLv2 as it is applied to this software, see the
9-
# FOSS License Exception
10-
# <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
1+
# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
112
#
123
# This program is free software; you can redistribute it and/or modify
13-
# it under the terms of the GNU General Public License as published by
14-
# the Free Software Foundation.
4+
# it under the terms of the GNU General Public License, version 2.0, as
5+
# published by the Free Software Foundation.
6+
#
7+
# This program is also distributed with certain software (including
8+
# but not limited to OpenSSL) that is licensed under separate terms,
9+
# as designated in a particular file or component or in included license
10+
# documentation. The authors of MySQL hereby grant you an
11+
# additional permission to link the program and your derivative works
12+
# with the separately licensed software that they have included with
13+
# MySQL.
14+
#
15+
# Without limiting anything contained in the foregoing, this file,
16+
# which is part of MySQL Connector/Python, is also subject to the
17+
# Universal FOSS Exception, version 1.0, a copy of which can be found at
18+
# http://oss.oracle.com/licenses/universal-foss-exception.
1519
#
16-
# This program is distributed in the hope that it will be useful,
17-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
# GNU General Public License for more details.
20+
# This program is distributed in the hope that it will be useful, but
21+
# WITHOUT ANY WARRANTY; without even the implied warranty of
22+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
23+
# See the GNU General Public License, version 2.0, for more details.
2024
#
2125
# You should have received a copy of the GNU General Public License
22-
# along with this program; if not, write to the Free Software
23-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
26+
# along with this program; if not, write to the Free Software Foundation, Inc.,
27+
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2428

2529
DATABASES = {
2630
'default': {

‎tests/data/ssl/generate.sh

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
#!/bin/sh
2-
# MySQL Connector/Python - MySQL driver written in Python.
3-
# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
4-
5-
# MySQL Connector/Python is licensed under the terms of the GPLv2
6-
# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
7-
# MySQL Connectors. There are special exceptions to the terms and
8-
# conditions of the GPLv2 as it is applied to this software, see the
9-
# FLOSS License Exception
10-
# <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
2+
# Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
113
#
124
# This program is free software; you can redistribute it and/or modify
13-
# it under the terms of the GNU General Public License as published by
14-
# the Free Software Foundation.
5+
# it under the terms of the GNU General Public License, version 2.0, as
6+
# published by the Free Software Foundation.
7+
#
8+
# This program is also distributed with certain software (including
9+
# but not limited to OpenSSL) that is licensed under separate terms,
10+
# as designated in a particular file or component or in included license
11+
# documentation. The authors of MySQL hereby grant you an
12+
# additional permission to link the program and your derivative works
13+
# with the separately licensed software that they have included with
14+
# MySQL.
15+
#
16+
# Without limiting anything contained in the foregoing, this file,
17+
# which is part of MySQL Connector/Python, is also subject to the
18+
# Universal FOSS Exception, version 1.0, a copy of which can be found at
19+
# http://oss.oracle.com/licenses/universal-foss-exception.
1520
#
16-
# This program is distributed in the hope that it will be useful,
17-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
# GNU General Public License for more details.
21+
# This program is distributed in the hope that it will be useful, but
22+
# WITHOUT ANY WARRANTY; without even the implied warranty of
23+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
24+
# See the GNU General Public License, version 2.0, for more details.
2025
#
2126
# You should have received a copy of the GNU General Public License
22-
# along with this program; if not, write to the Free Software
23-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
27+
# along with this program; if not, write to the Free Software Foundation, Inc.,
28+
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2429

2530
# This shell script generates keys and certificates for testing the SSL
2631
# capabilities of MySQL Connector/Python.

0 commit comments

Comments
 (0)