Using Apache 2.0 license (issue jpy-consortium#60)

jmao-denver · Sep 10, 2015 · c981939 · c981939
1 parent 65b3981
commit c981939
Show file tree

Hide file tree

Showing 55 changed files with 832 additions and 1,023 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -6,7 +6,7 @@ jpy Changelog
 Version 0.8
 ===========
 
-*
+* Switched to Apache 2.0 license from version 0.8 and later (issue #60)
 * Fixed problem where a Python interpreter crash occurred when executing del statement on Java arrays (issue #52)
 * Fixed problem where loading of jpy DLL fails for user-specific Python installations on Windows (issue #58)
 * Fixed problem where Java interface types didn't expose java.lang.Object methods (issue #57)

diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/doc/conf.py b/doc/conf.py
@@ -47,16 +47,16 @@
 
 # General information about the project.
 project = 'jpy'
-copyright = '2014, Brockmann Consult GmbH'
+copyright = '2015, Brockmann Consult GmbH'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.7'
+version = '0.8'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.2'
+release = '0.8.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/pom.xml b/pom.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2014 Brockmann Consult GmbH
+  ~ Copyright 2015 Brockmann Consult GmbH
   ~
-  ~ This program is free software; you can redistribute it and/or modify it under the terms of the GNU
-  ~ General Public License as published by the Free Software Foundation; either version 3 of the License,
-  ~ or (at your option) any later version. This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details.
+  ~ Licensed 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
   ~
-  ~ You should have received a copy of the GNU General Public License along with this program; if not, see
-  ~ http://www.gnu.org/licenses/
+  ~     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.
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -32,10 +35,8 @@
 
     <licenses>
         <license>
-            <name>GPL 3</name>
-            <url>http://www.gnu.org/licenses/gpl-3.0</url>
-            <distribution>repo</distribution>
-            <comments>GNU General Public License</comments>
+            <name>The Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
 

diff --git a/setup.py b/setup.py
@@ -1,8 +1,22 @@
 # !/usr/bin/env python3
 
+# Copyright 2015 Brockmann Consult GmbH
+#
+# Licensed 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.
+
 __author__ = "Norman Fomferra, Brockmann Consult GmbH"
-__copyright__ = "Copyright (C) 2015 Brockmann Consult GmbH"
-__license__ = "GPL v3"
+__copyright__ = "Copyright 2015 Brockmann Consult GmbH"
+__license__ = "Apache 2.0"
 __version__ = "0.8.0"
 
 import sys
@@ -168,7 +182,7 @@
              author_email='[email protected]',
              maintainer='Brockmann Consult GmbH',
              maintainer_email='[email protected]',
-             license='GPL 3',
+             license=__license__,
              url='https://github.com/bcdev/jpy',
              download_url='https://pypi.python.org/pypi/jpy/' + __version__,
              py_modules=['jpyutil'],
@@ -203,7 +217,7 @@
                  'Intended Audience :: Developers',
 
                  # Pick your license as you wish (should match "license" above)
-                 'License :: OSI Approved :: GPL 3 License',
+                 'License :: OSI Approved :: Apache 2 License',
 
                  # Specify the Python versions you support here. In particular, ensure
                  # that you indicate whether you support Python 2, Python 3 or both.

diff --git a/src/main/c/jni/org_jpy_DL.c b/src/main/c/jni/org_jpy_DL.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Brockmann Consult GmbH
+ *
+ * Licensed 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.
+ */
+
 #include "org_jpy_DL.h"
 
 #if !defined(_WIN32) && !defined(__CYGWIN__)

diff --git a/src/main/c/jni/org_jpy_PyLib.c b/src/main/c/jni/org_jpy_PyLib.c
@@ -1,14 +1,17 @@
 /*
- * Copyright (C) 2014 Brockmann Consult GmbH
+ * Copyright 2015 Brockmann Consult GmbH
  *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 3 of the License,
- * or (at your option) any later version. This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * Licensed 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
  *
- * You should have received a copy of the GNU General Public License along with this program; if not, see
- * http://www.gnu.org/licenses/
+ *     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.
  */
 
 #include <jni.h>

diff --git a/src/main/c/jpy_compat.c b/src/main/c/jpy_compat.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Brockmann Consult GmbH
+ *
+ * Licensed 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.
+ */
+
 #include "jpy_compat.h"
 
 

diff --git a/src/main/c/jpy_compat.h b/src/main/c/jpy_compat.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Brockmann Consult GmbH
+ *
+ * Licensed 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.
+ */
+
 #ifndef JPY_COMPAT_H
 #define JPY_COMPAT_H
 

diff --git a/src/main/c/jpy_conv.c b/src/main/c/jpy_conv.c
@@ -1,14 +1,17 @@
 /*
- * Copyright (C) 2014 Brockmann Consult GmbH
+ * Copyright 2015 Brockmann Consult GmbH
  *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 3 of the License,
- * or (at your option) any later version. This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * Licensed 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
  *
- * You should have received a copy of the GNU General Public License along with this program; if not, see
- * http://www.gnu.org/licenses/
+ *     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.
  */
 
 #include "jpy_module.h"

diff --git a/src/main/c/jpy_conv.h b/src/main/c/jpy_conv.h
@@ -1,14 +1,17 @@
 /*
- * Copyright (C) 2014 Brockmann Consult GmbH
+ * Copyright 2015 Brockmann Consult GmbH
  *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 3 of the License,
- * or (at your option) any later version. This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * Licensed 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
  *
- * You should have received a copy of the GNU General Public License along with this program; if not, see
- * http://www.gnu.org/licenses/
+ *     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.
  */
 
 #ifndef JPY_CONV_H

diff --git a/src/main/c/jpy_diag.c b/src/main/c/jpy_diag.c
@@ -1,14 +1,17 @@
 /*
- * Copyright (C) 2014 Brockmann Consult GmbH
+ * Copyright 2015 Brockmann Consult GmbH
  *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 3 of the License,
- * or (at your option) any later version. This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * Licensed 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
  *
- * You should have received a copy of the GNU General Public License along with this program; if not, see
- * http://www.gnu.org/licenses/
+ *     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.
  */
 
 #include <Python.h>

diff --git a/src/main/c/jpy_diag.h b/src/main/c/jpy_diag.h
@@ -1,14 +1,17 @@
 /*
- * Copyright (C) 2014 Brockmann Consult GmbH
+ * Copyright 2015 Brockmann Consult GmbH
  *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 3 of the License,
- * or (at your option) any later version. This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * Licensed 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
  *
- * You should have received a copy of the GNU General Public License along with this program; if not, see
- * http://www.gnu.org/licenses/
+ *     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.
  */
 
 #ifndef JPY_DIAG_H

diff --git a/src/main/c/jpy_jarray.c b/src/main/c/jpy_jarray.c
@@ -1,14 +1,17 @@
 /*
- * Copyright (C) 2014 Brockmann Consult GmbH
+ * Copyright 2015 Brockmann Consult GmbH
  *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 3 of the License,
- * or (at your option) any later version. This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * Licensed 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
  *
- * You should have received a copy of the GNU General Public License along with this program; if not, see
- * http://www.gnu.org/licenses/
+ *     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.
  */
 
 #include "jpy_module.h"

diff --git a/src/main/c/jpy_jarray.h b/src/main/c/jpy_jarray.h
@@ -1,14 +1,17 @@
 /*
- * Copyright (C) 2014 Brockmann Consult GmbH
+ * Copyright 2015 Brockmann Consult GmbH
  *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 3 of the License,
- * or (at your option) any later version. This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * Licensed 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
  *
- * You should have received a copy of the GNU General Public License along with this program; if not, see
- * http://www.gnu.org/licenses/
+ *     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.
  */
 
 #ifndef JPY_JARRAY_H

diff --git a/src/main/c/jpy_jfield.c b/src/main/c/jpy_jfield.c
@@ -1,14 +1,17 @@
 /*
- * Copyright (C) 2014 Brockmann Consult GmbH
+ * Copyright 2015 Brockmann Consult GmbH
  *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 3 of the License,
- * or (at your option) any later version. This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * Licensed 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
  *
- * You should have received a copy of the GNU General Public License along with this program; if not, see
- * http://www.gnu.org/licenses/
+ *     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.
  */
 
 #include "jpy_module.h"